Merge lp:~unifield-team/unifield-wm/bklg-3 into lp:unifield-wm

[jftempo]

=== modified file 'msf_doc_import/wizard/wiz_common_import.py'
--- msf_doc_import/wizard/wiz_common_import.py	2014-09-19 12:18:46 +0000
+++ msf_doc_import/wizard/wiz_common_import.py	2015-02-10 13:20:38 +0000
@@ -26,6 +26,14 @@
 from tools.translate import _
 
 
+NO_QTY_MODELS = [
+    'monthly.review.consumption',
+    'stock.warehouse.orderpoint',
+    'threshold.value',
+    'stock.warehouse.order.cycle',
+]
+
+
 class wiz_common_import(osv.osv_memory):
     '''
     Special methods for the import wizards
@@ -115,6 +123,8 @@
         '''
         Open the wizard
         '''
+        data_obj = self.pool.get('ir.model.data')
+
         if context is None:
             context = {}
 
@@ -125,15 +135,31 @@
             'search_default_not_restricted': 1 if 'search_default_not_restricted' in context else 0,
         }
         wiz_id = self.create(cr, uid, vals, context=context)
+        context['wizard_id'] = wiz_id
+
+        if parent_model in NO_QTY_MODELS:
+            view_id = data_obj.get_object_reference(cr, uid, 'msf_doc_import', 'wizard_common_import_line_form_view_no_qty')[1]
+        else:
+            view_id = data_obj.get_object_reference(cr, uid, 'msf_doc_import', 'wizard_common_import_line_form_view')[1]
+
 
         return {'type': 'ir.actions.act_window',
                 'res_model': self._name,
                 'res_id': wiz_id,
+                'view_id': [view_id],
                 'view_type': 'form',
                 'view_mode': 'form',
                 'target': 'new',
                 'context': context}
 
+    def _get_current_id(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+
+        for i in ids:
+            res[i] = i
+
+        return res
+
     _columns = {
         'parent_id': fields.integer(string='ID of the parent document'),
         'parent_model': fields.char(size=128, string='Model of the parent document'),
@@ -141,6 +167,7 @@
         'product_ids': fields.many2many('product.product', 'product_add_in_line_rel',
                                         'wiz_id', 'product_id', string='Products'),
         'search_default_not_restricted': fields.integer('Search default not restricted', invisible=True),  # UFTP-15 (for context reinject in product_ids m2m for 'add multiple lines' button)
+        'current_id': fields.function(_get_current_id, method=True, type='integer', string='ID'),
     }
 
     _defaults = {
@@ -165,6 +192,8 @@
             line_obj = self.pool.get(wiz['line_model'])
             product_ids = wiz['product_ids']
 
+            context['wizard_id'] = wiz['id']
+
             line_obj.create_multiple_lines(cr, uid, parent_id, product_ids, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
@@ -172,6 +201,76 @@
 wizard_common_import_line()
 
 
+class product_product_import_line_qty(osv.osv_memory):
+    _name = 'product.product.import.line.qty'
+
+    _columns = {
+        'wizard_id': fields.many2one(
+            'wizard.common.import.line',
+            string='Wizard',
+        ),
+        'product_id': fields.many2one(
+            'product.product',
+            string='Product',
+        ),
+        'qty': fields.float(
+            string='Qty',
+        ),
+    }
+
+product_product_import_line_qty()
+
+
+class product_product(osv.osv):
+    _inherit = 'product.product'
+
+    def _get_import_product_qty(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        pplq_obj = self.pool.get('product.product.import.line.qty')
+
+        wiz_id = context.get('wizard_id', None)
+        for i in ids:
+            res[i] = 0.00
+            if wiz_id:
+                pplq_ids = pplq_obj.search(cr, uid, [
+                    ('wizard_id', '=', wiz_id),
+                    ('product_id', '=', i),
+                ], context=context)
+                if pplq_ids:
+                    res[i] = pplq_obj.read(cr, uid, pplq_ids, ['qty'])[0]['qty']
+
+        return res
+
+    def _write_imp_product_qty(self, cr, uid, ids, field_name, values, args, context=None):
+        """
+        Create a product.product.import.line.qty for each product/wizard and put the 
+        quantity.
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if field_name == 'import_product_qty' and context.get('wizard_id', None):
+            for prod_id in ids:
+                self.pool.get('product.product.import.line.qty').create(cr, uid, {
+                    'wizard_id': context.get('wizard_id'),
+                    'product_id': prod_id,
+                    'qty': values,
+                }, context=context)
+
+    _columns = {
+        'import_product_qty': fields.function(
+            _get_import_product_qty,
+            fnct_inv=_write_imp_product_qty,
+            method=True,
+            type='float',
+            string='Qty',
+            store=False,
+        ),
+    }
+
+product_product()
+
+
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
 
@@ -185,7 +284,7 @@
         context = context is None and {} or context
         product_ids = isinstance(product_ids, (int, long)) and [product_ids] or product_ids
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'standard_price'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'standard_price', 'import_product_qty'], context=context):
             po_data = po_obj.read(cr, uid, parent_id, ['pricelist_id', 'partner_id', 'date_order',
                                                        'fiscal_position', 'state'], context=context)
 
@@ -193,12 +292,13 @@
                       'product_id': p_data['id'],
                       'product_uom': p_data['uom_id'][0],
                       'price_unit': p_data['standard_price'],
+                      'product_qty': p_data['import_product_qty'],
                       'old_price_unit': p_data['standard_price'],}
 
             values.update(self.product_id_on_change(cr, uid, False,
                                                     po_data['pricelist_id'][0], # Pricelist
                                                     values['product_id'], # Product
-                                                    1.00, # Product Qty - Use 1.00 to compute the price according to supplier catalogue
+                                                    p_data['import_product_qty'], # Product Qty - Use 1.00 to compute the price according to supplier catalogue
                                                     values['product_uom'], # UoM
                                                     po_data['partner_id'][0], # Supplier
                                                     po_data['date_order'], # Date order
@@ -213,7 +313,7 @@
                                                     '', # Comment
                                                     context=context).get('value', {}))
             # Set the quantity to 0.00
-            values.update({'product_qty': 0.00})
+            values.update({'product_qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True, import_in_progress=True))
 
@@ -269,15 +369,15 @@
         context = context is None and {} or context
         product_ids = isinstance(product_ids, (int, long)) and [product_ids] or product_ids
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'import_product_qty'], context=context):
             values = {'tender_id': parent_id,
                       'product_id': p_data['id'],
                       'product_uom': p_data['uom_id'][0]}
 
-            values.update(self.on_product_change(cr, uid, False, p_data['id'], p_data['uom_id'][0], 1.00, context=context).get('value', {}))
+            values.update(self.on_product_change(cr, uid, False, p_data['id'], p_data['uom_id'][0], p_data['import_product_qty'], context=context).get('value', {}))
 
             # Set the quantity to 0.00
-            values.update({'qty': 0.00})
+            values.update({'qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True, import_in_progress=True))
 
@@ -325,32 +425,38 @@
         context = context is None and {} or context
         product_ids = isinstance(product_ids, (int, long)) and [product_ids] or product_ids
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'import_product_qty'], context=context):
             order_data = order_obj.read(cr, uid, parent_id, ['pricelist_id',
                                                              'partner_id',
                                                              'date_order',
+                                                             'procurement_request',
                                                              'fiscal_position'], context=context)
 
             values = {'order_id': parent_id,
                       'product_id': p_data['id'],
                       'product_uom': p_data['uom_id'][0]}
 
-            values.update(self.product_id_change(cr, uid, False, order_data['pricelist_id'][0],
-                                                                 p_data['id'],
-                                                                 1.00,
-                                                                 p_data['uom_id'][0],
-                                                                 p_data['uom_id'][0],
-                                                                 '',
-                                                                 order_data['partner_id'][0],
-                                                                 context.get('lang'),
-                                                                 True,
-                                                                 order_data['date_order'],
-                                                                 False,
-                                                                 order_data['fiscal_position'] and order_data['fiscal_position'][0] or False,
-                                                                 False).get('value', {}))
+            if order_data['procurement_request']:
+                values.update(self.requested_product_id_change(cr, uid, False,
+                                                               p_data['id'],
+                                                               '').get('value', {}))
+            else:
+                values.update(self.product_id_change(cr, uid, False, order_data['pricelist_id'][0],
+                                                                     p_data['id'],
+                                                                     p_data['import_product_qty'],
+                                                                     p_data['uom_id'][0],
+                                                                     p_data['uom_id'][0],
+                                                                     '',
+                                                                     order_data['partner_id'][0],
+                                                                     context.get('lang'),
+                                                                     True,
+                                                                     order_data['date_order'],
+                                                                     False,
+                                                                     order_data['fiscal_position'] and order_data['fiscal_position'][0] or False,
+                                                                     False).get('value', {}))
 
             # Set the quantity to 0.00
-            values.update({'product_uom_qty': 0.00, 'product_uos_qty': 0.00})
+            values.update({'product_uom_qty': p_data['import_product_qty'], 'product_uos_qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True, import_in_progress=True))
 
@@ -416,14 +522,14 @@
         context = context is None and {} or context
         product_ids = isinstance(product_ids, (int, long)) and [product_ids] or product_ids
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'standard_price'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'standard_price', 'import_product_qty'], context=context):
             values = {'item_kit_id': parent_id,
                       'item_product_id': p_data['id'],
                       'item_uom_id': p_data['uom_id'][0],}
 
             values.update(self.on_product_change(cr, uid, False, values['item_product_id'], context=context).get('value', {}))
             # Set the quantity to 0.00
-            values.update({'product_qty': 0.00})
+            values.update({'item_qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True, import_in_progress=True))
 
@@ -460,7 +566,7 @@
         context = context is None and {} or context
         product_ids = isinstance(product_ids, (int, long)) and [product_ids] or product_ids
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'standard_price'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'standard_price', 'import_product_qty'], context=context):
             values = {'product_id': p_data['id'],
                       'catalogue_id': parent_id,
                       'unit_price': p_data['standard_price'],
@@ -470,7 +576,7 @@
             values.update(self.product_change(cr, uid, False, p_data['id'], 1.00, 1.00).get('value', {}))
 
             # Set the quantity to 0.00
-            values.update({'min_qty': 0.00})
+            values.update({'min_qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True, import_in_progress=True))
 
@@ -521,7 +627,7 @@
         else:
             location_id = get_ref(cr, uid, 'stock', 'stock_location_stock')[1]
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'name', 'nomen_manda_0'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'name', 'nomen_manda_0', 'import_product_qty'], context=context):
             # Set the location dest id
             if picking.type == 'internal':
                 location_dest_id = get_ref(cr, uid, 'msf_cross_docking', 'stock_location_cross_docking')[1]
@@ -544,7 +650,7 @@
 
             values.update(self.onchange_product_id(cr, uid, False, p_data['id'], location_id, location_dest_id, picking.address_id and picking.address_id.id or False, picking.type, False).get('value', {}))
 
-            values.update({'product_qty': 0.00})
+            values.update({'product_qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True, import_in_progress=True))
 
@@ -605,7 +711,7 @@
                     parent_vals[f] = parent_r[f] or 0.
 
         # set line vals
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id'],
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'import_product_qty'],
             context=context):
             values = {
                 'product_id': p_data['id'],
@@ -664,14 +770,14 @@
         '''
         p_obj = self.pool.get('product.product')
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'import_product_qty'], context=context):
             values = {'product_id': p_data['id'],
                       'product_uom_id': p_data['uom_id'][0],
                       'supply_id': parent_id}
 
-            values.update(self.onchange_product_id(cr, uid, False, p_data['id'], p_data['uom_id'][0], 1.00, context=context).get('value', {}))
+            values.update(self.onchange_product_id(cr, uid, False, p_data['id'], p_data['uom_id'][0], p_data['import_product_qty'], context=context).get('value', {}))
             # Set the quantity to 0.00
-            values.update({'product_qty': 0.00})
+            values.update({'product_qty': p_data['import_product_qty']})
 
             if not self.search(cr, uid, [('product_id', '=', p_data['id']), ('supply_id', '=', parent_id)], context=context):
                 self.create(cr, uid, values, context=dict(context, noraise=True))
@@ -706,14 +812,14 @@
         '''
         p_obj = self.pool.get('product.product')
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'import_product_qty'], context=context):
             values = {'product_id': p_data['id'],
                       'uom_id': p_data['uom_id'][0],
                       'order_cycle_id': parent_id}
 
             values.update(self.product_change(cr, uid, False, p_data['id'], context=context).get('value', {}))
             # Set the quantity to 0.00
-            values.update({'safety_stock': 0.00})
+            values.update({'safety_stock': p_data['import_product_qty']})
 
             if not self.search(cr, uid, [('product_id', '=', p_data['id']), ('order_cycle_id', '=', parent_id)], context=context):
                 self.create(cr, uid, values, context=dict(context, noraise=True))
@@ -750,7 +856,7 @@
 
         t_data = self.pool.get('threshold.value').browse(cr, uid, parent_id, context=context)
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'import_product_qty'], context=context):
             values = {'product_id': p_data['id'],
                       'product_uom_id': p_data['uom_id'],
                       'threshold_value_id': parent_id}
@@ -768,7 +874,7 @@
                                                    t_data.lead_time,
                                                    t_data.supplier_lt,).get('value', {}))
             # Set the quantity to 0.00
-            values.update({'fixed_product_qty': 0.00, 'fixed_threshold_value': 0.00})
+            values.update({'fixed_product_qty': p_data['import_product_qty'], 'fixed_threshold_value': 0.00})
 
             if not self.search(cr, uid, [('product_id', '=', p_data['id']), ('threshold_value_id', '=', parent_id)], context=context):
                 self.create(cr, uid, values, context=dict(context, noraise=True))
@@ -807,7 +913,7 @@
         location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')[1]
         reason_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'reason_types_moves', 'reason_type_loss')[1]
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'import_product_qty'], context=context):
             values = {'product_id': p_data['id'],
                       'product_uom': p_data['uom_id'][0],
                       'location_id': location_id,
@@ -817,7 +923,7 @@
             values.update(self.on_change_product_id(cr, uid, False, location_id, p_data['id'], p_data['uom_id'][0], False).get('value', {}))
 
             # Set the quantity to 0.00
-            values.update({'product_qty': 0.00})
+            values.update({'product_qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True))
 
@@ -856,7 +962,7 @@
         location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')[1]
         reason_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'reason_types_moves', 'reason_type_loss')[1]
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'perishable', 'batch_management'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'perishable', 'batch_management', 'import_product_qty'], context=context):
             values = {'product_id': p_data['id'],
                       'product_uom': p_data['uom_id'][0],
                       'location_id': location_id,
@@ -868,7 +974,7 @@
             values.update(self.on_change_product_id(cr, uid, False, location_id, p_data['id'], p_data['uom_id'][0], False).get('value', {}))
 
             # Set the quantity to 0.00
-            values.update({'product_qty': 0.00})
+            values.update({'product_qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True))
 
@@ -906,7 +1012,7 @@
 
         c_data = self.pool.get('real.average.consumption').read(cr, uid, parent_id, ['cons_location_id'], context=context)
 
-        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id'], context=context):
+        for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'import_product_qty'], context=context):
             values = {'product_id': p_data['id'],
                       'uom_id': p_data['uom_id'],
                       'rac_id': parent_id}
@@ -914,7 +1020,7 @@
             values.update(self.product_onchange(cr, uid, False, p_data['id'], c_data['cons_location_id'][0], p_data['uom_id'][0], False).get('value', {}))
 
             # Set the quantity to 0.00
-            values.update({'consumed_qty': 0.00})
+            values.update({'consumed_qty': p_data['import_product_qty']})
 
             self.create(cr, uid, values, context=dict(context, noraise=True))
 

=== modified file 'msf_doc_import/wizard/wiz_common_import_view.xml'
--- msf_doc_import/wizard/wiz_common_import_view.xml	2014-03-25 08:12:08 +0000
+++ msf_doc_import/wizard/wiz_common_import_view.xml	2015-02-10 13:20:38 +0000
@@ -11,10 +11,35 @@
                     <field name="parent_id" invisible="1" />
                     <field name="parent_model" invisible="1" />
                     <field name="search_default_not_restricted" invisible="1" />
-                    <field name="product_ids" nolabel="1" colspan="4" mode="tree" domain="context.get('product_ids_domain', [])" context="{'search_default_not_restricted': search_default_not_restricted}">
-                        <tree string="Products" noteditable="True">
-                            <field name="default_code" />
-                            <field name="name" />
+                    <field name="current_id" invisible="1" />
+                    <field name="product_ids" nolabel="1" colspan="4" mode="tree" domain="context.get('product_ids_domain', [])" context="{'search_default_not_restricted': search_default_not_restricted, 'wizard_id': current_id}">
+                        <tree string="Products" editable="top">
+                            <field name="default_code" readonly="True" />
+                            <field name="name" readonly="True" />
+                            <field name="import_product_qty" />
+                        </tree>
+                    </field>
+                    <separator colspan="4" string="Actions" />
+                    <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                    <button name="fill_lines" string="Add products" icon="terp-check" colspan="3" type="object" />
+                </form>
+            </field>
+        </record>
+
+        <record id="wizard_common_import_line_form_view_no_qty" model="ir.ui.view">
+            <field name="name">wizard.common.import.line.form.view.no.qty</field>
+            <field name="model">wizard.common.import.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add multiple products">
+                    <field name="parent_id" invisible="1" />
+                    <field name="parent_model" invisible="1" />
+                    <field name="search_default_not_restricted" invisible="1" />
+                    <field name="current_id" invisible="1" />
+                    <field name="product_ids" nolabel="1" colspan="4" mode="tree" domain="context.get('product_ids_domain', [])" context="{'search_default_not_restricted': search_default_not_restricted, 'wizard_id': current_id}">
+                        <tree string="Products" editable="top">
+                            <field name="default_code" readonly="True" />
+                            <field name="name" readonly="True" />
                         </tree>
                     </field>
                     <separator colspan="4" string="Actions" />