Merge lp:~openerp-dev/openobject-addons/6.1-opw-584907-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[Fix]: Purchase : progress bar received remains 0% when you have service type product in the purchase order line but Boolean Received on PO form view is true.

Steps to reproduce:
1. Create a PO with Service type product.
2. Confirm it and see on the PO form view that Boolean field "Received" becomes True.
3. Open List view of PO and see the progress bar "Received" remain 0%.

Expected: When you have Boolean "Received" True on PO form view then on list view it should also be 100% because PO states that it is received.

This branch fixes this issue, kindly review the branch and please share your views on it.

Thanks,
Somesh Khare

[Chris Biersbach (OpenERP) (cbi-openerp)]

I am rejecting this because we no longer merge in 6.1 (not an LTS) and this is not reproducible in version 7.

Unmerged revisions

7139. By Somesh Khare on 2013-01-31

[FIX] Purchase : progress bar received remains 0% when you have service type product in the purchase order line but boolean receiced on PO form is true(Ref : Case 584907)

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-10-09 12:16:14 +0000
+++ purchase/purchase.py	2013-01-31 10:36:33 +0000
@@ -101,8 +101,12 @@
     def _shipped_rate(self, cr, uid, ids, name, arg, context=None):
         if not ids: return {}
         res = {}
-        for id in ids:
-            res[id] = [0.0,0.0]
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = [0.0,0.0]
+            if line.shipped:
+                for record in line.order_line:
+                    if record.product_id.type == "service":
+                        res[line.id] = [100.0,100.0]
         cr.execute('''SELECT
                 p.purchase_id,sum(m.product_qty), m.state
             FROM