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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-10-01 09:09:50 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-10-11 15:14:55 +0000
@@ -1545,6 +1545,7 @@
         'imp_external_ref': fields.char(size=256, string='External Ref.', readonly=True),
         'imp_project_ref': fields.char(size=256, string='Project Ref.', readonly=True),
         'imp_origin': fields.char(size=256, string='Origin Ref.', readonly=True),
+        'imp_sync_order_ref': fields.many2one('sync.order.label', string='Order in sync. instance', readonly=True),
         'change_ok': fields.function(_get_line_info, method=True, multi='line',
                                      type='boolean', string='Change', store=False),
         'error_msg': fields.text(string='Error message', readonly=True),
@@ -1581,6 +1582,7 @@
         prod_obj = self.pool.get('product.product')
         uom_obj = self.pool.get('product.uom')
         sale_obj = self.pool.get('sale.order')
+        sync_order_obj = self.pool.get('sync.order.label')
 
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -1733,8 +1735,14 @@
                 write_vals['type_change'] = 'error'
 
             # Origin
-            origin = values[8]
-            if origin:
+            full_origin = values[8]
+            if full_origin:
+                instance_sync_order_ref = False
+                if ':' in full_origin:
+                    origin = full_origin.split(':')[0]
+                    instance_sync_order_ref = full_origin.split(':')[-1]
+                else:
+                    origin = full_origin
                 if line.simu_id.order_id.order_type not in ['loan', 'donation_exp', 'donation_st', 'in_kind']:
                     so_ids = sale_obj.search(cr, uid, [('name', '=', origin), ('procurement_request', 'in', ['t', 'f'])],
                                              limit=1, context=context)
@@ -1751,6 +1759,23 @@
                             err_msg = _('\'Origin\' Document can\'t be Closed or Cancelled')
                             errors.append(err_msg)
                             write_vals['type_change'] = 'error'
+                        # To link the other instance's IR to the PO line
+                        if line.type_change in ['new', 'split'] and instance_sync_order_ref:
+                            sync_order_label_ids = sync_order_obj.\
+                                search(cr, uid, [('name', '=', instance_sync_order_ref),
+                                                 ('order_id.state', 'not in', ['done', 'cancel'])], context=context)
+                            if sync_order_label_ids:
+                                sync_order_label = sync_order_obj.browse(cr, uid, sync_order_label_ids[0], context=context)
+                                if sync_order_label.order_id.id == so.id:
+                                    write_vals['imp_sync_order_ref'] = sync_order_label.id
+                                else:
+                                    err_msg = _('This Order in sync. instance reference is not linked with the FO in \'Origin\'')
+                                    errors.append(err_msg)
+                                    write_vals['type_change'] = 'error'
+                            else:
+                                err_msg = _('No Order in sync. instance with an open FO was found with the data in \'Origin\'')
+                                errors.append(err_msg)
+                                write_vals['type_change'] = 'error'
                     else:
                         err_msg = _('The FO reference in \'Origin\' is not consistent with this PO')
                         errors.append(err_msg)
@@ -1899,6 +1924,8 @@
                 line_vals['project_ref'] = line.imp_project_ref
             if line.imp_origin:
                 line_vals['origin'] = line.imp_origin
+            if line.imp_sync_order_ref:
+                line_vals.update({'instance_sync_order_ref': line.imp_sync_order_ref.id, 'display_sync_ref': True})
             if line.imp_external_ref:
                 line_vals['external_ref'] = line.imp_external_ref
             if line.imp_dcd:

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-10-03 14:01:19 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-10-11 15:14:55 +0000
@@ -107275,6 +107275,18 @@
 msgid "This invoice will sync to its counterpart instance."
 msgstr "Cette facture sera synchronisée à l'instance de Contrepartie."
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1759
+#, python-format
+msgid "This Order in sync. instance reference is not linked with the FO in 'Origin'"
+msgstr "Cette référence de commande en instance sync. n'a pas de lien avec le FO de 'Origine'"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1763
+#, python-format
+msgid "No Order in sync. instance with an open FO was found with the data in 'Origin'"
+msgstr "Aucune commande en instance sync. avec une CdT ouverte n'a été trouvée avec les données dans 'Origine'"
+
 #. module: msf_homere_interface
 #: view:hr.employee.activation:0
 #: model:ir.actions.act_window,name:msf_homere_interface.employee_activation_action

=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako	2018-08-10 10:25:45 +0000
+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako	2019-10-11 15:14:55 +0000
@@ -67,7 +67,11 @@
 <Table x:FullColumns="1" x:FullRows="1">
 <Column ss:AutoFitWidth="1" ss:Width="120" />
 <Column ss:AutoFitWidth="1" ss:Width="300" />
-% for x in range(2,nb_of_columns - 1):
+% for x in range(2, 8):
+<Column ss:AutoFitWidth="1" ss:Width="60" />
+% endfor
+<Column ss:AutoFitWidth="1" ss:Width="100" />
+% for x in range(10, nb_of_columns - 1):
 <Column ss:AutoFitWidth="1" ss:Width="60" />
 % endfor
 <Column ss:AutoFitWidth="1" ss:Width="250" />
@@ -269,7 +273,11 @@
             <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_uom.name or '')|x}</Data></Cell>
             <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.price_unit or 0.00)|x}</Data></Cell>
             <Cell ss:StyleID="line" ><Data ss:Type="String">${(o.pricelist_id.currency_id.name or '')|x}</Data></Cell>
-            <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.origin or '')|x}</Data></Cell>
+            % if line.instance_sync_order_ref and line.origin:
+            <Cell ss:StyleID="line" ><Data ss:Type="String">${line.origin + ':' + line.instance_sync_order_ref.name|x}</Data></Cell>
+            % else:
+            <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.origin and (line.linked_sol_id and line.linked_sol_id.ir_name_from_sync and line.origin + ':' + line.linked_sol_id.ir_name_from_sync or line.origin) or '')|x}</Data></Cell>
+            % endif
             % if isDate(line.stock_take_date):
             <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${line.stock_take_date|n}T00:00:00.000</Data></Cell>
             % else:

=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako'
--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako	2019-06-06 12:33:50 +0000
+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako	2019-10-11 15:14:55 +0000
@@ -80,7 +80,11 @@
                     <field name="currency_id" key="name">
                         <field name="name">${l.currency_id and l.currency_id.name or ''|x}</field>
                     </field>
-                    <field name="origin">${l.origin or ''|x}</field>
+                    % if l.instance_sync_order_ref and l.origin:
+                    <field name="origin">${l.origin + ':' + l.instance_sync_order_ref.name|x}</field>
+                    % else:
+                    <field name="origin">${l.origin and (l.linked_sol_id and l.linked_sol_id.ir_name_from_sync and l.origin + ':' + l.linked_sol_id.ir_name_from_sync or l.origin) or ''|x}</field>
+                    % endif
                     % if l.stock_take_date and l.stock_take_date not in (False, 'False'):
                     <field name="stock_take_date">${l.stock_take_date|n}</field>
                     % else:

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2019-08-08 13:55:43 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2019-10-11 15:14:55 +0000
@@ -5,7 +5,7 @@
 msf_sync_data_server.po_updates_so_ref,TRUE,TRUE,"['name','state','partner_ref']","['&','&','&',('partner_type','!=','external'),('state','in',['validated', 'validated_p', 'sourced', 'sourced_p', 'confirmed', 'confirmed_p']),('partner_ref','!=',False),'!',('partner_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,sale.order.update_sub_so_ref,purchase.order,PO updates SO ref,8,,Valid
 msf_sync_data_server.fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&', '&','&','&', ('claim_name_goods_return', '=', False), ('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,,Valid
 msf_sync_data_server.update_in_ref,TRUE,TRUE,"['name','shipment_ref']","['&',('shipment_ref','!=',False),'!',('shipment_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,stock.picking.update_in_ref,stock.picking,IN updates ref to OUT SHIP,10,,Valid
-msf_sync_data_server.pol_create_sol,TRUE,TRUE,"['sync_local_id', 'order_id/name','product_id/id', 'product_id/name', 'name', 'state', 'product_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','is_line_split','date_planned', 'stock_take_date']","[('sync_linked_sol', '=', False), ('order_id.partner_type', 'not in',['external','esc']), ('state', 'in', ['validated', 'confirmed', 'done']), ('order_id.state', 'not in', ['draft', 'draft_p', 'cancel'])]",partner_id,MISSION,sale.order.line.create_so_line,purchase.order.line,PO line creates FO line,11,,Valid
+msf_sync_data_server.pol_create_sol,TRUE,TRUE,"['sync_local_id', 'order_id/name','product_id/id', 'product_id/name', 'name', 'state', 'product_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','is_line_split','date_planned', 'stock_take_date', 'ir_name_for_sync']","[('sync_linked_sol', '=', False), ('order_id.partner_type', 'not in',['external','esc']), ('state', 'in', ['validated', 'confirmed', 'done']), ('order_id.state', 'not in', ['draft', 'draft_p', 'cancel'])]",partner_id,MISSION,sale.order.line.create_so_line,purchase.order.line,PO line creates FO line,11,,Valid
 msf_sync_data_server.sol_updates_pol,TRUE,TRUE,"['resourced_original_line/id', 'resourced_original_remote_line','sync_sourced_origin', 'sync_local_id', 'sync_linked_pol', 'order_id/name', 'product_id/id', 'product_id/name', 'name', 'state','product_uom_qty', 'product_uom', 'price_unit', 'in_name_goods_return', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','date_planned','is_line_split', 'original_line_id/id', 'confirmed_delivery_date', 'stock_take_date', 'cancel_split_ok', 'modification_comment', 'from_cancel_out']","[('order_id.partner_type', '!=', 'external'), ('state', '!=', 'draft'), ('product_uom_qty', '!=', 0.0), '!', '&', ('order_id.fo_created_by_po_sync', '=', False), ('order_id.state', '=', 'draft')]",partner_id,MISSION,purchase.order.line.sol_update_original_pol,sale.order.line,FO line updates PO line,12,"[('order_id.state', 'in', ['draft', 'draft_p']), ('order_id.partner_type', 'not in', ['external', 'esc']), ('order_id.client_order_ref', '=', False)]",Valid
 msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'claim', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment', 'move_lines/sale_line_id/id', 'move_lines/sale_line_id/in_name_goods_return', 'sale_id/claim_name_goods_return', 'sale_id/client_order_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,,Valid
 msf_sync_data_server.moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id', 'move_lines/comment']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,,Valid

=== 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-11 15:14:55 +0000
@@ -563,6 +563,7 @@
         'validation_date': fields.date('Validation Date', readonly=True),
         'confirmation_date': fields.date('Confirmation Date', readonly=True),
         'closed_date': fields.date('Closed Date', readonly=True),
+        'ir_name_for_sync': fields.char(size=64, string='IR name to put on PO line after sync', invisible=True),
     }
 
     _defaults = {
@@ -1194,8 +1195,11 @@
 
         # utp-518:we write the comment from the sale.order.line on the PO line:
         if vals.get('linked_sol_id'):
-            sol_comment = self.pool.get('sale.order.line').read(cr, uid, vals.get('linked_sol_id'), ['comment'], context=context)['comment']
-            vals.update({'comment': sol_comment})
+            sol = self.pool.get('sale.order.line').browse(cr, uid, vals.get('linked_sol_id'), fields_to_fetch=['comment', 'order_id'], context=context)
+            vals.update({
+                'comment': sol.comment,
+                'ir_name_for_sync': sol.order_id.procurement_request and sol.order_id.name or False,
+            })
             #if not product_id and not vals.get('name'):  # US-3530
             #    vals.update({'name': 'None'})
 
@@ -1237,6 +1241,7 @@
             'esc_confirmed': False,
             'created_by_sync': False,
             'cancelled_by_sync': False,
+            'ir_name_for_sync': False,
         })
 
         return super(purchase_order_line, self).copy(cr, uid, line_id, defaults, context=context)
@@ -1261,7 +1266,7 @@
             if field not in default:
                 default[field] = False
 
-        default.update({'sync_order_line_db_id': False, 'set_as_sourced_n': False, 'set_as_validated_n': False, 'linked_sol_id': False, 'link_so_id': False, 'esc_confirmed': False, 'created_by_sync': False, 'cancelled_by_sync': False, 'resourced_original_line': False, 'set_as_resourced': False, 'stock_take_date': False})
+        default.update({'sync_order_line_db_id': False, 'set_as_sourced_n': False, 'set_as_validated_n': False, 'linked_sol_id': False, 'link_so_id': False, 'esc_confirmed': False, 'created_by_sync': False, 'cancelled_by_sync': False, 'resourced_original_line': False, 'set_as_resourced': False, 'stock_take_date': False, 'ir_name_for_sync': False})
 
         # 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):
@@ -1516,12 +1521,13 @@
         Fill the origin field if a FO is selected
         '''
         if fo_id:
-            fo_domain = ['name', 'sourced_references', 'state', 'order_type']
+            fo_domain = ['name', 'sourced_references', 'state', 'order_type', 'procurement_request']
             fo = self.pool.get('sale.order').read(cr, uid, fo_id, fo_domain, context=context)
             if fo['state'] not in ['done', 'cancel'] and fo['order_type'] == 'regular':
                 return {
                     'value': {
                         'origin': fo['name'],
+                        'ir_name_for_sync': fo['procurement_request'] and fo['name'] or False,
                         'display_sync_ref': len(fo['sourced_references']) and True or False,
                     },
                     'warning': {

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2019-07-25 13:52:35 +0000
+++ bin/addons/purchase/purchase_view.xml	2019-10-11 15:14:55 +0000
@@ -275,6 +275,7 @@
                                     <field name="origin" invisible="1" readonly="1"/>
                                     <field name="soq_updated" invisible="1" readonly="1"/>
                                     <field name="order_state_purchase_order_line" invisible="True"/>
+                                    <field name="ir_name_for_sync" invisible="True"/>
                                     <button string="Split line" icon="terp-stock_effects-object-colorize" name="open_split_wizard" type="object" attrs="{'invisible': [('fake_state', 'not in', ('draft', 'validated', 'validated_n'))]}"/>
                                     <button string="Validate" icon="terp-check" name="validated" type="workflow" attrs="{'invisible': [('fake_state', '!=', 'draft')]}" header="True"/>
                                     <button string="Confirm" icon="terp-check" name="button_confirmed" type="object" attrs="{'invisible': [('fake_state', 'not in', ['validated', 'validated_n'])]}" header="True"/>
@@ -673,7 +674,7 @@
                             <field name="fake_id" invisible="1"/>
                             <field name="change_price_ok" invisible="1"/>
                             <field name="old_price_unit" invisible="1"/>
-
+                            <field name="ir_name_for_sync" invisible="1"/>
 
 
                             <separator string="Notes" colspan="4" />

=== modified file 'bin/addons/sale/sale_order.py'
--- bin/addons/sale/sale_order.py	2019-10-01 10:23:48 +0000
+++ bin/addons/sale/sale_order.py	2019-10-11 15:14:55 +0000
@@ -2118,6 +2118,7 @@
         'from_cancel_out': fields.boolean('OUT cancel'),
         'created_by_sync': fields.boolean(string='Created by Synchronisation'),
         'cancelled_by_sync': fields.boolean(string='Cancelled by Synchronisation'),
+        'ir_name_from_sync': fields.char(size=64, string='IR name to put on PO line after sync', invisible=True),
     }
     _order = 'sequence, id desc'
     _defaults = {
@@ -2139,6 +2140,7 @@
         'stock_take_date': _get_stock_take_date,
         'created_by_sync': False,
         'cancelled_by_sync': False,
+        'ir_name_from_sync': '',
     }
 
     def _check_stock_take_date(self, cr, uid, ids, context=None):
@@ -2266,6 +2268,7 @@
             'from_cancel_out': False,
             'created_by_sync': False,
             'cancelled_by_sync': False,
+            'ir_name_from_sync': '',
         })
 
         if 'in_name_goods_return' not in default:
@@ -2306,6 +2309,7 @@
             'created_by_sync': False,
             'cancelled_by_sync': False,
             'stock_take_date': False,
+            'ir_name_from_sync': '',
         })
         if context.get('from_button') and 'is_line_split' not in default:
             default['is_line_split'] = False

=== modified file 'bin/addons/sale/sale_view.xml'
--- bin/addons/sale/sale_view.xml	2019-07-31 12:02:50 +0000
+++ bin/addons/sale/sale_view.xml	2019-10-11 15:14:55 +0000
@@ -278,6 +278,7 @@
                                     <field name="to_correct_ok" readonly="1" invisible="1"/>
                                     <field name="show_msg_ok" readonly="1" invisible="1"/>
                                     <field name="inactive_product" invisible="1"/>
+                                    <field name="ir_name_from_sync" invisible="1"/>
                                     <group attrs="{'invisible': [('text_error', '=', False), ('inactive_error', '=', False)]}">
                                         <html>
                                             <style>

=== modified file 'bin/addons/sync_so/sale.py'
--- bin/addons/sync_so/sale.py	2018-11-09 16:10:16 +0000
+++ bin/addons/sync_so/sale.py	2019-10-11 15:14:55 +0000
@@ -63,6 +63,7 @@
         sol_values = self.pool.get('so.po.common').get_line_data(cr, uid, source, line_info, context)
         sol_values['order_id'] = sale_order_ids[0]
         sol_values['sync_linked_pol'] = pol_dict.get('sync_local_id', False)
+        sol_values['ir_name_from_sync'] = pol_dict.get('ir_name_for_sync', False)
         if sol_values.get('product_id'):
             sol_values['original_product'] = sol_values['product_id']
         if sol_values.get('product_qty') or sol_values.get('product_uom_qty'):