Merge lp:~unifield-team/unifield-wm/us-31 into lp:unifield-wm

[Quentin THEURET @Amaris]

[lp:~unifield-team/unifield-wm/us-31]

2405. By Quentin THEURET @Amaris on 2015-03-02

US-31 [FIX] On multiple line OST, the supplier can not be choosen

=== modified file 'sourcing/sale_order_line.py'
--- sourcing/sale_order_line.py	2014-10-22 08:44:42 +0000
+++ sourcing/sale_order_line.py	2015-03-02 20:31:41 +0000
@@ -48,32 +48,6 @@
     _inherit = 'sale.order.line'
     _description = 'Sales Order Line'
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        if context is None:
-            context = {}
-
-        '''
-            !!!!! ATTENTION ATTENTION!!!!!!
-            UTP-1021: This solution is NOT stable and could be dangerous!!!!
-            need to have a proper fix for this,
-            currently we have only 3 tree views for sale.order.line
-            so I use the value in the context to identify that it is not the
-            view of wizard, but this assumption could be totally WRONG!
-            But in this current version, it works!
-        '''
-        if not context.get('search_default_need_sourcing', False) and \
-            view_type == 'tree':
-            if '_terp_view_name' in context:
-                '''
-                UFTP-346: HACK ON HACK UTP-1021
-                '_terp_view_name' not set if grouping
-                and we do not want special view when grouping
-                '''
-                view_id = self.pool.get('ir.model.data').get_object_reference(
-                    cr, uid, 'sourcing', 'sourcing_line_special_tree_view')[1]
-        return super(sale_order_line, self).fields_view_get(cr, uid, view_id,
-            view_type, context, toolbar, submenu)
-
     """
     Other methods
     """
 
=== modified file 'sourcing/wizard/multiple_sourcing.py'
--- sourcing/wizard/multiple_sourcing.py	2014-10-10 12:26:59 +0000
+++ sourcing/wizard/multiple_sourcing.py	2015-03-02 20:31:41 +0000
@@ -53,7 +53,7 @@
             'stock.location',
             string='Location',
         ),
-        'supplier': fields.many2one(
+        'supplier_id': fields.many2one(
             'res.partner',
             string='Supplier',
             help="If you have choose lines coming from Field Orders, only External/ESC suppliers will be available.",
@@ -124,7 +124,7 @@
         if loc != -1:
             res['location_id'] = loc
         if supplier != -1:
-            res['supplier'] = supplier
+            res['supplier_id'] = supplier
 
         if not res['line_ids']:
             raise osv.except_osv(_('Error'), _('No non-sourced lines are selected. Please select non-sourced lines'))
@@ -146,7 +146,7 @@
             if wiz.type == 'make_to_order':
                 if not wiz.po_cft:
                     raise osv.except_osv(_('Error'), _('The Procurement method should be filled !'))
-                elif wiz.po_cft != 'cft' and not wiz.supplier:
+                elif wiz.po_cft != 'cft' and not wiz.supplier_id:
                     raise osv.except_osv(_('Error'), _('You should select a supplier !'))
 
             errors = {}
@@ -159,7 +159,7 @@
                     try:
                         line_obj.write(cr, uid, [line.id], {'type': wiz.type,
                                                             'po_cft': wiz.po_cft,
-                                                            'supplier': wiz.supplier and wiz.supplier.id or False,
+                                                            'supplier': wiz.supplier_id and wiz.supplier_id.id or False,
                                                             'location_id': wiz.location_id.id and wiz.location_id.id or False},
                                                              context=context)
                     except osv.except_osv, e:
@@ -227,7 +227,7 @@
         if l_type == 'make_to_order':
             return {'value': {'location_id': False}}
 
-        res = {'value': {'po_cft': False, 'supplier': False}}
+        res = {'value': {'po_cft': False, 'supplier_id': False}}
         if not context or not context[0] or not context[0][2]:
             return res
 
@@ -248,15 +248,15 @@
                 all_line_empty = False
 
         if all_line_empty: # by default, and if all lines has no location, then set by default Stock
-            return {'value': {'po_cft': False, 'supplier': False, 'location_id': stock_loc}}
-        return {'value': {'po_cft': False, 'supplier': False}}
+            return {'value': {'po_cft': False, 'supplier_id': False, 'location_id': stock_loc}}
+        return {'value': {'po_cft': False, 'supplier_id': False}}
 
     def change_po_cft(self, cr, uid, ids, po_cft, context=None):
         '''
         Unset the supplier if tender is choosen
         '''
         if po_cft == 'cft':
-            return {'value': {'supplier': False}}
+            return {'value': {'supplier_id': False}}
 
         return {}
 
@@ -278,16 +278,16 @@
                 }
         return result
 
-    def change_location(self, cr, uid, ids, location_id, context=None):
+    def change_location(self, cr, uid, ids, location_id, line_ids, context=None):
         res = {'value': {}}
         if not location_id:
             return res
 
-        if not context or not context[0] or not context[0][2]:
+        if not line_ids or not line_ids[0] or not line_ids[0][2]:
             return res
 
         line_obj = self.pool.get('sale.order.line')
-        active_ids = context[0][2]
+        active_ids = line_ids[0][2]
 
         context = {}
         context.update({'from_multiple_line_sourcing': False})
 
=== modified file 'sourcing/wizard/multiple_sourcing_view.xml'
--- sourcing/wizard/multiple_sourcing_view.xml	2014-10-09 13:19:51 +0000
+++ sourcing/wizard/multiple_sourcing_view.xml	2015-03-02 20:31:41 +0000
@@ -15,35 +15,24 @@
                     </group>
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Selected lines to source" />
-                        <field name="line_ids" nolabel="1" colspan="4">
-                            <tree string="Lines to source" hide_new_button="True" noteditable="True">
-                                <field name="order_id" string="Order reference" />
-                                <field name="line_number" />
-                                <field name="product_id" />
-                                <field name="product_uom_qty" />
-                                <field name="product_uom" />
-                                <field name="real_stock" />
-                                <field name="available_stock" />
-                                <field name="virtual_stock" />
-                            </tree>
-                        </field>
+                        <field name="line_ids" nolabel="1" colspan="4" />
                         <separator colspan="4" string="Procurement method" />
                         <field name="type" 
-                               on_change="change_type(type, line_ids)"/>
+                               on_change="change_type(type)"/>
                         <field name="po_cft" attrs="{'readonly': [('type', '=', 'make_to_stock')]}"
                                on_change="change_po_cft(po_cft)"/>
                         <separator colspan="4" string="Supplier selection" />
-                        <field name="supplier"
+                        <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')]}"
-                               on_change="change_supplier(supplier)"
+                               on_change="change_supplier(supplier_id)"
                         />
 
 
                    <field name="location_id"  domain="[('usage', '=', 'internal'), ('quarantine_location', '=', False), 
                                                       ('scrap_location', '=', False), ('destruction_location', '=', False), 
                                                       ('output_ok', '=', False), ('input_ok', '=', False)]" 
-                              attrs="{'readonly': [('type', '!=', 'make_to_stock')]}" 
+                                                      attrs="{'readonly': [('type', '!=', 'make_to_stock')]}" 
                               on_change="change_location(location_id, line_ids)" />
 
                     </group>
@@ -59,8 +48,8 @@
         <record id="sourcing_line_special_tree_view" model="ir.ui.view">
             <field name="name">sourcing.line.special.tree.view</field>
             <field name="model">sale.order.line</field>
-            <field name="type">form</field>
-            <field name="priority" eval="5000" />
+            <field name="type">tree</field>
+            <field name="priority" eval="10" />
             <field name="arch" type="xml">
                 <tree string="Lines to source" hide_new_button="True" noteditable="True">
                     <field name="order_id" string="Order reference" />