Merge lp:~openerp-dev/openobject-addons/trunk-bug-794412-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have applied some changes in sale/sale.py in order to fix the bug.

Thanks & Regards,
Devnani Bharat R.

[Olivier Dony (Odoo) (odo-openerp)]

As explained on the previous merge proposal, the proper way to fix this bug is to avoid having the order marked as ' 'shipped' when it has only been partially delivered. Here you are again trying to hide the problem instead of fixing its root cause.

review: Disapprove

Unmerged revisions

6121. By Bharat Devnani (Open ERP) on 2011-12-23

[FIX] sale : delivery order with back order (after manual split) is wrongly indicated as shipped (and 100% picked)

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-12-22 12:09:59 +0000
+++ sale/sale.py	2011-12-23 05:19:31 +0000
@@ -122,7 +122,14 @@
 
         for order in self.browse(cr, uid, ids, context=context):
             if order.shipped:
-                res[order.id] = 100.0
+                cnt = 0
+                for picking in order.picking_ids:
+                    if picking.state == 'done':
+                        cnt += 1
+                if len(order.picking_ids) == cnt:
+                    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
             else:
                 res[order.id] = tmp[order.id]['total'] and (100.0 * tmp[order.id]['picked'] / tmp[order.id]['total']) or 0.0
         return res