diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index ec8be2160a0..4fef5fd2595 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,7 +36,7 @@ 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), - 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), + 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'product_qty':fields.float('# of Qty', readonly=True), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), @@ -72,7 +72,7 @@ class sale_report(osv.osv): to_char(s.date_order, 'MM') as month, to_char(s.date_order, 'YYYY-MM-DD') as day, l.product_id as product_id, - pt.uom_id as uom_id, + u.name as uom_name, sum(l.product_uom_qty * u.factor) as product_qty, s.partner_id as partner_id, s.user_id as user_id, @@ -98,7 +98,7 @@ class sale_report(osv.osv): l.product_uom, s.user_id, pt.categ_id, - pt.uom_id, + u.name, s.state, s.shop_id, s.company_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 0891efee88b..2542257ddac 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -17,7 +17,7 @@ - + @@ -88,6 +88,7 @@ +