[MERGE] forward port of branch 8.0 up to d80376a

[odoo/odoo.git] / addons / point_of_sale / report / pos_order_report.py

diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index 547b223..d1c56e2 100644 (file)
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -26,6 +26,7 @@ class pos_order_report(osv.osv):
     _name = "report.pos.order"
     _description = "Point of Sale Orders Statistics"
     _auto = False
+
     _columns = {
         'date': fields.datetime('Date Order', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
@@ -36,12 +37,13 @@ class pos_order_report(osv.osv):
         'price_total':fields.float('Total Price', readonly=True),
         'total_discount':fields.float('Total Discount', readonly=True),
         'average_price': fields.float('Average Price', readonly=True,group_operator="avg"),
-        'warehouse_id':fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
+        'location_id':fields.many2one('stock.location', 'Location', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
-        'nbr':fields.integer('# of Lines', readonly=True),
-        'product_qty':fields.integer('# of Qty', readonly=True),
+        'nbr':fields.integer('# of Lines', readonly=True),  # TDE FIXME master: rename into nbr_lines
+        'product_qty':fields.integer('Product Quantity', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal'),
         'delay_validation': fields.integer('Delay Validation'),
+        'product_categ_id': fields.many2one('product.category', 'Product Category', readonly=True),
     }
     _order = 'date desc'
 
@@ -61,18 +63,19 @@ class pos_order_report(osv.osv):
                     s.partner_id as partner_id,
                     s.state as state,
                     s.user_id as user_id,
-                    s.warehouse_id as warehouse_id,
+                    s.location_id as location_id,
                     s.company_id as company_id,
                     s.sale_journal as journal_id,
-                    l.product_id as product_id
+                    l.product_id as product_id,
+                    pt.categ_id as product_categ_id
                 from pos_order_line as l
                     left join pos_order s on (s.id=l.order_id)
                     left join product_product p on (p.id=l.product_id)
                     left join product_template pt on (pt.id=p.product_tmpl_id)
                     left join product_uom u on (u.id=pt.uom_id)
                 group by
-                    s.date_order, s.partner_id,s.state,
-                    s.user_id,s.warehouse_id,s.company_id,s.sale_journal,l.product_id,s.create_date
+                    s.date_order, s.partner_id,s.state, pt.categ_id,
+                    s.user_id,s.location_id,s.company_id,s.sale_journal,l.product_id,s.create_date
                 having
                     sum(l.qty * u.factor) != 0)""")