Merge lp:~openerp-dev/openobject-addons/trunk-bug-776245-ron into lp:openobject-addons

[Rohan Nayani(Open ERP)]

[Rucha (Open ERP) (rpa-openerp)]

Put proper warning message, it doesn't suit for incoming shipment

review: Needs Fixing

[Rohan Nayani(Open ERP) (ron-tinyerp)]

review: Needs Resubmitting

[Rohan Nayani(Open ERP) (ron-tinyerp)]

review: Needs Resubmitting

[Rucha (Open ERP) (rpa-openerp)]

when we are providing more quantity than move qty the warning is being displayed nicely (thats good), but when I click on ok in that form, it spits based on some another values than the specified one.
check following scenario:

Create incoming shipment for 5 PC1
spit the move (value of "Existing Lots" is False) as follows:
lots qty
A 3
B 3

the warning will appear and then if you click on "ok" it will spit like:
prodlot qty
A 3
        2

which is wrong,
if you follow the same steps again for another picking, it will have more weird behaviour!

fix this please

review: Needs Fixing

[Rohan Nayani(Open ERP) (ron-tinyerp)]

review: Needs Resubmitting

[Rucha (Open ERP) (rpa-openerp)]

1) this wizard is not working for physical inventory, its giving traceback

2) some suggestions for names of method:
    lot_check_qty => check_lot_qty
    get_split_line => get_split_lines
    back_split => go_back/back

3) word "order" doesn't suit in the warning message, this wizard is generic and used in inventory too

4) def lot_check_qty:
    why there is a search and read on ir.model.data to get view reference, we already have methods in ir.model.data to get id

5) def get_split_line:
    I think we can simplify this method and remove unused arguments

6) if quantity_rest == 0 or quantity_rest < 0:
    can't it be simply if quantity_rest <= 0 ?? ;-)

7) default_get of stock.move.split.message
    uom = self.pool.get('product.uom').browse(cr, uid, move.product_uom.id, context=context).name
    will be move.product_uom.name
    again check this variable is no longer used in that function

8) res.update({'line_ids': (context.get('line')) or False})
    will be context.get('line', [])
    also its better to use 'lines' instead of 'line'

9) if possible I would like to reduce lots of code in def split and lot_check_qty, please check if there is a chance to make both common,
    can't we use split_lot instead of new method lot_check_qty?

review: Needs Fixing

[Rohan Nayani(Open ERP) (ron-tinyerp)]

review: Needs Resubmitting

[Fabien (Open ERP) (fp-tinyerp)]

I applied a simpler patch in r5224

=== modified file 'stock/wizard/stock_inventory_line_split.py'
--- stock/wizard/stock_inventory_line_split.py	2011-02-15 12:06:58 +0000
+++ stock/wizard/stock_inventory_line_split.py	2011-07-06 08:31:50 +0000
@@ -22,14 +22,13 @@
 from osv import fields, osv
 
 from tools.translate import _
+import decimal_precision as dp
 import time
 
 class stock_inventory_line_split(osv.osv_memory):
-    _inherit = "stock.move.split"
     _name = "stock.inventory.line.split"
     _description = "Split inventory lines"
 
-
     def default_get(self, cr, uid, fields, context=None):
         """ To check the availability of production lot.
         @param self: The object pointer.
@@ -48,10 +47,25 @@
             res.update({'product_id':line.product_id.id})
         if 'product_uom' in fields:
             res.update({'product_uom': line.product_uom.id})
-        if 'qty' in fields:
-            res.update({'qty': line.product_qty})
+        if 'product_qty' in fields:
+            res.update({'product_qty': line.product_qty})
+        if context.get('lines'):
+            if 'line_ids' in fields:
+                res.update({'line_ids': context.get('lines', [])})
+            if ('use_exist_true' in context['lines'][0].keys()) and ('line_exist_ids' in fields):
+                    res.update({'use_exist': True, 'line_exist_ids': context.get('lines', [])})
+
         return res
 
+    _columns = {
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+        'product_uom': fields.many2one('product.uom', 'UoM'),
+        'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Production Lots'),
+        'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Production Lots'),
+        'use_exist' : fields.boolean('Existing Lots', help="Check this option to select existing lots in the list below, otherwise you should enter new ones line by line."),
+     }
+
     def split(self, cr, uid, ids, line_ids, context=None):
         """ To split stock inventory lines according to production lot.
         @param self: The object pointer.
@@ -71,25 +85,19 @@
                 line_qty = inv_line.product_qty
                 quantity_rest = inv_line.product_qty
                 new_line = []
-                if data.use_exist:
-                    lines = [l for l in data.line_exist_ids if l]
-                else:
-                    lines = [l for l in data.line_ids if l]
+                lines = self.pool.get('stock.move.split').get_split_lines(cr, uid, data)
                 for line in lines:
                     quantity = line.quantity
                     if quantity <= 0 or line_qty == 0:
                         continue
                     quantity_rest -= quantity
-                    if quantity_rest < 0:
-                        quantity_rest = quantity
-                        break
                     default_val = {
                         'product_qty': quantity,
                     }
                     if quantity_rest > 0:
                         current_line = line_obj.copy(cr, uid, inv_line.id, default_val)
                         new_line.append(current_line)
-                    if quantity_rest == 0:
+                    if quantity_rest <= 0:
                         current_line = inv_line.id
                     prodlot_id = False
                     if data.use_exist:
@@ -108,6 +116,18 @@
                         line_obj.write(cr, uid, [inv_line.id], update_val)
 
         return new_line
+
+    def split_lot(self, cr, uid, ids, context=None):
+        """ To split a lot
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: An ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:
+        """
+        return self.pool.get('stock.move.split').check_lot_qty(cr, uid, ids, context=context)
+    
 stock_inventory_line_split()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock/wizard/stock_inventory_line_split_view.xml'
--- stock/wizard/stock_inventory_line_split_view.xml	2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_inventory_line_split_view.xml	2011-07-06 08:31:50 +0000
@@ -15,7 +15,7 @@
 						        <field name="use_exist"/>
 						    </group>
 							<group colspan="1" col="2">
-							    <field name="qty" readonly="1"/>
+							    <field name="product_qty" readonly="1"/>
 							</group>
 							<group colspan="1" col="2">
 							    <field name="product_uom" readonly="1"/>

=== modified file 'stock/wizard/stock_move.py'
--- stock/wizard/stock_move.py	2011-05-02 18:46:43 +0000
+++ stock/wizard/stock_move.py	2011-07-06 08:31:50 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 import decimal_precision as dp
 
@@ -169,6 +170,67 @@
 
 stock_move_scrap()
 
+class stock_move_split_message(osv.osv_memory):
+    _name = "stock.move.split.message"
+    _description = "You are spliting more quantity then order its give warning"
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ Get default values
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for default value
+        @param context: A standard dictionary
+        @return: Default values of fields
+        """
+        if context is None:
+            context = {}
+        res ={}
+        obj = self.pool.get('stock.move')
+        if context.get('active_model') == 'stock.inventory.line':
+            obj = self.pool.get('stock.inventory.line')
+        if context.get('active_id'):
+            split_qty = 0.0
+            move = obj.browse(cr, uid, context['active_id'], context=context)
+            if context.get('lines'):
+                for qty in context.get('lines'):
+                    split_qty += qty['quantity']
+                if 'message' in fields:
+                    res.update({'message': _("Warning ! \nYou are spliting %.2f "\
+                    "quantity of '%s' but you have only %.2f quantity in this line."\
+                    "\nIf you continue, your information will be lost for extra quantity.") %(split_qty, move.product_id.name, move.product_qty)})
+        return res
+
+    _columns = {
+        'message' : fields.text('Message', size=64, readonly=True),
+     }
+
+    def continue_split(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        obj = self.pool.get('stock.move.split')
+        if context.get('active_model') == 'stock.inventory.line':
+            obj = self.pool.get('stock.inventory.line.split')
+        obj.split(cr, uid, ids, context.get('active_ids'), context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    def go_back(self,cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        model = 'stock.move.split'
+        if context.get('active_model') == 'stock.inventory.line':
+            model = 'stock.inventory.line.split'
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': model,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context
+               }
+    
+stock_move_split_message()
+
 
 class split_in_production_lot(osv.osv_memory):
     _name = "stock.move.split"
@@ -185,8 +247,7 @@
         """
         if context is None:
             context = {}
-
-        res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
+        res = {}
         if context.get('active_id'):
             move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
             if 'product_id' in fields:
@@ -197,6 +258,11 @@
                 res.update({'qty': move.product_qty})
             if 'use_exist' in fields:
                 res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
+            if context.get('lines'):
+                if 'line_ids' in fields:
+                    res.update({'line_ids': context.get('lines', [])})
+                if ('use_exist_true' in context['lines'][0].keys()) and ('line_exist_ids' in fields):
+                        res.update({'use_exist': True, 'line_exist_ids': context.get('lines', [])})
         return res
 
     _columns = {
@@ -208,6 +274,65 @@
         'use_exist' : fields.boolean('Existing Lots', help="Check this option to select existing lots in the list below, otherwise you should enter new ones line by line."),
      }
 
+    def get_split_lines(self, cr, uid, data):
+        """ 
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param data: data of current object
+        @return: wizard move lines:
+        """
+        if data.use_exist:
+            lines = [l for l in data.line_exist_ids if l]
+        else:
+            lines = [l for l in data.line_ids if l]
+        return lines
+
+    def check_lot_qty(self, cr, uid, ids, context=None):
+        """ To split a lot
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: An ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:if  splitting Quantity bigger then order Quantity Its gives warning
+        """
+
+        if context is None:
+            context = {}
+        move_obj = self.pool.get('stock.move')
+        resource_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'view_stock_track_lot_wizard')
+        track_qty = 0.0
+        result = []
+        obj = self.pool.get('stock.move')
+        model = self
+        if context.get('active_model') == 'stock.inventory.line':
+            obj = self.pool.get('stock.inventory.line')
+            model = self.pool.get('stock.inventory.line.split')
+        for data in model.browse(cr, uid, ids, context=context):
+            for move in obj.browse(cr, uid, context.get('active_ids'), context=context):
+                lines = self.get_split_lines(cr, uid, data)
+                for line in lines:
+                    track_qty += line.quantity
+                    if data.use_exist:
+                        result.append({'quantity':line.quantity, 'prodlot_id':line.prodlot_id.id, 'use_exist_true': True})
+                    else:
+                        result.append({'quantity':line.quantity, 'name':line.name})
+        if track_qty > move.product_qty:
+            context.update({'lines': result})
+            return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'stock.move.split.message',
+                'views': [(resource_id and resource_id[1] or False,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': context
+            }
+        else:
+            self.split(cr, uid, ids, context.get('active_ids'), context=context)
+            return {'type': 'ir.actions.act_window_close'}
+    
     def split_lot(self, cr, uid, ids, context=None):
         """ To split a lot
         @param self: The object pointer.
@@ -217,10 +342,7 @@
         @param context: A standard dictionary
         @return:
         """
-        if context is None:
-            context = {}
-        self.split(cr, uid, ids, context.get('active_ids'), context=context)
-        return {'type': 'ir.actions.act_window_close'}
+        return self.check_lot_qty(cr, uid, ids, context=context)
 
     def split(self, cr, uid, ids, move_ids, context=None):
         """ To split stock moves into production lot
@@ -245,10 +367,7 @@
                 quantity_rest = move.product_qty
                 uos_qty_rest = move.product_uos_qty
                 new_move = []
-                if data.use_exist:
-                    lines = [l for l in data.line_exist_ids if l]
-                else:
-                    lines = [l for l in data.line_ids if l]
+                lines = self.get_split_lines(cr, uid, data)
                 for line in lines:
                     quantity = line.quantity
                     if quantity <= 0 or move_qty == 0:
@@ -256,9 +375,6 @@
                     quantity_rest -= quantity
                     uos_qty = quantity / move_qty * move.product_uos_qty
                     uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
-                    if quantity_rest < 0:
-                        quantity_rest = quantity
-                        break
                     default_val = {
                         'product_qty': quantity,
                         'product_uos_qty': uos_qty,
@@ -269,8 +385,7 @@
                         if inventory_id and current_move:
                             inventory_obj.write(cr, uid, inventory_id, {'move_ids': [(4, current_move)]}, context=context)
                         new_move.append(current_move)
-
-                    if quantity_rest == 0:
+                    if quantity_rest <= 0:
                         current_move = move.id
                     prodlot_id = False
                     if data.use_exist:
@@ -280,16 +395,11 @@
                             'name': line.name,
                             'product_id': move.product_id.id},
                         context=context)
-
                     move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id, 'state':move.state})
-
-                    update_val = {}
                     if quantity_rest > 0:
-                        update_val['product_qty'] = quantity_rest
-                        update_val['product_uos_qty'] = uos_qty_rest
-                        update_val['state'] = move.state
-                        move_obj.write(cr, uid, [move.id], update_val)
-
+                        move_obj.write(cr, uid, [move.id], 
+                                       {'product_qty': quantity_rest, 'product_uos_qty': uos_qty_rest,
+                                        'state': move.state })
         return new_move
 
 split_in_production_lot()
@@ -323,4 +433,5 @@
         'quantity': 1.00,
         'action' : 'split',
     }
+
 stock_move_split_lines()

=== modified file 'stock/wizard/stock_move_view.xml'
--- stock/wizard/stock_move_view.xml	2011-03-14 10:27:42 +0000
+++ stock/wizard/stock_move_view.xml	2011-07-06 08:31:50 +0000
@@ -163,5 +163,21 @@
 	            <field name="target">new</field>
 	        </record>
 
+        <record id="view_stock_track_lot_wizard" model="ir.ui.view">
+                <field name="name">Tracking a lot</field>
+                <field name="model">stock.move.split.message</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+                    <form string="Tracking a lot">
+                    <newline/>
+                    <field colspan="4" name="message" nolabel="1" width="450" height="70"/>
+                        <newline/>
+                        <separator string="" colspan="4" />
+                        <button name="go_back"  string="Back" type="object" icon="gtk-go-back"/>
+                        <button name="continue_split" string="Continue" colspan="1" type="object" icon="terp-camera_test"/>
+                    </form>
+                </field>
+            </record>
+
 	</data>
 </openerp>