From 26b9387b4e641d37c53090f5fd82dd166025dd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 5 Mar 2013 10:55:33 +0100
Subject: [PATCH] [CLEAN] mrp: cleaned code about progress.

bzr revid: tde@openerp.com-20130305095533-0rf3mjmflif0iemj
---
 addons/mrp/mrp.py       | 29 ++++++++++++-----------------
 addons/mrp/mrp_view.xml |  2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 62579128ed6..c2b033193c8 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -415,21 +415,16 @@ class mrp_production(osv.osv):
         dest_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
         return dest_location_id.id
 
-    def _product_progress(self, cr, uid, ids, prop, unknow_none, context=None):
-        """ To obtain product quantity
-        @return: Dictionary of values.
-        """
-        result = {}
-        for prod in self.browse(cr, uid, ids, context=context):
-            done = 0.0
-            if prod.product_qty:
-                for move in prod.move_created_ids2:
-                    if move.product_id == prod.product_id:
-                        if not move.scrapped:
-                            done += move.product_qty
-                result[prod.id] = done / prod.product_qty * 100
-            else:
-                result[prod.id] = 100
+    def _get_progress(self, cr, uid, ids, name, arg, context=None):
+        """ Return product quantity percentage """
+        result = dict.fromkeys(ids, 100)
+        for mrp_production in self.browse(cr, uid, ids, context=context):
+            if mrp_production.product_qty:
+                done = 0.0
+                for move in mrp_production.move_created_ids2:
+                    if not move.scrapped and move.product_id == mrp_production.product_id:
+                        done += move.product_qty
+                result[mrp_production.id] = done / mrp_production.product_qty * 100
         return result
 
     _columns = {
@@ -444,8 +439,8 @@ class mrp_production(osv.osv):
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS', readonly=True, states={'draft': [('readonly', False)]}),
-
-        'product_progress': fields.function(_product_progress, type='float', string='Progress of the production'),
+        'progress': fields.function(_get_progress, type='float',
+            string='Production progress'),
 
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True,
             readonly=True, states={'draft':[('readonly',False)]},
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index eab413995ba..bde5abee2b5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -595,7 +595,7 @@
             <field name="name">mrp.production.gantt</field>
             <field name="model">mrp.production</field>
             <field name="arch" type="xml">
-                <gantt date_stop="date_finished" date_start="date_start" progress="product_progress" string="Productions" default_group_by="routing_id">
+                <gantt date_stop="date_finished" date_start="date_start" progress="progress" string="Productions" default_group_by="routing_id">
                 </gantt>
             </field>
         </record>