Rohan Nayani(Open ERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-794412-ron into 
lp:openobject-addons.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)
Related bugs:
  Bug #794412 in OpenERP Addons: "delivery order with back order is 100% picked"
  https://bugs.launchpad.net/openobject-addons/+bug/794412

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-794412-ron/+merge/65479
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-794412-ron/+merge/65479
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-794412-ron.
=== modified file 'sale/sale.py'
--- sale/sale.py	2011-05-18 16:45:45 +0000
+++ sale/sale.py	2011-06-22 11:15:56 +0000
@@ -118,9 +118,13 @@
                 tmp[item['sale_order_id']]['total'] += item['nbr'] or 0.0
                 if item['procurement_state'] == 'done' or item['move_state'] == 'done':
                     tmp[item['sale_order_id']]['picked'] += item['nbr'] or 0.0
-                
+        pick_state = True 
         for order in self.browse(cr, uid, ids, context=context):
-            if order.shipped:
+            for picking in order.picking_ids:
+                if picking.state not in ('done', 'cancel'):
+                    pick_state = False
+                    break
+            if pick_state and order.shipped:
                 res[order.id] = 100.0
             else:
                 res[order.id] = tmp[order.id]['total'] and (100.0 * tmp[order.id]['picked'] / tmp[order.id]['total']) or 0.0

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to