From 1911dbb1cfa8805c97ce7e99887c4260cf898fab Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Thu, 13 Oct 2011 12:34:51 +0530
Subject: [PATCH 1/3] [FIX] sale : Removed uom_name field from
 sale/report/sale_report_view.xml and assigned value to year field in
 sale/report/sale_report.py

lp bug: https://launchpad.net/bugs/872227 fixed

bzr revid: bde@tinyerp.com-20111013070451-5tz7y61oxrgt8r3i
---
 addons/sale/report/sale_report.py       | 1 +
 addons/sale/report/sale_report_view.xml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index b266b5b6391..f310ec6fcaf 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -78,6 +78,7 @@ class sale_report(osv.osv):
                     s.date_confirm as date_confirm,
                     to_char(s.date_order, 'MM') as month,
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
+                    to_char(s.date_order, 'YYYY') as year,
                     s.partner_id as partner_id,
                     s.user_id as user_id,
                     s.shop_id as shop_id,
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index f9939190a7c..162399c8efe 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -208,7 +208,6 @@
                 <field name="price_total" />
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
-                <field name="uom_name" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="state" invisible="1"/>

From b19cc7c991c2c0f28c1204fa9aad53ba5c19d408 Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Wed, 19 Oct 2011 18:20:15 +0530
Subject: [PATCH 2/3] [FIX] kept product_uom instead of uom_name in
 sale/report/sale_report_view.xml

bzr revid: bde@tinyerp.com-20111019125015-rxcpn4xo1umv0t0k
---
 addons/sale/report/sale_report_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 162399c8efe..5d59f6115ef 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -22,7 +22,7 @@
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_uom_qty" sum="# of Qty"/>
                 <field name="shipped_qty_1" sum="Shipped"/>
-                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
+                <field name="product_uom" invisible="not context.get('set_visible',False)"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
                 <field name="state" invisible="1"/>
@@ -98,7 +98,7 @@
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
-                    <filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
+                    <filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
@@ -208,6 +208,7 @@
                 <field name="price_total" />
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
+                <field name="product_uom" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="state" invisible="1"/>

From 77960598cfd30f6b68d88b97ddf5478577197854 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 11 Nov 2011 11:51:52 +0530
Subject: [PATCH 3/3] [FIX] sale: small change in query

bzr revid: psi@tinyerp.com-20111111062152-963cn5x7ia1ai6ix
---
 addons/sale/report/sale_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index f310ec6fcaf..42e090d54e5 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -76,9 +76,9 @@ class sale_report(osv.osv):
                     1 as nbr,
                     s.date_order as date,
                     s.date_confirm as date_confirm,
+                    to_char(s.date_order, 'YYYY') as year,
                     to_char(s.date_order, 'MM') as month,
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
-                    to_char(s.date_order, 'YYYY') as year,
                     s.partner_id as partner_id,
                     s.user_id as user_id,
                     s.shop_id as shop_id,