Merge lp:~openbig/bigconsulting/packing_barcode_workflow into lp:bigconsulting

[gpa(OpenERP)]

Added workflow in the packing_barcode_check

=== modified file 'packing_barcode_check/__terp__.py'
--- packing_barcode_check/__terp__.py	2010-07-26 15:12:49 +0000
+++ packing_barcode_check/__terp__.py	2010-08-19 05:53:05 +0000
@@ -31,9 +31,11 @@
     "license" : "GPL-3",
     "depends" : ["base","product","stock"],
     "init_xml" : [],
-    "update_xml" : ["packing_barcode_check_view.xml",
+    "update_xml" : [
                     "packing_barcode_check_wizard.xml",
                     "packing_barcode_check_report.xml",
+                    "packing_barcode_check_view.xml",
+                    "packing_barcode_check_workflow.xml", 
                     ],
     "active": False,
     "installable": True

=== modified file 'packing_barcode_check/packing_barcode_check.py'
--- packing_barcode_check/packing_barcode_check.py	2010-08-17 07:47:09 +0000
+++ packing_barcode_check/packing_barcode_check.py	2010-08-19 05:53:05 +0000
@@ -31,23 +31,31 @@
     def _compute_quantity(self, cr, uid, ids, fieldnames, args, context=None):
         res = {}
         for obj in self.browse(cr, uid, ids, context=context):
-            total_quantity = sum(to_be_id.quantity for to_be_id in obj.tobe_scan_ids)
-            scanned_quantity = sum(to_be_id.scan_quantity for to_be_id in obj.tobe_scan_ids)
+            total_quantity = sum(move_id.product_qty for move_id in obj.move_lines)
+            scanned_quantity = sum(scan.scan_quantity for scan in obj.scaned_ids)
             res[obj.id] = {
                 'total_quantity' : total_quantity,
                 'scanned_quantity' : scanned_quantity,
                 'to_be_scanned_quantity' : total_quantity - scanned_quantity,
             }
-
+        
         return res
 
-    
     _columns = {
         'total_quantity':fields.function(_compute_quantity, method=True, string='Total Quantity', multi='quantity'),
         'scanned_quantity': fields.function(_compute_quantity, method=True, string='Scanned Quantity', multi='quantity'),
         'to_be_scanned_quantity':fields.function(_compute_quantity, method=True, string='Unscanned Quantity', multi='quantity'),
         'tobe_scan_ids':fields.one2many('tobe.scanned.stock', 'tobe_picking_id', 'To Be'),
         'scaned_ids':fields.one2many('scanned.stock', 'scanned_picking_id', 'Scanned Picking',),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('auto', 'Waiting'),
+            ('confirmed', 'Confirmed'),
+            ('assigned', 'Available'),
+            ('scanned', 'Scanned'),
+            ('done', 'Done'),
+            ('cancel', 'Cancelled'),
+            ], 'Status', readonly=True, select=True),
     }
     _defaults = {
       'scanned_quantity' : lambda *a:0.0,
@@ -58,6 +66,18 @@
         move_ids = move_obj.search(cr, uid, [('picking_id','=',ids[0])])
         move_obj.write(cr, uid, move_ids, {'scaned_qty':0.0}, context)
         return True
+    
+    def test_scanned(self, cr, uid, ids, context={}):
+        for pick in self.browse(cr, uid, ids, context=context):
+            if pick.tobe_scan_ids:
+                return False
+        return True
+
+    def action_scanned_wkf(self, cr, uid, ids, context={}):
+        for pick in self.browse(cr, uid, ids, context=context):
+            if not pick.tobe_scan_ids:
+                self.write(cr, uid, ids, {'state': 'scanned'})
+        return True
 
 stock_picking()
 
@@ -65,11 +85,19 @@
     _inherit = "stock.move"
     _columns = {
        'scaned_qty':fields.float("Scanned Qty"),
+       'unscaned_qty':fields.float("Unscanned Qty"),
     }
     
     _defaults = {
       'scaned_qty' : lambda *a:0.0,
     }
+    
+    def onchange_quantity(self, cr, uid, ids, product_id, product_qty, product_uom, product_uos):
+
+        result = super(stock_move, self).onchange_quantity(cr, uid, ids, product_id, product_qty, product_uom, product_uos)
+        if product_id:
+            result['value']['unscaned_qty'] = product_qty
+        return result
 stock_move()
 
 class tobe_scanned_stock(osv.osv):
@@ -80,7 +108,8 @@
         'product_name':fields.many2one('product.product','Product Name', size=64),
         'lot_number':fields.many2one('stock.production.lot','Lot Number', size=64),
         'quantity':fields.float("Quantity"),
-        'scan_quantity':fields.float("Scan Quantity"),
+        'scan_quantity':fields.float("Scanned Quantity"),
+        'unscan_quantity':fields.float("Unscanned Quantity"),
     }
     
     def init(self, cr):
@@ -92,6 +121,7 @@
                     l.picking_id AS tobe_picking_id,
                     sum(l.scaned_qty) AS scan_quantity,
                     sum(l.product_qty) AS quantity,
+                    sum(l.unscaned_qty) AS unscan_quantity,
                     l.prodlot_id AS lot_number,
                     l.product_id AS product_name
                 FROM
@@ -112,7 +142,7 @@
         'product_name':fields.many2one('product.product','Product Name', size=64),
         'lot_number':fields.many2one('stock.production.lot','Lot Number', size=64),
         'quantity':fields.float("Quantity"),
-        'scan_quantity':fields.float("Scan Quantity"),
+        'scan_quantity':fields.float("Scanned Quantity"),
     }
     
     def init(self, cr):
@@ -129,7 +159,7 @@
                 FROM
                     stock_move l
                 WHERE
-                    l.scaned_qty = l.product_qty
+                    l.scaned_qty > 0
                 GROUP BY
                     l.product_id,l.prodlot_id,l.picking_id, l.id
             )

=== modified file 'packing_barcode_check/packing_barcode_check_view.xml'
--- packing_barcode_check/packing_barcode_check_view.xml	2010-08-17 07:26:17 +0000
+++ packing_barcode_check/packing_barcode_check_view.xml	2010-08-19 05:53:05 +0000
@@ -38,7 +38,7 @@
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
                         <label string=""/>
-                        <button name="button_reset" string="Reset" type="object"/>
+                        <button name="button_reset" states="assigned" string="Reset" type="object"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Scanning Info">
@@ -48,7 +48,7 @@
                                         <field name="product_name"/>
                                         <field name="lot_number"/>
                                         <field name="quantity"/>
-                                        <field name="scan_quantity"/>
+                                        <field name="unscan_quantity"/>
                                     </tree>
                                 </field> 	
                                 <field name="scaned_ids" nolabel="1">
@@ -66,6 +66,8 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                <button name="%(id_scan_product)d" states="assigned" string="Scan Packing" type="action"/>
+                                <button name="%(stock.partial_picking)d" states="scanned" string="Packing Done" type="action"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
                         </page>                
@@ -104,11 +106,12 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='product_qty']" position="after">
                     <field name="scaned_qty"/>
+                    <field name="unscaned_qty"/>
                 </xpath>
             </field>
         </record>
 
-        <wizard id="act_selct_picking_open_form" model="stock.picking" name="select.picking" string="Select picking"/>
+        <wizard id="act_selct_picking_open_form" model="stock.picking" name="select.picking" menu="False" string="Select picking"/>
         <menuitem action="act_selct_picking_open_form" id="menu_act_selct_picking_open_form" parent="stock.menu_stock_root" type="wizard"/>
 
     </data>

=== modified file 'packing_barcode_check/packing_barcode_check_wizard.xml'
--- packing_barcode_check/packing_barcode_check_wizard.xml	2010-07-26 15:12:49 +0000
+++ packing_barcode_check/packing_barcode_check_wizard.xml	2010-08-19 05:53:05 +0000
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    <wizard
-            string="Select Picking Wizard"
-            model="stock.picking"
-            name="select.picking"
-            menu="False"
-            id="id_select_picking"/>
-
      <wizard
             string="Scan Product"
             model="stock.picking"
             name="scan.product"
-            menu="True"
+            menu="False"
             id="id_scan_product"/>
 
     </data>

=== added file 'packing_barcode_check/packing_barcode_check_workflow.xml'
--- packing_barcode_check/packing_barcode_check_workflow.xml	1970-01-01 00:00:00 +0000
+++ packing_barcode_check/packing_barcode_check_workflow.xml	2010-08-19 05:53:05 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="act_scanned" model="workflow.activity">
+            <field name="wkf_id" ref="stock.wkf_picking"/>
+            <field name="name">scanned</field>
+            <field name="kind">function</field>
+            <field name="action">action_scanned_wkf()</field>
+        </record>
+        
+        <record id="trans_scanned_move" model="workflow.transition">
+            <field name="act_from" ref="stock.act_assigned"/>
+            <field name="act_to" ref="act_scanned"/>
+            <field name="condition">test_scanned()</field>
+            <field name="signal">button_scanned</field>
+        </record>
+        
+        <record id="stock.trans_scanned_assigned_move" model="workflow.transition">
+            <field name="act_from" ref="act_scanned"/>
+            <field name="act_to" ref="stock.act_move"/>
+            <field name="signal">button_done</field>
+        </record>
+        
+    </data>
+</openerp>

=== modified file 'packing_barcode_check/wizard/scan_product.py'
--- packing_barcode_check/wizard/scan_product.py	2010-08-13 14:17:17 +0000
+++ packing_barcode_check/wizard/scan_product.py	2010-08-19 05:53:05 +0000
@@ -22,6 +22,7 @@
 import wizard
 import pooler
 import time
+import netsvc
 from tools.translate import _
 from osv import osv
 
@@ -61,11 +62,15 @@
                                 raise osv.except_osv(_('Warning!'),
                                      _('Unscanned quantity does not match with the product packaging quantity'))
 
-                    stock_move_obj.write(cr, uid, [move_id],{'scaned_qty':move_data.scaned_qty+quantity}, context=context)
+                    stock_move_obj.write(cr, uid, [move_id],{'scaned_qty':move_data.scaned_qty+quantity, 'unscaned_qty':move_data.unscaned_qty-quantity}, context=context)
+                    wkf_service = netsvc.LocalService("workflow")
+                    wkf_service.trg_validate(uid, 'stock.picking', picking_id[0], 'button_scanned', cr)
+                    
                     return 'init'
     else:
         raise osv.except_osv(_('Warning!'),
                              _('Product does not belongs to this picking or already scanned.'))
+    
     return {}
 
 scan_product_lot_form = """<?xml version="1.0"?>
@@ -102,9 +107,12 @@
                         if check_qty < quantity:
                             raise osv.except_osv(_('Warning!'),
                                  _('Unscanned quantity does not match with the product packaging quantity'))    
-                    move_obj.write(cr, uid, [stock_move_obj.id],{'scaned_qty':stock_move_obj.scaned_qty+quantity}, context=context)
+                    move_obj.write(cr, uid, [stock_move_obj.id],{'scaned_qty':stock_move_obj.scaned_qty+quantity,'unscaned_qty':stock_move_obj.unscaned_qty-quantity}, context=context)
+                    wkf_service = netsvc.LocalService("workflow")
+                    wkf_service.trg_validate(uid, 'stock.picking', picking_ids[0], 'button_scanned', cr)
+                        
                     call_product_scan = 2
-                    if stock_move_obj.product_qty >= stock_move_obj.scaned_qty+1:
+                    if stock_move_obj.product_qty >= stock_move_obj.scaned_qty+quantity:
                         call_product_scan = 1
                     break
                 if call_product_scan == 1:

=== modified file 'stock_minimum_calculator/wizard/stock_order_point_calculator.py'
--- stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-08-17 04:44:06 +0000
+++ stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-08-19 05:53:05 +0000
@@ -215,7 +215,7 @@
         # 1. Calculation of the date date start in one year later than current date
         from_date = (datetime.now() - relativedelta(months=12)).strftime('%Y-%m-%d %H:%M:%S')
         to_date = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        
+
         # 2.1 first find the all the product which fullfill the criteria of the 2.1
         product_ids = product_obj.search(cr,uid,[('active','=',True),('type','=','product'),
                                                  ('procure_method','=','make_to_stock'),
@@ -246,8 +246,7 @@
                     if seller_id.name.id == partner_id:
                         supplier_lead_time = seller_id.delay
                         
-                stock_move_ids = stock_move_obj.search(cr, uid, [('product_id','=',filter_product_id)])
-
+                stock_move_ids = stock_move_obj.search(cr, uid, [('product_id','=',filter_product_id),('state','=','done')])
                 average_daily_consumption = 0.0 
                 first_stock_move_ids = []
                 # Take the first input date of the stock move where stock move of incoming picking or stock move not have any picking 
@@ -258,16 +257,16 @@
                            first_stock_move_ids.append(first_stock_id)
                     else:
                        first_stock_move_ids.append(first_stock_id)
-
+                
                 if first_stock_move_ids:
                     first_stock_move_id = first_stock_move_ids[0]
                     first_input = stock_move_obj.browse(cr, uid, first_stock_move_id, context=context).date_planned
-
+                    
                     # Case 1 if first input is less than from date
                     if first_input <= from_date:
-                        consum_qty = _sale_consume_qty(self, cr, uid, from_date, to_date, 'done', context)
+                        consum_qty = _sale_consume_qty(self, cr, uid, filter_product_id, from_date, to_date, 'done', context)
                         refund_qty = _refund_qty(self, cr, uid, filter_product_id, from_date, to_date, ['out_refund','in_refund'], context)
-                        open_sale_qty = _sale_open_qty(self, cr, uid, filter_product_id, from_date, to_date, ['manual','progress'], context) 
+                        open_sale_qty = _sale_open_qty(self, cr, uid, filter_product_id, ['manual','progress'], context) 
                         open_purchase_qty = _purchase_open_qty(self, cr, uid, filter_product_id, 'approved', context) 
                         pur_diff_day = _date_diff(self, cr, uid, filter_product_id, from_date, to_date, context)                       
                         ### calculation of  average_daily_consumption
@@ -287,20 +286,26 @@
                             average_daily_consumption = (consum_qty - refund_qty + open_sale_qty - open_purchase_qty) / pur_diff_day
                 else:
                     open_sale_qty = _sale_open_qty(self, cr, uid, filter_product_id, ['manual','progress'], context)
-                    open_purchase_qty =  _purchase_open_qty(self, cr, uid, filter_product_id, 'approved', context)
+                    open_purchase_qty = _purchase_open_qty(self, cr, uid, filter_product_id, 'approved', context)
+
+                    if open_purchase_qty == 0.0 or open_sale_qty == 0.0:
+                        continue 
                     
                     # calculation of first open purchase order date   
-                    open_purchase_ids = purchase_obj.search(cr,uid,[('state','=','approved')])  
-                    first_open_purchase_order = min(open_purchase_ids)
-                    fst_open_pur_date = purchase_obj.browse(cr, uid, first_open_purchase_order, context=context).date_order
+                    open_purchase_ids = purchase_obj.search(cr,uid,[('state','=','approved')])
+                    if open_purchase_ids:  
+                        first_open_purchase_order = min(open_purchase_ids)
+                        fst_open_pur_date = purchase_obj.browse(cr, uid, first_open_purchase_order, context=context).date_order
                             
-                    # Days difference between to date and first purchase date
-                    pur_to_date = time.mktime(time.strptime(to_date,'%Y-%m-%d %H:%M:%S'))
-                    pur_open_date = time.mktime(time.strptime(fst_open_pur_date,'%Y-%m-%d'))
-                    pur_diff_day = (pur_to_date-pur_open_date)/(3600*24)
-                    
-                    if pur_diff_day>0:
-                        average_daily_consumption = (open_sale_qty - open_purchase_qty)/pur_diff_day
+                        # Days difference between to date and first purchase date
+                        pur_diff_day = 0.0
+                        if fst_open_pur_date:
+                            pur_to_date = time.mktime(time.strptime(to_date,'%Y-%m-%d %H:%M:%S'))
+                            pur_open_date = time.mktime(time.strptime(fst_open_pur_date,'%Y-%m-%d'))
+                            pur_diff_day = (pur_to_date-pur_open_date)/(3600*24)
+                        
+                        if pur_diff_day>0:
+                            average_daily_consumption = (open_sale_qty - open_purchase_qty)/pur_diff_day
                     
                 ###### Calculation of plan_average_daily_consumption
                 plan_average_daily_consumption = 0.0
@@ -327,6 +332,7 @@
                         min_rule_obj.unlink(cr, uid, [stock_rule_id],context=context)
     
                 mini_stock_rule_id = min_rule_obj.search(cr,uid,[('warehouse_id','=',data['form']['warehouse_id']),('product_id','=',filter_product_id)])
+
                 if mini_stock_rule_id:
                     for stock_rule_id in mini_stock_rule_id:
                         min_rule_obj.write(cr, uid, [stock_rule_id],{'product_min_qty':product_min_qty,'product_max_qty':product_max_qty,},context=context)