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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-02-24 09:28:37 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-03-25 11:03:52 +0000
@@ -52354,7 +52354,7 @@
 msgid "A line must a have a quantity larger than 0.00"
 msgstr "A line must a have a quantity larger than 0.00"
 
-#. modules: sales_followup, tender_flow, purchase, stock_override, stock_forecast, purchase_allocation_report, purchase_followup, order_types, stock, msf_supply_doc_export
+#. modules: sales_followup, tender_flow, purchase, stock_override, stock_forecast, purchase_allocation_report, purchase_followup, order_types, stock, msf_supply_doc_export, sourcing, purchase_override
 #: selection:stock.move,order_type:0
 #: view:purchase.order:0
 #: selection:purchase.order,order_type:0
@@ -52373,6 +52373,9 @@
 #: field:supplier.performance.wizard,po_type_purchase_list:0
 #: code:addons/stock_override/report/report_stock_move.py:32
 #: selection:purchase.order.line,po_order_type:0
+#: selection:purchase.order.merged.line,po_order_type:0
+#: selection:multiple.sourcing.wizard,po_cft:0
+#: selection:sale.order.line,po_cft:0
 #, python-format
 msgid "Purchase List"
 msgstr "Liste d'Achats"
@@ -111894,3 +111897,16 @@
 #, python-format
 msgid "You must have at least one line to create the Internal Move"
 msgstr "Vous devez avoir au moins une ligne pour pouvoir créer le Mouvement Interne"
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:905
+#, python-format
+msgid "You can't source with 'Purchase List' to a non-external partner."
+msgstr "Vous ne pouvez pas sourcer avec 'Liste d'Achats' vers un partenaire non-externe."
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:2144
+#: code:addons/sourcing/wizard/multiple_sourcing.py:461
+#, python-format
+msgid "'Purchase List' is not allowed with a non-external partner."
+msgstr "'Liste d'Achats' n'est pas autorisé avec un partenaire non-externe."
 
=== modified file 'bin/addons/sale/sale_order.py'
--- bin/addons/sale/sale_order.py	2021-01-27 17:04:50 +0000
+++ bin/addons/sale/sale_order.py	2021-03-25 11:03:52 +0000
@@ -3008,6 +3008,9 @@
                 qty = float(qty)
             vals.update({'product_uos_qty' : qty * product_obj.read(cr, uid, product_id, ['uos_coeff'])['uos_coeff']})
 
+        if vals.get('po_cft', False) == 'pli':
+            vals.update({'po_cft': 'po'})
+
         pricelist = False
         order_id = vals.get('order_id', False)
         order_data = False
 
=== modified file 'bin/addons/sales_followup/sale_followup.py'
--- bin/addons/sales_followup/sale_followup.py	2019-09-18 14:06:52 +0000
+++ bin/addons/sales_followup/sale_followup.py	2021-03-25 11:03:52 +0000
@@ -737,7 +737,7 @@
         'original_order_id': fields.many2one('sale.order', string='Orig. line', readonly=True),
         'first_line': fields.boolean(string='First line'),
         'procure_method': fields.related('line_id', 'type', type='selection', selection=[('make_to_stock','From stock'), ('make_to_order','On order')], readonly=True, string='Proc. Method'),
-        'po_cft': fields.related('line_id', 'po_cft', type='selection', selection=[('po','PO'), ('dpo', 'DPO'), ('cft','CFT')], readonly=True, string='PO/CFT'),
+        'po_cft': fields.related('line_id', 'po_cft', type='selection', selection=[('po','PO'), ('dpo', 'DPO'), ('cft','CFT'), ('pli', 'PLI')], readonly=True, string='PO/CFT'),
         'line_number': fields.related('line_id', 'line_number', string='Order line', readonly=True, type='integer'),
         'product_id': fields.related('line_id', 'product_id', string='Product Code', readondy=True,
                                      type='many2one', relation='product.product'),
 
=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2021-02-02 10:20:51 +0000
+++ bin/addons/sourcing/sale_order_line.py	2021-03-25 11:03:52 +0000
@@ -43,6 +43,7 @@
     ('dpo', 'Direct Purchase Order'),
     ('cft', 'Tender'),
     ('rfq', 'Request for Quotation'),
+    ('pli', 'Purchase List'),
 ]
 
 
@@ -898,6 +899,12 @@
                     _("""You can't source with 'Request for Quotation' to an internal/inter-section/intermission partner."""),
                 )
 
+            if line.product_id and line.po_cft == 'pli' and line.supplier.partner_type != 'external':
+                raise osv.except_osv(
+                    _('Warning'),
+                    _("""You can't source with 'Purchase List' to a non-external partner."""),
+                )
+
             if line.order_id.state == 'validated' and line.order_id.order_type in (
                     'donation_st', 'donation_exp') and line.type != 'make_to_stock':
                 raise osv.except_osv(
@@ -1255,6 +1262,8 @@
             elif sourcing_line.po_cft == 'dpo':
                 domain.append(('order_type', '=', 'direct'))
                 domain.append(('dest_address_id', '=', sourcing_line.order_id.partner_shipping_id.id))
+            elif sourcing_line.po_cft == 'pli':
+                domain.append(('order_type', '=', 'purchase_list'))
 
             # supplier's order creation mode:
             if sourcing_line.supplier.po_by_project in ('project', 'category_project') or (sourcing_line.po_cft == 'dpo' and sourcing_line.supplier.po_by_project == 'all'):
@@ -1360,11 +1369,11 @@
                 'related_sourcing_id': sourcing_line.related_sourcing_id.id or False,
                 'unique_fo_id': sourcing_line.order_id.id if sourcing_line.supplier.po_by_project == 'isolated' else False,
             }
-            if sourcing_line.po_cft == 'po': # Purchase Order
+            if sourcing_line.po_cft == 'po':  # Purchase Order
                 po_values.update({
                     'order_type': 'regular',
                 })
-            elif sourcing_line.po_cft == 'dpo': # Direct Purchase Order
+            elif sourcing_line.po_cft == 'dpo':  # Direct Purchase Order
                 po_values.update({
                     'order_type': 'direct',
                     'dest_partner_id': sourcing_line.order_id.partner_id.id,
@@ -1372,6 +1381,8 @@
                 })
                 #if sourcing_line.order_id.partner_id.partner_type in ('esc', 'external'):
                 #    po_values['po_version'] = 2 # TODO NEEDED ?
+            elif sourcing_line.po_cft == 'pli':  # Purchase List
+                po_values.update({'order_type': 'purchase_list',})
 
         return self.pool.get('purchase.order').create(cr, uid, po_values, context=context)
 
@@ -1589,7 +1600,7 @@
                     wf_service.trg_validate(uid, 'sale.order.line', sourcing_line.id, 'confirmed', cr) # confirmation create pick/out or INT
 
                 elif sourcing_line.type == 'make_to_order':
-                    if sourcing_line.po_cft in ('po', 'dpo'):
+                    if sourcing_line.po_cft in ('po', 'dpo', 'pli'):
                         po_to_use = self.get_existing_po(cr, uid, sourcing_line.id, context=context)
                         if not po_to_use: # then create new PO:
                             po_to_use = self.create_po_from_sourcing_line(cr, uid, sourcing_line.id, context=context)
@@ -2124,6 +2135,16 @@
             res['value'].update({'po_cft': 'dpo'})
 
         partner_id = 'supplier' in value and value['supplier'] or partner_id
+
+        if partner_id:
+            p_type = self.pool.get('res.partner').read(cr, uid, partner_id, ['partner_type'], context=context)['partner_type']
+            if po_cft == 'pli' and p_type != 'external':
+                res['warning'] = {
+                    'title': _('Warning'),
+                    'message': _("""'Purchase List' is not allowed with a non-external partner."""),
+                }
+                res['value'].update({'po_cft': 'po'})
+
         if line_id and partner_id and line.product_id:
             check_fnct = product_obj._on_change_restriction_error
             res, error = self._check_product_constraints(
@@ -2280,6 +2301,13 @@
                 'message': _('The chosen partner has no address. Please define an address before continuing.'),
             }
 
+        # Search the local market partner id
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj.search(cr, uid, [('module', '=', 'order_types'), ('model', '=', 'res.partner'),
+                                            ('name', '=', 'res_partner_local_market')], limit=1, order='NO_ORDER')
+        if data_id and partner.id == data_obj.read(cr, uid, data_id, ['res_id'])[0]['res_id']:
+            result['value'].update({'po_cft': 'pli'})
+
         # If the selected partner belongs to product->suppliers, we take that delay (from supplierinfo)
         line = self.browse(cr, uid, line_id, context=context)
         delay = self.check_supplierinfo(line, partner, context=context)
 
=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing.py'
--- bin/addons/sourcing/wizard/multiple_sourcing.py	2019-07-30 09:41:15 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing.py	2021-03-25 11:03:52 +0000
@@ -438,7 +438,7 @@
             },
         }
 
-    def change_po_cft(self, cr, uid, ids, po_cft, context=None):
+    def change_po_cft(self, cr, uid, ids, po_cft, supplier_id, context=None):
         """
         Unset the supplier if tender is choose
         :param cr: Cursor to the database
@@ -451,6 +451,17 @@
         if po_cft == 'cft':
             return {'value': {'supplier_id': False}}
 
+        if supplier_id:
+            suppl_type = self.pool.get('res.partner').read(cr, uid, supplier_id, ['partner_type'], context=context)['partner_type']
+            if po_cft == 'pli' and suppl_type != 'external':
+                return {
+                    'value': {'po_cft': False},
+                    'warning': {
+                        'title': _('Warning'),
+                        'message': _("""You can't source with 'Purchase List' to a non-external partner."""),
+                    },
+                }
+
         return {}
 
     def change_supplier(self, cr, uid, ids, supplier, l_type, context=None):
@@ -486,6 +497,13 @@
                 'supplier_type': partner and partner.partner_type or False,
                 'supplier_split_po': partner and partner.split_po or False,
             })
+
+            # Search the local market partner id
+            data_obj = self.pool.get('ir.model.data')
+            data_id = data_obj.search(cr, uid, [('module', '=', 'order_types'), ('model', '=', 'res.partner'),
+                                                ('name', '=', 'res_partner_local_market')], limit=1, order='NO_ORDER')
+            if data_id and partner.id == data_obj.read(cr, uid, data_id, ['res_id'])[0]['res_id']:
+                result['value'].update({'po_cft': 'pli'})
         else:
             result['value'].update({
                 'supplier_type': False,
 
=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing_view.xml'
--- bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2019-06-07 12:15:15 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2021-03-25 11:03:52 +0000
@@ -20,7 +20,7 @@
                         <field name="type" 
                                on_change="change_type(line_ids, type, supplier)"/>
                         <field name="po_cft" attrs="{'readonly': [('type', '=', 'make_to_stock')]}"
-                               on_change="change_po_cft(po_cft)"/>
+                               on_change="change_po_cft(po_cft, supplier_id)"/>
                         <field name="run_scheduler" />
                         <separator colspan="4" string="Supplier selection" />
                         <field name="supplier_id"