openerp-dev-web team mailing list archive

["Rohan Nayani\(Open ERP\)" <ron@xxxxxxxxxxx>]

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

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)
Related bugs:
  Bug #77698 in firefox (Ubuntu): "crashefor no reason"
  https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/77698

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-776983-ron/+merge/60064
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-776983-ron/+merge/60064
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-776983-ron.

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-04-26 07:39:18 +0000
+++ purchase/purchase.py	2011-05-05 13:33:30 +0000
@@ -110,6 +110,10 @@
         res = {}
         for id in ids:
             res[id] = [0.0,0.0]
+        for line in self.browse(cr, uid, ids, context=context):
+            for record in line.order_line:
+                if record.product_id.type == "service" and line.shipped == True:
+                    res[line.id] = [100.0,100.0]
         cr.execute('''SELECT
                 p.purchase_id,sum(m.product_qty), m.state
             FROM