Merge lp:~jfb-tempo-consulting/unifield-server/US-5037 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-11-12 16:19:32 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-12-14 17:29:06 +0000
@@ -71409,10 +71409,12 @@
 msgid "No catalogue found !"
 msgstr "Catalogue pas trouvé !"
 
-#. module: purchase, purchase_override, msf_doc_import
+#. modules: purchase, purchase_override, msf_doc_import, sale
 #: field:purchase.order.merged.line,instance_sync_order_ref:0
 #: field:purchase.order.line,instance_sync_order_ref:0
 #: field:wizard.import.po.simulation.screen.line,imp_sync_order_ref:0
+#: field:sale.order.line,instance_sync_order_ref:0
+#: view:sync.order.label:0
 msgid "Order in sync. instance"
 msgstr "Commande en instance sync."
 

=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2020-11-02 08:28:49 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2020-12-14 17:29:06 +0000
@@ -81,7 +81,7 @@
                                     <field name="product_uom_qty" on_change="onchange_uom(product_id, product_uom, product_uom_qty)" />
                                     <field name="original_changed" readonly="1"/>
                                     <button name="button_view_changed" string="View Current/Original" type="object" icon="terp-stock_zoom"
-                                            attrs="{'invisible': [('original_qty', '=', False), ('modification_comment', '=', False)]}"/>
+                                            attrs="{'invisible': [('original_qty', '=', False), ('modification_comment', '=', False), ('original_changed', '=', False)]}"/>
                                     <field name="price_unit"/>
                                     <field name="notes" />
                                     <field name="display_resourced_orig_line" />

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2020-10-13 16:37:22 +0000
+++ bin/addons/purchase/purchase_workflow.py	2020-12-14 17:29:06 +0000
@@ -347,6 +347,7 @@
                 'date_planned': pol.date_planned or (datetime.now() + relativedelta(days=+2)).strftime('%Y-%m-%d'),
                 'sync_sourced_origin': pol.instance_sync_order_ref and pol.instance_sync_order_ref.name or False,
                 'set_as_sourced_n': True,
+                'created_by_sync': True,
             }
 
             if pol.resourced_original_line:

=== modified file 'bin/addons/sale/sale_order.py'
--- bin/addons/sale/sale_order.py	2020-11-02 09:31:38 +0000
+++ bin/addons/sale/sale_order.py	2020-12-14 17:29:06 +0000
@@ -2133,6 +2133,7 @@
         'ir_name_from_sync': fields.char(size=64, string='IR name to put on PO line after sync', invisible=True),
         'counterpart_po_line_id': fields.many2one('purchase.order.line', 'PO line counterpart'),
         'pol_external_ref': fields.function(_get_pol_external_ref, method=True, type='char', size=256, string="Linked PO line's External Ref.", store=False),
+        'instance_sync_order_ref': fields.many2one('sync.order.label', string='Order in sync. instance'),
     }
     _order = 'sequence, id desc'
     _defaults = {
@@ -2284,13 +2285,10 @@
             'cancelled_by_sync': False,
         })
 
-        if 'ir_name_from_sync' not in default:
-            default['ir_name_from_sync'] = False
-        if 'in_name_goods_return' not in default:
-            default['in_name_goods_return'] = False
-
-        if 'counterpart_po_line_id' not in default:
-            default['counterpart_po_line_id'] = False
+        reset_if_not_set = ['ir_name_from_sync', 'in_name_goods_return', 'counterpart_po_line_id', 'instance_sync_order_ref']
+        for to_reset in reset_if_not_set:
+            if to_reset not in default:
+                default[to_reset] = False
 
         return super(sale_order_line, self).copy(cr, uid, id, default, context)
 
@@ -2331,7 +2329,12 @@
         if context.get('from_button') and 'is_line_split' not in default:
             default['is_line_split'] = False
 
-        for x in ['modification_comment', 'original_product', 'original_qty', 'original_price', 'original_uom', 'sync_linked_pol', 'resourced_original_line', 'ir_name_from_sync', 'in_name_goods_return', 'counterpart_po_line_id', 'from_cancel_out']:
+        for x in [
+            'modification_comment', 'original_product', 'original_qty', 'original_price',
+            'original_uom', 'sync_linked_pol', 'resourced_original_line', 'ir_name_from_sync',
+            'in_name_goods_return', 'counterpart_po_line_id', 'from_cancel_out',
+            'instance_sync_order_ref', 'sync_sourced_origin'
+        ]:
             if x not in default:
                 default[x] = False
 
@@ -3044,6 +3047,9 @@
         '''
         Add the database ID of the SO line to the value sync_order_line_db_id
         '''
+        if vals.get('instance_sync_order_ref'):
+            vals['sync_sourced_origin'] = self.pool.get('sync.order.label').read(cr, uid, vals['instance_sync_order_ref'], ['name'])['name']
+
         so_line_ids = super(sale_order_line, self).create(cr, uid, vals, context=context)
         if not vals.get('sync_order_line_db_id', False):  # 'sync_order_line_db_id' not in vals or vals:
             if vals.get('order_id', False):
@@ -3071,6 +3077,9 @@
         if context is None:
             context = {}
 
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         # UTP-392: fixed from the previous code: check if the sale order line contains the product, and not only from vals!
         product_id = vals.get('product_id')
         if context.get('sale_id', False):
@@ -3090,6 +3099,10 @@
         if not 'soq_updated' in vals:
             vals['soq_updated'] = False
 
+        if vals.get('instance_sync_order_ref'):
+            if self.search_exists(cr, uid, [('id', 'in', ids), ('state', '=', 'draft'), ('sync_sourced_origin', '=', False)], context=context):
+                vals['sync_sourced_origin'] = self.pool.get('sync.order.label').read(cr, uid, vals['instance_sync_order_ref'], ['name'])['name']
+
         res = super(sale_order_line, self).write(cr, uid, ids, vals, context=context)
 
         if vals.get('stock_take_date'):
@@ -3097,6 +3110,16 @@
 
         return res
 
+    def on_change_instance_sync_order_ref(self, cr, uid, ids, instance_sync_order_ref, context=None):
+        if instance_sync_order_ref:
+            return {'warning':
+                    {
+                        'title': _('Warning'),
+                        'message': _("Please ensure that you selected the correct Source document because once the line is saved you will not be able to edit this field anymore. In case of mistake, the only option will be to Cancel the line and Create a new one with the correct Source document."),
+                    }
+                    }
+        return {}
+
 sale_order_line()
 
 

=== modified file 'bin/addons/sale/sale_view.xml'
--- bin/addons/sale/sale_view.xml	2020-11-02 08:28:49 +0000
+++ bin/addons/sale/sale_view.xml	2020-12-14 17:29:06 +0000
@@ -9,6 +9,29 @@
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
         <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
+
+        <record id="sync_order_label_tree" model="ir.ui.view">
+            <field name="name">sync.order.label.tree</field>
+            <field name="model">sync.order.label</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Order in sync. instance" hide_new_button="True" hide_delete_button="True">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="sync_order_label_search" model="ir.ui.view">
+            <field name="name">sync.order.label.search</field>
+            <field name="model">sync.order.label</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
             <field name="model">sale.shop</field>
@@ -189,7 +212,7 @@
                                 <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object"/>
                             </group>
                             <field name="order_line" colspan="4" mode="tree,form,graph" nolabel="1" widget="one2many_list"
-                                context="{'sale_id': active_id, 'pricelist_id': pricelist_id, 'categ': categ, 'partner_id': partner_id}"
+                                context="{'sale_id': active_id, 'pricelist_id': pricelist_id, 'categ': categ, 'partner_id': partner_id, 'fo_created_by_po_sync': fo_created_by_po_sync}"
                                 on_change="order_line_change(order_line)"
                                 filter_selector="[('Show all', []), ('Hide closed', [('state', 'not in', ['done', 'cancel', 'cancel_r'])]), ('Show closed only', [('state', '=', 'done')]), ('Hide cancelled', [('state', 'not in', ['cancel', 'cancel_r'])]), ('Show cancelled only', [('state', 'in', ['cancel', 'cancel_r'])])]"
                                 default_selector="'3'" o2m_selectable="2"
@@ -218,6 +241,11 @@
                                             <field name="confirmed_delivery_date" attrs="{'readonly': [('so_state_stored', 'in', ('cancel','done'))]}"/>
                                             <field name="stock_take_date"/>
                                             <field name="display_resourced_orig_line"/>
+                                            <field name="sync_linked_pol" invisible="True"/>
+                                            <field name="sync_sourced_origin" invisible="True"/>
+                                            <group invisible="not context.get('fo_created_by_po_sync')" colspan="2">
+                                                <field name="instance_sync_order_ref" domain="[('order_id', '=', context.get('sale_id', 0))]" attrs="{'invisible': [('sync_linked_pol', '!=', False)], 'readonly': ['|', ('state', '!=', 'draft'), ('sync_sourced_origin', '!=', False)]}" on_change="on_change_instance_sync_order_ref(instance_sync_order_ref)"/>
+                                            </group>
                                             <separator colspan="4" string="Changes"/>
                                             <group colspan="4">
                                                 <group colspan="2">

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2020-09-24 14:14:45 +0000
+++ bin/addons/sale/sale_workflow.py	2020-12-14 17:29:06 +0000
@@ -188,6 +188,7 @@
                     'is_line_split': False,
                     'analytic_distribution_id': sol.analytic_distribution_id.id or False,
                     'ir_name_from_sync': sol.ir_name_from_sync or False,
+                    'sync_sourced_origin': sol.sync_sourced_origin,
                 }
                 new_sol_id = self.copy(cr, uid, sol.id, sol_vals, context=context)
                 wf_service.trg_validate(uid, 'sale.order.line', new_sol_id, 'validated', cr)