Merge lp:~anybox/wms/picking-internal-protect into lp:wms

[Christophe CHAUVET]

[Christophe CHAUVET (christophe-chauvet)]

ok

works for me

review: Approve

=== modified file 'wms/__terp__.py'
--- wms/__terp__.py	2011-03-22 14:12:31 +0000
+++ wms/__terp__.py	2011-08-22 10:10:24 +0000
@@ -95,8 +95,8 @@
         'demo/picking_crossdock_one.xml',
         'demo/monday_round.xml',
         'demo/burst_in.xml',
-        'demo/burst_out.xml',
         'demo/picking_product_reserved_1.xml',
+        'demo/picking_internal_protect.xml',
     ],
     'installable': True,
     'active': False,

=== added file 'wms/demo/picking_internal_protect.xml'
--- wms/demo/picking_internal_protect.xml	1970-01-01 00:00:00 +0000
+++ wms/demo/picking_internal_protect.xml	2011-08-22 10:10:24 +0000
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        ##############################################################################
+        #
+        #    wms module for OpenERP, WMS Extended for Open ERP
+        #    Copyright (C) 2011 SYLEAM ([http://www.syleam.fr/])
+        #              Christophe CHAUVET [[e-mail]]
+        #
+        #    This file is a part of wms
+        #
+        #    wms is free software: you can redistribute it and/or modify
+        #    it under the terms of the GNU General Public License as published by
+        #    the Free Software Foundation, either version 3 of the License, or
+        #    (at your option) any later version.
+        #
+        #    wms is distributed in the hope that it will be useful,
+        #    but WITHOUT ANY WARRANTY; without even the implied warranty of
+        #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        #    GNU General Public License for more details.
+        #
+        #    You should have received a copy of the GNU General Public License
+        #    along with this program.  If not, see [http://www.gnu.org/licenses/].
+        #
+        ##############################################################################
+
+	<!-- Here we test than internal pickings can't be executed even with
+	draft_validate if the source location isn't enough supplied -->
+
+        <record model="stock.warehouse" id="warehouse1">
+	    <field name="forbid_unsupplied_internal_move">True</field>
+        </record>
+
+        <record model="stock.picking" id="picking_internal_no_stock">
+	    <field name="address_id" ref="base.res_partner_address_7"/>
+            <field name="invoice_state">none</field>
+            <field name="move_type">direct</field>
+            <field name="name">PACK3</field>
+            <field name="state">draft</field>
+            <field name="type">internal</field>
+            <field name="warehouse_id" ref="wms.warehouse1"/>
+        </record>
+
+        <record model="stock.move" id="stock_move_internal_no_stock1">
+            <field name="location_dest_id" ref="wms.stock_location_w1_stock"/>
+            <field name="location_id" ref="stock.location_inventory"/>
+            <field name="name">[MAGICMO] Magic Mouse</field>
+            <field name="picking_id" ref="picking_internal_no_stock"/>
+            <field name="priority">1</field>
+            <field name="product_id" ref="product_magic_mouse"/>
+            <field name="product_qty" eval="20.0"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <function name="draft_validate" model="stock.picking">
+            <value eval="[obj(ref('picking_internal_no_stock')).id]" model="stock.picking"/>
+        </function>
+
+        <assert id="picking_internal_no_stock" model="stock.picking"
+		severity="error" string="Picking should be confirmed, not done">
+            <test expr="state">confirmed</test>
+        </assert>
+
+        <assert id="stock_move_internal_no_stock1" model="stock.move"
+		severity="error" string="Move should be confirmed, not done">
+            <test expr="state">confirmed</test>
+        </assert>
+
+	<!-- put some products in stock and perform an internal move -->
+
+        <record model="stock.move" id="stock_move_supply_before_internal">
+            <field name="location_dest_id" ref="wms.stock_location_w1_stock"/>
+            <field name="location_id" ref="stock.location_inventory"/>
+            <field name="name">Ipad2</field>
+            <field name="product_id" ref="product_ipad2"/>
+            <field name="product_qty" eval="17.0"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+	    <field name="state">done</field>
+        </record>
+
+        <record model="stock.picking" id="picking_internal_with_stock">
+            <field name="address_id" ref="base.res_partner_address_7"/>
+            <field name="invoice_state">none</field>
+            <field name="move_type">direct</field>
+            <field name="name">PACK3</field>
+            <field name="state">draft</field>
+            <field name="type">internal</field>
+            <field name="warehouse_id" ref="wms.warehouse1"/>
+        </record>
+
+        <record model="stock.move" id="stock_move_internal_with_stock1">
+            <field name="location_dest_id" ref="stock.stock_location_stock"/>
+            <field name="location_id" ref="wms.stock_location_w1_stock"/>
+            <field name="name">[IPAD2] IPad 2</field>
+            <field name="picking_id" ref="picking_internal_with_stock"/>
+            <field name="priority">1</field>
+            <field name="product_id" ref="product_ipad2"/>
+            <field name="product_qty" eval="10.0"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <function name="draft_validate" model="stock.picking">
+            <value eval="[obj(ref('picking_internal_with_stock')).id]"
+		   model="stock.picking"/>
+        </function>
+
+        <assert id="stock_move_internal_with_stock1" model="stock.move"
+		severity="error" string="Move should be done">
+            <test expr="state">done</test>
+        </assert>
+
+	<!-- back to default setting -->
+        <record model="stock.warehouse" id="warehouse1">
+	    <field name="forbid_unsupplied_internal_move">False</field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'wms/object/move.py'
--- wms/object/move.py	2011-03-15 13:42:16 +0000
+++ wms/object/move.py	2011-08-22 10:10:24 +0000
@@ -147,8 +147,11 @@
                 pickings[move.picking_id.id] = 1
                 continue
 
-            if move.product_id.qty_physical <= 0:
-                continue
+            # GR: moves related to internal pickings have nothing to do
+            # with the total amount of product.
+            if ( (not move.picking_id or move.picking_id.type != 'internal')
+                 and move.product_id.qty_physical <= 0):
+                    continue
 
             if move.state in ('confirmed', 'waiting'):
                 print 'plop'

=== modified file 'wms/object/picking.py'
--- wms/object/picking.py	2011-07-18 12:24:41 +0000
+++ wms/object/picking.py	2011-08-22 10:10:24 +0000
@@ -623,6 +623,44 @@
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         return True
 
+    def draft_validate(self, cr, uid, ids, context=None):
+        """Force assignation iff not internal and complete the moves.
+
+        If the corresponding flag on warehouse is set, those pickings in the
+        list that are internal go through assignment logic, in effect
+        forbidding the source locations to go negative.
+        The other are forced."""
+
+        self.action_confirm(cr, uid, ids, context=context)
+        # dispatch
+        regular = []
+        forced = []
+        wh_obj = self.pool.get('stock.warehouse')
+        flag = 'forbid_unsupplied_internal_move'
+        for item in self.read(cr, uid, ids, ['type', 'warehouse_id'],
+                              context=context):
+            whid = item['warehouse_id'][0]
+            if item['type'] == 'internal' and whid and wh_obj.read(
+                cr, uid, whid, [flag]):
+                regular.append(item['id'])
+            else:
+                forced.append(item['id'])
+
+        self.action_assign(cr, uid, regular)
+        self.force_assign(cr, uid, forced)
+
+        # finish assigned moves and apply wkf logic
+        wf_service = netsvc.LocalService("workflow")
+        for pid in ids:
+            wf_service.trg_write(uid, 'stock.picking', pid, cr)
+
+        self.action_move(cr, uid, ids, context=context)
+
+        for pid in ids:
+            wf_service.trg_validate(uid, 'stock.picking',
+                                    pid, 'button_done', cr)
+        return True
+
     #def test_cancel(self, cr, uid, ids, context={}):
     #    """
     #    Redefine test cancel, to protect

=== modified file 'wms/object/warehouse.py'
--- wms/object/warehouse.py	2011-07-18 12:24:41 +0000
+++ wms/object/warehouse.py	2011-08-22 10:10:24 +0000
@@ -44,12 +44,14 @@
         'check_tracking_burst': fields.boolean('check tracking', help='Check tracking on burst out'),
         'keep_missing_product_in': fields.boolean('Keep product in', help='If check, missing product line on receipt order stay with quantity = 0'),
         'force_reserved_location': fields.boolean('Force reserved', help='Force move product in reserved location'),
+        'forbid_unsupplied_internal_move' : fields.boolean('Forbid unsupplied internal', help="Prevent internal moves with not enough stock level"),
     }
 
     _defaults = {
         'check_tracking_burst': lambda *a: False,
         'keep_missing_product_in': lambda *a: True,
         'force_reserved_location': lambda *a: False,
+        'forbid_unsupplied_internal_move': lambda *a: False,
     }
 
     def _check_recursion(self, cr, uid, ids):