Merge lp:~dorian-kemps/unifield-server/US-5894 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-10-15 16:08:57 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-10-17 13:49:09 +0000
@@ -8931,12 +8931,14 @@
 msgid "! - Requires national export license"
 msgstr "! - Nécessite une licence d'exportation nationale"
 
-#. modules: purchase, purchase_override, sale
+#. modules: purchase, purchase_override, sale, tender_flow
 #: selection:purchase.order.line,state:0
 #: selection:purchase.order.merged.line,state:0
 #: selection:sale.order.line,state:0
 #: selection:purchase.order.line,state_to_display:0
 #: selection:sale.order.line,state_to_display:0
+#: selection:purchase.order.line,rfq_line_state_to_display:0
+#: selection:purchase.order.merged.line,rfq_line_state_to_display:0
 msgid "Cancelled-r"
 msgstr "Annulée-r"
 
@@ -29966,7 +29968,7 @@
 msgid "Certificate attached ?"
 msgstr "Certificat attaché ?"
 
-#. modules: msf_supply_doc_export, sourcing, consumption_calculation, sale, sales_followup, msf_supply_doc_export, purchase, account_override, account, register_accounting, stock_override
+#. modules: msf_supply_doc_export, sourcing, consumption_calculation, sale, sales_followup, msf_supply_doc_export, purchase, account_override, account, register_accounting, stock_override, purchase_override, tender_flow
 #: field:po.follow.up,closed_ok:0
 #: selection:real.average.consumption,state:0
 #: selection:po.follow.up,state:0
@@ -46585,7 +46587,7 @@
 msgid "Europe/Ulyanovsk"
 msgstr "Europe/Ulyanovsk"
 
-#. modules: purchase, sync_client, sales_followup, msf_homere_interface, tender_flow, stock_forecast, mission_stock, msf_profile
+#. modules: purchase, sync_client, sales_followup, msf_homere_interface, tender_flow, stock_forecast, mission_stock, msf_profile, purchase_override
 #: field:stock.mission.report.line,updated:0
 #: field:hr.payroll.import.confirmation,updated:0
 #: selection:purchase.report,state:0
@@ -47148,7 +47150,7 @@
 msgid "Illinois"
 msgstr "Illinois"
 
-#. modules: stock_forecast, purchase, tender_flow, sales_followup
+#. modules: stock_forecast, purchase, tender_flow, sales_followup, purchase_override
 #: selection:purchase.report,state:0
 #: selection:purchase.order.line,po_state:0
 #: selection:purchase.order.line,order_state:0
@@ -82474,6 +82476,7 @@
 #: report:addons/msf_supply_doc_export/report/report_internal_request_xls.mako:65
 #: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:83
 #: report:addons/msf_supply_doc_export/report/report_sale_order_xls.mako:82
+#: field:purchase.order.line,rfq_line_state_to_display:0
 #, python-format
 msgid "State"
 msgstr "Statut"

=== modified file 'bin/addons/purchase/__init__.py'
--- bin/addons/purchase/__init__.py	2019-07-22 12:08:20 +0000
+++ bin/addons/purchase/__init__.py	2019-10-17 13:49:09 +0000
@@ -56,7 +56,6 @@
     ('resourced_d', 'Resourced-d'),
 ]
 
-
 PURCHASE_ORDER_STATE_SELECTION = [
     ('draft', 'Draft'),
     ('draft_p', 'Draft-p'),

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2019-09-12 10:02:53 +0000
+++ bin/addons/purchase/purchase_order.py	2019-10-17 13:49:09 +0000
@@ -2601,9 +2601,9 @@
         # set cross_docking_ok:
         cross_docking_ok = False
         for rfq_line in rfq.order_line:
-            if rfq_line.linked_sol_id and not rfq_line.linked_sol_id.order_id.procurement_request or \
+            if rfq_line.linked_sol_id and (not rfq_line.linked_sol_id.order_id.procurement_request or \
                     (rfq_line.linked_sol_id.order_id.procurement_request and
-                        rfq_line.linked_sol_id.order_id.location_requestor_id.usage == 'customer'):
+                        rfq_line.linked_sol_id.order_id.location_requestor_id.usage == 'customer')):
                 cross_docking_ok = True
                 break
         self.write(cr, uid, [new_po_id], {'cross_docking_ok': cross_docking_ok}, context=context)

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2019-10-01 09:09:50 +0000
+++ bin/addons/purchase/purchase_order_line.py	2019-10-17 13:49:09 +0000
@@ -1265,7 +1265,7 @@
 
         # from RfQ line to PO line: grab the linked sol if has:
         if pol.order_id.rfq_ok and context.get('generate_po_from_rfq', False):
-            default.update({'linked_sol_id': pol.linked_sol_id.id})
+            default.update({'linked_sol_id': pol.linked_sol_id and pol.linked_sol_id.id or False})
 
         if not context.get('keepDateAndDistrib'):
             if 'confirmed_delivery_date' not in default:

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2019-08-23 14:56:06 +0000
+++ bin/addons/purchase_override/purchase.py	2019-10-17 13:49:09 +0000
@@ -382,7 +382,7 @@
 
         # cancel all non-confirmed lines:
         if po.rfq_ok:
-            self.pool.get('purchase.order').cancel_rfq(cr, uid, [po.id], context=context)
+            self.pool.get('purchase.order').cancel_rfq(cr, uid, [po.id], context=context, resource=resource)
         else:
             for pol in po.order_line:
                 if (pol.order_id.partner_type in ('external', 'esc') and pol.state in ('draft', 'validated', 'validated_n'))\

=== modified file 'bin/addons/tender_flow/__init__.py'
--- bin/addons/tender_flow/__init__.py	2012-05-15 11:47:19 +0000
+++ bin/addons/tender_flow/__init__.py	2019-10-17 13:49:09 +0000
@@ -18,6 +18,21 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+
+from tools.translate import _
+
+RFQ_STATE_SELECTION = [
+    ('draft', 'Draft'),
+    ('sent', 'Sent'),
+    ('updated', 'Updated'),
+    ('done', 'Closed'),
+    ('cancel', 'Cancelled'),
+]
+
+RFQ_LINE_STATE_DISPLAY_SELECTION = RFQ_STATE_SELECTION + [
+    ('cancel_r', 'Cancelled-r'),
+]
+
 import tender_flow
 import wizard
 import report

=== modified file 'bin/addons/tender_flow/tender_flow.py'
--- bin/addons/tender_flow/tender_flow.py	2019-08-14 09:17:27 +0000
+++ bin/addons/tender_flow/tender_flow.py	2019-10-17 13:49:09 +0000
@@ -30,6 +30,8 @@
 import tools
 
 from purchase import PURCHASE_ORDER_STATE_SELECTION
+from . import RFQ_STATE_SELECTION
+from . import RFQ_LINE_STATE_DISPLAY_SELECTION
 
 class tender(osv.osv):
     '''
@@ -722,7 +724,7 @@
             # search for the rfqs
             rfq_ids = po_obj.search(cr, uid, [('tender_id', '=', tender.id), ('rfq_ok', '=', True)], context=context)
             # trigger all related rfqs
-            po_obj.cancel_rfq(cr, uid, rfq_ids, context=context)
+            po_obj.cancel_rfq(cr, uid, rfq_ids, context=context, resource=False)
 
             for line in tender.tender_line_ids:
                 t_line_obj.cancel_sourcing(cr, uid, [line.id], context=context)
@@ -1623,7 +1625,7 @@
                 'valid_till': fields.date(string='Valid Till', internal="purchase_order"),
                 # add readonly when state is Done
                 'sale_order_id': fields.many2one('sale.order', string='Link between RfQ and FO', readonly=True, internal="purchase_order"),
-                'rfq_state': fields.selection([('draft', 'Draft'), ('sent', 'Sent'), ('updated', 'Updated'), ('done', 'Closed'), ('cancel', 'Cancelled')], 'Order state', required=True, readonly=True, internal="purchase_order"),
+                'rfq_state': fields.selection(RFQ_STATE_SELECTION, 'Order state', required=True, readonly=True, internal="purchase_order"),
                 }
 
     _defaults = {
@@ -1669,8 +1671,7 @@
 
         return super(purchase_order, self).create(cr, uid, vals, context=context)
 
-
-    def cancel_rfq(self, cr, uid, ids, context=None):
+    def cancel_rfq(self, cr, uid, ids, context=None, resource=False):
         '''
         method to cancel a RfQ and its lines
         '''
@@ -1686,7 +1687,10 @@
             for rfq_line in rfq.order_line:
                 if (rfq_line.order_id.partner_type in ('external', 'esc') and rfq_line.state in ('draft', 'validated', 'validated_n'))\
                         or (rfq_line.order_id.partner_type not in ('external', 'esc') and rfq_line.state == 'draft'):
-                    wf_service.trg_validate(uid, 'purchase.order.line', rfq_line.id, 'cancel', cr)
+                    signal = 'cancel'
+                    if resource and rfq_line.linked_sol_id:
+                        signal = 'cancel_r'
+                    wf_service.trg_validate(uid, 'purchase.order.line', rfq_line.id, signal, cr)
 
             self.write(cr, uid, [rfq.id], {'rfq_state': 'cancel'}, context=context)
 
@@ -1914,10 +1918,32 @@
     add a tender_id related field
     '''
     _inherit = 'purchase.order.line'
+
+    def _get_rfq_line_state_to_display(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        return the state to display for RfQ lines
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        res = {}
+        for pol in self.browse(cr, uid, ids, context=context):
+            if pol.order_id.rfq_ok and pol.state not in ['cancel', 'cancel_r']:
+                res[pol.id] = pol.order_id.rfq_state
+            else:
+                res[pol.id] = pol.state_to_display
+
+        return res
+
     _columns = {'tender_id': fields.related('order_id', 'tender_id', type='many2one', relation='tender', string='Tender',),
                 'tender_line_id': fields.many2one('tender.line', string='Tender Line'),
                 'rfq_ok': fields.related('order_id', 'rfq_ok', type='boolean', string='RfQ ?'),
                 'sale_order_line_id': fields.many2one('sale.order.line', string='FO line', readonly=True),
+                'rfq_line_state_to_display': fields.function(_get_rfq_line_state_to_display, string='State',
+                                                             type='selection', selection=RFQ_LINE_STATE_DISPLAY_SELECTION,
+                                                             method=True, readonly=True)
                 }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -2118,7 +2144,7 @@
 
         line_obj.fake_unlink(cr, uid, line_ids, context=context)
 
-        self.pool.get('purchase.order').cancel_rfq(cr, uid, rfq_ids, context=context)
+        self.pool.get('purchase.order').cancel_rfq(cr, uid, rfq_ids, context=context, resource=False)
 
         for tender in tender_ids:
             wf_service.trg_validate(uid, 'tender', tender, 'tender_cancel', cr)

=== modified file 'bin/addons/tender_flow/tender_flow_view.xml'
--- bin/addons/tender_flow/tender_flow_view.xml	2019-06-11 12:11:22 +0000
+++ bin/addons/tender_flow/tender_flow_view.xml	2019-10-17 13:49:09 +0000
@@ -328,7 +328,8 @@
                                     <field name="currency_id"/>
                                     <field name="tender_line_id" invisible="1" />
                                     <field name="fake_state" invisible="1"/>
-                                    <button string="Cancel" icon="gtk-del" type="object" name="ask_unlink" attrs="{'invisible': [('fake_state', 'in', ['cancel', 'cancel_r', 'done'])]}" />
+                                    <field name="rfq_line_state_to_display"/>
+                                    <button string="Cancel" icon="gtk-del" type="object" name="ask_unlink" attrs="{'invisible': ['|', ('fake_state', 'in', ['cancel', 'cancel_r', 'done']), ('rfq_state', 'in', ['updated', 'done', 'cancel'])]}" />
                                 </tree>
                             </field>
                         </page>