From 9701a4c3ad6aea6409c394018a8de30ee44d805f Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 28 May 2010 09:58:45 +0530 Subject: [PATCH] [IMP]sale:Corrected conflict in SQL report. bzr revid: apa@tinyerp.com-20100528042845-m4n921d71mi3kfpf --- addons/sale/report/sale_report.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index cad05c8dcc8..2301bd4c5a8 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,8 +36,13 @@ class sale_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), +<<<<<<< TREE + 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), + 'product_qty':fields.float('# of Qty', readonly=True), +======= 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'product_uom_qty':fields.float('# of Qty', readonly=True), +>>>>>>> MERGE-SOURCE 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), @@ -94,6 +99,7 @@ class sale_report(osv.osv): group by s.date_order, s.partner_id, + pt.uom_id, l.product_id, l.product_uom, s.user_id,