From 6efd32d8e5de775c7ca222b7cac9ea367524d3be Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 28 May 2010 10:38:01 +0530 Subject: [PATCH] [IMP]sale:Corrected conflict in SQL report. bzr revid: apa@tinyerp.com-20100528050801-t6biri188t4dn8c5 --- addons/sale/report/sale_report.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 6bb34ea4472..cad05c8dcc8 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,13 +36,8 @@ 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),