[IMP] Reportings Review

[odoo/odoo.git] / addons / mrp_operations / report / mrp_workorder_analysis.py

diff --git a/addons/mrp_operations/report/mrp_workorder_analysis.py b/addons/mrp_operations/report/mrp_workorder_analysis.py
index cc701e2..4b70785 100644 (file)
--- a/addons/mrp_operations/report/mrp_workorder_analysis.py
+++ b/addons/mrp_operations/report/mrp_workorder_analysis.py
@@ -31,13 +31,18 @@ class mrp_workorder(osv.osv):
         'nbr': fields.integer('# of Lines', readonly=True),  # TDE FIXME master: rename into nbr_lines
         'date': fields.date('Date', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', readonly=True),
+        'category_id': fields.many2one('product.category', 'Product Category', readonly=True),
         'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), readonly=True),
         'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')], 'Status', readonly=True),
         'total_hours': fields.float('Total Hours', readonly=True),
         'total_cycles': fields.float('Total Cycles', readonly=True),
         'delay': fields.float('Delay', readonly=True),
         'production_id': fields.many2one('mrp.production', 'Production', readonly=True),
-        'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', readonly=True)
+        'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', readonly=True),
+        'user_id': fields.many2one('res.users', 'Responsible'),
+        'routing_id': fields.many2one('mrp.routing', string='Routing', readonly=True),
+        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', readonly=True),
     }
 
     def init(self, cr):
@@ -48,6 +53,8 @@ class mrp_workorder(osv.osv):
                     date(wl.date_planned) as date,
                     min(wl.id) as id,
                     mp.product_id as product_id,
+                    p.product_tmpl_id,
+                    t.categ_id as category_id,
                     sum(wl.hour) as total_hours,
                     avg(wl.delay) as delay,
                     (w.costs_hour*sum(wl.hour)) as total_cost,
@@ -56,12 +63,17 @@ class mrp_workorder(osv.osv):
                     sum(wl.cycle) as total_cycles,
                     count(*) as nbr,
                     sum(mp.product_qty) as product_qty,
-                    wl.state as state
+                    wl.state as state,
+                    mp.user_id,
+                    mp.routing_id,
+                    mp.bom_id
                 from mrp_production_workcenter_line wl
                     left join mrp_workcenter w on (w.id = wl.workcenter_id)
                     left join mrp_production mp on (mp.id = wl.production_id)
+                    left join product_product p on (mp.product_id=p.id)
+                    left join product_template t on (p.product_tmpl_id=t.id)
                 group by
-                    w.costs_hour, mp.product_id, mp.name, wl.state, wl.date_planned, wl.production_id, wl.workcenter_id
+                    w.costs_hour, mp.product_id, mp.name, mp.user_id, mp.routing_id, mp.bom_id, wl.state, wl.date_planned, wl.production_id, wl.workcenter_id, p.product_tmpl_id, t.categ_id
         )""")