[MERGE]

bzr revid: nel@tinyerp.com-20100503112648-u80a2y7u9h8g8hqq

addons/mrp/report/mrp_production_order.py

@@ -33,8 +33,8 @@ class mrp_production_order(osv.osv):
         'day': fields.char('Day',size=64,readonly=True),
         'origin': fields.char('Source Document', size=64),
         'nbr': fields.integer('# of Orders', readonly=True),
-#        'products_to_consumme': fields.integer('Products to Consumme', readonly=True),
-#        'consummed_products': fields.integer('Consummed Products', readonly=True),
+        'products_to_consume': fields.integer('Products to Consume', readonly=True),
+        'consumed_products': fields.integer('Consumed Products', readonly=True),
         'date': fields.date('Date', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_qty': fields.float('Product Qty', readonly=True),
@@ -79,6 +79,18 @@ class mrp_production_order(osv.osv):
                      sum(l.product_qty * u.factor) as product_qty,
                      s.company_id as company_id,
                      count(*) as nbr,
+                     (select sum(sm.product_qty) from stock_move as sm
+                        left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
+                        left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
+                        where sm.product_id=ll.product_id and ll.id=l.id
+                        and sm.state not in ('done','cancel')
+                        group by sm.product_id) as products_to_consume,
+                    (select sum(sm.product_qty)/2 from stock_move as sm
+                        left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
+                        left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
+                        where sm.product_id=ll.product_id and ll.id=l.id
+                        and sm.state in ('done','cancel')
+                        group by sm.product_id) as consumed_products,
                      s.location_src_id,
                      s.location_dest_id,
                      s.bom_id,
@@ -100,6 +112,7 @@ class mrp_production_order(osv.osv):
                      to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY'),
                      l.product_id,
                      l.product_uom,
+                     s.id,
                      l.id,
                      s.bom_id,
                      s.routing_id,

addons/mrp/report/mrp_production_order_view.xml

@@ -16,8 +16,8 @@
 					<field name="bom_id" invisible="1"/>
 					<field name="product_id" invisible="1"/>
 					<field name="product_qty" sum='Product Qty'/>
-					<!--field name="products_to_consumme" sum='Products to Consumme'/>
-					<field name="consummed_products" sum='Consummed Products'/-->
+					<field name="products_to_consume" sum='Products to Consume'/>
+					<field name="consumed_products" sum='Consumed Products'/>
 					<field name="nbr" string="#Production Orders" sum='#Production Orders'/>
 					<field name="state" invisible="1"/>
 					<field name="routing_id" invisible="1"/>
@@ -44,6 +44,8 @@
                 <graph orientation="horizontal" string="Production" type="bar">
                     <field name="product_id"/>
                     <field name="nbr" operator="+"/>
+                    <field name="products_to_consume" operator="+"/>
+					<field name="consumed_products" operator="+"/>
                     <field name="state" group="True"/>
                 </graph>
             </field>