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

[jftempo]

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2018-11-12 14:03:59 +0000
+++ bin/addons/sale/sale_workflow.py	2019-01-28 14:18:02 +0000
@@ -570,6 +570,12 @@
                     _('Line #%s: You have to select a product UoM in the same category than the UoM of the product.')
                     % (sol.line_number,)
                 )
+
+            # US-4576: Set supplier
+            if sol.type == 'make_to_order' and sol.order_id.order_type not in ['loan', 'donation_st', 'donation_exp']\
+                    and sol.product_id and sol.product_id.seller_id:
+                to_write['supplier'] = sol.product_id.seller_id.id
+
             if not sol.stock_take_date and sol.order_id.stock_take_date:
                 to_write['stock_take_date'] = sol.order_id.stock_take_date
             if sol.order_id.order_type == 'loan':

=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2018-11-09 16:10:16 +0000
+++ bin/addons/sourcing/sale_order_line.py	2019-01-28 14:18:02 +0000
@@ -2187,6 +2187,8 @@
                     'title': _('Warning'),
                     'message': _('You cannot choose \'from stock\' as method to source a %s product !') % product_type,
                 })
+            if l_type == 'make_to_order' and line.product_id and line.product_id.seller_id:
+                value['supplier'] = line.product_id.seller_id.id
 
         if l_type == 'make_to_stock':
             if not location_id:
@@ -2198,6 +2200,7 @@
                 'po_cft': False,
                 'related_sourcing_ok': False,
                 'related_sourcing_id': False,
+                'supplier': False,
             })
 
             res = {'value': value, 'warning': message}

=== modified file 'bin/addons/sourcing/sourcing_view.xml'
--- bin/addons/sourcing/sourcing_view.xml	2017-11-14 14:38:28 +0000
+++ bin/addons/sourcing/sourcing_view.xml	2019-01-28 14:18:02 +0000
@@ -67,7 +67,7 @@
 					<field name="supplier" colspan="2"
 						domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft),('check_partner', '=', order_id)]"
                         context="{'product_id': product_id, 'choose_supplier': True, 'uom': product_uom, 'product_qty': product_uom_qty}"
-						attrs="{'readonly': ['|', ('po_cft', '=', 'cft'), '|', ('type', '=', 'make_to_stock'), ('state', '!=', 'validated')]}"
+						attrs="{'readonly': ['|', ('po_cft', '=', 'cft'), ('state', '!=', 'validated')], 'invisible': [('type', '=', 'make_to_stock')]}"
 						on_change="onChangeSupplier(supplier, type)" />
 					<field name="customer" invisible="1" />
 					<field name="estimated_delivery_date" />

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing.py'
--- bin/addons/sourcing/wizard/multiple_sourcing.py	2018-06-26 13:27:10 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing.py	2019-01-28 14:18:02 +0000
@@ -306,7 +306,25 @@
 
         return {'type': 'ir.actions.act_window_close'}
 
-    def change_type(self, cr, uid, ids, l_type, supplier, context=None):
+    def get_same_seller(self, cr, uid, sols, context=None):
+        if context is None:
+            context = {}
+
+        res = False
+        for line in self.pool.get('sale.order.line').browse(cr, uid, sols[0][2], fields_to_fetch=['product_id'], context=context):
+            if line.product_id and line.product_id.seller_id:
+                if res and res != line.product_id.seller_id.id:
+                    res = False
+                    break
+                else:
+                    res = line.product_id.seller_id.id
+            else:
+                res = False
+                break
+
+        return res
+
+    def change_type(self, cr, uid, ids, lines, l_type, supplier, context=None):
         """
         Unset the other fields if the type is 'from stock'
         :param cr: Cursor to the database
@@ -327,7 +345,8 @@
             return {
                 'value': {
                     'location_id': False,
-                    'related_sourcing_ok': sol_obj._check_related_sourcing_ok(cr, uid, supplier, l_type, context=context)
+                    'related_sourcing_ok': sol_obj._check_related_sourcing_ok(cr, uid, supplier, l_type, context=context),
+                    'supplier_id': self.get_same_seller(cr, uid, lines, context=context),
                 },
             }
 

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing_view.xml'
--- bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2017-07-04 12:28:07 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2019-01-28 14:18:02 +0000
@@ -18,14 +18,14 @@
                         <field name="line_ids" nolabel="1" colspan="4" />
                         <separator colspan="4" string="Procurement method" />
                         <field name="type" 
-                               on_change="change_type(type, supplier)"/>
+                               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)"/>
                         <field name="run_scheduler" />
                         <separator colspan="4" string="Supplier selection" />
                         <field name="supplier_id"
                                domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft), ('line_contains_fo', '=', line_ids)]"
-                               attrs="{'readonly': ['|', ('po_cft', '=', 'cft'), ('type', '=', 'make_to_stock')]}"
+                               attrs="{'readonly': [('po_cft', '=', 'cft')], 'invisible': [('type', '=', 'make_to_stock')]}"
                                on_change="change_supplier(supplier_id, type)"
                         />