From 42dbaa3952e7d6c248fc98703526205366ca579b Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 26 May 2010 12:24:21 +0530
Subject: [PATCH 01/14] [IMP]:hr_evaluation:improved the SQL report.

bzr revid: apa@tinyerp.com-20100526065421-tuy6sw96apgkz22b
---
 .../report/hr_evaluation_report_view.xml      | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 921d8b43a2b..6b2e6ead15f 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -42,35 +42,42 @@
         <field name="arch" type="xml">
             <search string="Evaluations">
             	<group>
-            		<filter icon="terp-hr" string="This Year"
-                    	    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                    	    help="Tasks performed in this year"/>
-                    <filter icon="terp-hr" string="This Month"
-                    		name="month"
-                    		domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                    		help="Tasks performed in this month"/>
+            		<filter icon="gtk-media-rewind" string="Last 365 Days"
+                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                    	help="Tasks performed in last 365 days"/>
+                    <filter icon="gtk-media-rewind" string="Last 30 Days"
+                    	name="month"
+                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                    	help="Tasks performed in last 30 days"/>
 	                <filter icon="gtk-media-rewind"
-                            string="    7 Days    "
-                            separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Tasks during last 7 days"/>
+                        string="    7 Days    "
+                        separator="1"
+                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        help="Tasks during last 7 days"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
-                    		icon="terp-hr"
-                    		domain="[('state','=','draft')]"
-                    		help = "Draft Evaluations"/>
+                    	icon="terp-hr"
+                    	domain="[('state','=','draft')]"
+                    	help = "Draft Evaluations"/>
 	                <filter string="Plan In Progress"
-	                		icon="terp-hr"
-	                		domain="[('state', '=' ,'wait')]"
-	                		help = "In progress Evaluations"/>
+	                	icon="terp-hr"
+	                	domain="[('state', '=' ,'wait')]"
+	                	help = "In progress Evaluations"/>
                    	<filter string="Final Validation"
-                   			icon="terp-hr"
-                   			domain="[('state','=','progress')]"
-                   			help = "Final Validation Evaluations"/>
+                   		icon="terp-hr"
+                   		domain="[('state','=','progress')]"
+                   		help = "Final Validation Evaluations"/>
+                   	<filter icon="terp-hr"
+                        string="Done"
+                        domain="[('state','=','done')]"/>
   					<separator orientation="vertical"/>
 	                <field name="employee_id" widget="selection"/>
+	                <field name="plan_id" widget="selection"/>
                 </group>
                 <newline/>
+<<<<<<< TREE
+				<group expand="0" string="Extended options..." colspan="10" col="12">
+=======
                 <group expand="1" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
                     <filter string="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
@@ -91,13 +98,12 @@
                     		string="Cancelled"
                     		domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
+>>>>>>> MERGE-SOURCE
                     <field name="rating"/>
-                    <field name="plan_id" widget="selection"/>
                     <separator orientation="vertical"/>
                     <field name="deadline"/>
-                    <newline/>
-                    <field name="create_date"/>
-                    <field name="closed"/>
+                    <separator orientation="vertical"/>
+                    <field name="state"/>
                 </group>
             </search>
         </field>

From 115b74cf8acfc303545196c59e4bc6ac7c0d13cf Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.co.in>
Date: Wed, 26 May 2010 16:15:44 +0530
Subject: [PATCH 02/14] [IMP]:account:Changed the spelling for statistic

bzr revid: jni@tinyerp.co.in-20100526104544-nm2x5rujey8pp1ex
---
 addons/account/account_menuitem.xml                            | 2 +-
 addons/account/report/account_account_report_view.xml          | 2 +-
 addons/account/report/account_analytic_entries_report_view.xml | 2 +-
 addons/account/report/account_entries_report_view.xml          | 2 +-
 addons/account/report/account_invoice_report_view.xml          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index a2d18095618..4cdcb7787b6 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -22,7 +22,7 @@
             groups="group_account_user"/>
         <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
 
-       <menuitem id="menu_finance_statastic_report_statement" name="Satistic Reports" parent="account.menu_finance_reporting" sequence="3"/>
+       <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="account.menu_finance_reporting" sequence="3"/>
     </data>
 </openerp>
 
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index f2d6338c951..efdb4567935 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -87,7 +87,7 @@
         <field name="search_view_id" ref="view_account_account_report_search"/>
     </record>
 
-    <menuitem action="action_account_account_report" id="menu_action_account_account_report" parent="account.menu_finance_statastic_report_statement" sequence="6"/>
+    <menuitem action="action_account_account_report" id="menu_action_account_account_report" parent="account.menu_finance_statistic_report_statement" sequence="6"/>
 
 </data>
 </openerp>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index e1cd7967b8d..84dca63f440 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -107,7 +107,7 @@
         <field name="search_view_id" ref="view_analytic_entries_report_search"/>
     </record>
 
-    <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statastic_report_statement"  sequence="4"/>
+    <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement"  sequence="4"/>
 
 </data>
 </openerp>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 625d98fa9cb..f07de0cdf8d 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -122,6 +122,6 @@
         <field name="context">{'search_default_This Month':1,'search_default_Journal':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_account_entries_report_search"/>
     </record>
-    <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statastic_report_statement" sequence="2"/>
+    <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
 </data>
 </openerp>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index ae00608b164..7acd0c332b1 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -151,7 +151,7 @@
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
     </record>
 
-    <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statastic_report_statement" sequence="0"/>
+    <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/>
 
 </data>
 </openerp>

From 0c9201fd9963f898afff18a8b6d01be957cb1d7f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 26 May 2010 18:21:05 +0530
Subject: [PATCH 03/14] [IMP]:sale:Reverted SQL report changes applied at
 Revision ID: hmo@hmo-20100525163303-0la5uyj7e23dgvk9

bzr revid: apa@tinyerp.com-20100526125105-za72ql0p1tdr5sd2
---
 addons/sale/report/sale_report.py       |  3 +++
 addons/sale/report/sale_report_view.xml | 27 ++++++-------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index e713c479f72..ec8be2160a0 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -36,6 +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),
         '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),
@@ -71,6 +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,
                      sum(l.product_uom_qty * u.factor) as product_qty,
                      s.partner_id as partner_id,
                      s.user_id as user_id,
@@ -96,6 +98,7 @@ class sale_report(osv.osv):
                      l.product_uom,
                      s.user_id,
                      pt.categ_id,
+                     pt.uom_id,
                      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 2fca6dedd5a..0891efee88b 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -17,6 +17,7 @@
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
+                <field name="uom_id" invisible="not context.get('set_visible',False)"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="# of Qty"/>
@@ -86,7 +87,7 @@
                     <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
+                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
@@ -99,28 +100,12 @@
                     <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
                 </group>
 				<newline/>
-                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
-                    <filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
-                    <filter icon="terp-sale" string="       Invoice Exception      " domain="[('state','=','invoice_except')]"/>
+                <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <field name="date"/>
                     <separator orientation="vertical"/>
                     <field name="shop_id" widget="selection"/>
-                    <field name="payment_term" widget="selection"/>
-                    <field name="fiscal_position" widget="selection"/>
-                    <newline/>
-                    <filter icon="terp-sale" string="Manual In Progress" domain="[('state','=','manual')]"/>
-                    <filter icon="terp-sale" string="Done" domain="[('state','=','done')]"/>
-                    <filter icon="terp-sale" string="Cancelled" domain="[('state','=','cancel')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_invoice_id"/>
-                    <field name="partner_order_id"/>
-                    <field name="partner_shipping_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="pricelist_id" widget="selection"/>
-                    <field name="analytic_account_id"/>
-                    <newline/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
+                    <field name="state"/>
+                    <field name="categ_id" widget="selection"/>
                 </group>
             </search>
         </field>

From 335d3ce95c0fa664ac35423a3b5aeaef267e0404 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 26 May 2010 18:26:38 +0530
Subject: [PATCH 04/14] [IMP]:account:improved menus.

bzr revid: apa@tinyerp.com-20100526125638-rpcu5iyapi2imnli
---
 addons/account/report/account_analytic_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 0d05d5f0d76..9a7c02ff8e7 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -139,7 +139,7 @@
         <field name="context">{'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_analytic_report_search"/>
     </record>
-    <menuitem action="action_analytic_report_all" id="menu_action_analytic_report_all" parent="account.menu_finance_statastic_report_statement" sequence="8"/>
+    <menuitem action="action_analytic_report_all" id="menu_action_analytic_report_all" parent="account.menu_finance_statistic_report_statement" sequence="8"/>
 
 </data>
 </openerp>

From 9be38e6ed277b2fda2540ee5afc21d4fd2dfacf7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 26 May 2010 18:36:02 +0530
Subject: [PATCH 05/14] [IMP]:project:improved SQL report.(Tasks Analysis)

bzr revid: apa@tinyerp.com-20100526130602-0o370fizfv0iy3od
---
 addons/project/report/project_report_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a978587e232..4eac32fb284 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -103,6 +103,7 @@
 	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
 	                    </field>
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="11">
                         <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
                         <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
@@ -248,6 +249,6 @@
         <field name="view_mode">graph,tree</field>
         <field name="view_id" ref="view_task_by_days_vs_planned_hours_graph"/>
     </record>
-    
+
     </data>
 </openerp>

From ee2637fe9ed07c7f0c295245f8658210bb136579 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 26 May 2010 18:51:37 +0530
Subject: [PATCH 06/14] [IMP]:hr_recruitment:Resolved conflicts

bzr revid: apa@tinyerp.com-20100526132137-88wnjs0mog14xr69
---
 .../report/hr_evaluation_report_view.xml              | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 6b2e6ead15f..44c20ebbe16 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -75,9 +75,6 @@
 	                <field name="plan_id" widget="selection"/>
                 </group>
                 <newline/>
-<<<<<<< TREE
-				<group expand="0" string="Extended options..." colspan="10" col="12">
-=======
                 <group expand="1" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
                     <filter string="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
@@ -91,14 +88,6 @@
                 </group>
                  <newline/>
 				<group expand="0" string="Extended options..." groups="base.group_extended">
-                	<filter icon="terp-hr"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-                    <filter icon="terp-hr"
-                    		string="Cancelled"
-                    		domain="[('state','=','cancel')]"/>
-                    <separator orientation="vertical"/>
->>>>>>> MERGE-SOURCE
                     <field name="rating"/>
                     <separator orientation="vertical"/>
                     <field name="deadline"/>

From 7e47dbd1cdecfc2cec961fcc630ee7c21531efdf Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 11:52:02 +0530
Subject: [PATCH 07/14] [IMP]:account:Improved SQL reports(Invoice Analysis and
 Entries Analysis).

bzr revid: apa@tinyerp.com-20100527062202-p926f650dwok9h9f
---
 .../report/account_entries_report_view.xml    | 71 +++++++++----------
 .../report/account_invoice_report_view.xml    | 35 ++++-----
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index f07de0cdf8d..b31d3bbfd0a 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.entries.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Invoices Statistics">
+            <tree string="Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="date_created" invisible="1"/>
                 <field name="date_maturity" invisible="1"/>
@@ -37,7 +37,7 @@
          <field name="model">account.entries.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Entries" type="bar">
+             <graph string="Entries Analysis" type="bar">
                  <field name="partner_id"/>
                  <field name="amount"/>
              </graph>
@@ -48,15 +48,15 @@
         <field name="model">account.entries.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Entries">
+            <search string="Entries Analysis">
             	<group colspan="10" col="12">
-	            	<filter icon="terp-account" string="This Year"
+	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
 	            			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Entries of the year"/>
-	                <filter icon="terp-account" string="This Month"
+		                    help="Entries of last 365 days"/>
+	                <filter icon="gtk-media-rewind" string="Last 30 Days"
 	                		name="This Month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                		help="Entries of this month"/>
+	                		help="Entries of last 30 days"/>
 	                <filter icon="gtk-media-rewind"
 	                        string="    7 Days    "
 	                        separator="1"
@@ -66,56 +66,55 @@
                     <filter string="Draft"
                     		icon="terp-account"
                     		domain="[('state','=','draft')]"
-                    		help = "Draft tasks"/>
+                    		help = "Draft entries"/>
+                    <filter string="Posted"
+                            icon="terp-account"
+                            domain="[('state','=','posted')]"
+                            help = "Posted entries"/>
                     <separator orientation="vertical"/>
-                    		<field name="journal_id" widget="selection"/>
-                    		<field name="account_id"/>
-                    		<field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="partner_id" />
+                    <field name="product_id" />
+                    <field name="partner_id" />
+                    <field name="account_id"/>
+                    <field name="analytic_account_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
 					</group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
-                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
-                    <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/>
                     <filter string="State of Move Line" icon="terp-account" context="{'group_by':'state_2'}"/>
                     <filter string="Period" icon="terp-account" context="{'group_by':'period_id'}"/>
                     <filter string="Period of Move Line" icon="terp-account" context="{'group_by':'period_id2'}"/>
-                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                  </group>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                	<filter string="Posted"
-                   			icon="terp-account"
-                   			domain="[('state','=','posted')]"
-                   			help = "Posted tasks"/>
-                		<field name="state_2"/>
-                	<separator orientation="vertical"/>
-                		<field name="period_id" widget="selection"/>
-                		<field name="period_id2" widget="selection"/>
-                		<field name="type"/>
-                    <field name="product_id" />
-                    <field name="analytic_account_id"/>
+                 <newline/>
+                 <group expand="0" string="Extended options..." groups="base.group_extended">
+                	<field name="state_2"/>
+                	<field name="period_id" widget="selection"/>
+                	<field name="period_id2" widget="selection"/>
+                	<field name="type"/>
+                    <field name="journal_id" widget="selection"/>
                     <newline/>
-                	<separator orientation="vertical"/>
                     <field name="date_created"/>
-                		<field name="date"/>
+                	<field name="date"/>
                     <field name="date_maturity"/>
-                </group>
-
+                 </group>
             </search>
         </field>
     </record>
     <record id="action_account_entries_report_all" model="ir.actions.act_window">
-        <field name="name">Entries</field>
+        <field name="name">Entries Analysis</field>
         <field name="res_model">account.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 7acd0c332b1..b8b0b09490b 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.invoice.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Invoices Statistics">
+            <tree string="Invoices Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -42,7 +42,7 @@
          <field name="model">account.invoice.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Invoices Statistics" type="bar">
+             <graph string="Invoices Analysis" type="bar">
                  <field name="product_id"/>
                  <field name="price_total"/>
              </graph>
@@ -54,7 +54,7 @@
         <field name="model">account.invoice.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Invoices">
+            <search string="Invoices Analysis">
               <group col="10" colspan="12">
 	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
@@ -72,27 +72,28 @@
                     <filter string="Draft"
                     		icon="terp-account"
                     		domain="[('state','=','draft')]"
-                    		help = "Draft tasks"/>
+                    		help = "Draft Invoices"/>
                    	<filter string="Pro-forma"
                    			icon="terp-account"
                    			domain="[('state','=','proforma'),('state','=','proforma2')]"
-                   			help = "Pro-forma tasks"/>
+                   			help = "Pro-forma Invoices"/>
                    	<filter string="Current"
 	                		icon="terp-account"
 	                		domain="[('state', '=' ,'open')]"
-	                		help = "In progress tasks"/>
+	                		help = "open Invoices"/>
 	                <filter string="Done"
                             icon="terp-account"
                             domain="[('state','=','paid')]"
-                            help = "Done tasks"/>
+                            help = "Done Invoices"/>
   					<separator orientation="vertical"/>
   					<field name="partner_id"/>
                     <field name="user_id" widget="selection">
                     <filter icon="terp-account"
-                    		string="Invoices Non Users"
-                    		help="Invoices Non Users"
-                    		domain="[('user_id','=',False)]"/>
+                    		string="My Invoices"
+                    		help="My Invoices"
+                    		domain="[('user_id','=',uid)]"/>
                     </field>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
                 <group expand="1" string="Group By...">
@@ -119,6 +120,9 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
+
+                    <field name="date" string="Date Invoiced"/>
+                    <separator orientation="vertical"/>
                     <field name="type"/>
                     <field name="currency_id" widget="selection"/>
                     <field name="partner_bank" widget="selection"/>
@@ -127,27 +131,26 @@
                     <field name="address_contact_id"/>
                     <field name="account_id"/>
                     <newline/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical"/>
                     <field name="payment_term" widget="selection"/>
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="state"/>
                     <separator orientation="vertical"/>
                 	<field name="address_invoice_id"/>
                 	<field name="product_id"/>
-                	<newline/>
-					<field name="date" string="Date Invoiced"/>
-					<field name="date_due"/>
                 </group>
             </search>
         </field>
     </record>
 
     <record id="action_account_invoice_report_all" model="ir.actions.act_window">
-        <field name="name">Invoices</field>
+        <field name="name">Invoices Analysis</field>
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[],'search_default_user_id':uid}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
     </record>
 

From bebd1e65d0dd18bad051a59230447446dd1aef80 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 15:52:38 +0530
Subject: [PATCH 08/14] [IMP]:sale:Improved SQL reports(Sales Analysis).

bzr revid: apa@tinyerp.com-20100527102238-34qm76q6uxe1u21y
---
 addons/sale/report/sale_report.py       | 6 +++---
 addons/sale/report/sale_report_view.xml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

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 @@
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
-                <field name="uom_id" invisible="not context.get('set_visible',False)"/>
+                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="# of Qty"/>
@@ -88,6 +88,7 @@
                     <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-sale" context="{'group_by':'product_id','set_visible':True}"/>
+                    <filter string="Default UoM" icon="terp-sale" context="{'group_by':'uom_name'}"/>
                     <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>

From 92cdfc41a45bdd3c64f18c77f42e4781249d90f7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 16:47:21 +0530
Subject: [PATCH 09/14] [IMP]:account,sale:Improved SQL reports(Sales Analysis
 and account's reports).

bzr revid: apa@tinyerp.com-20100527111721-co6kddx5umt805hd
---
 .../report/account_account_report_view.xml    | 13 ++--
 .../account_analytic_entries_report_view.xml  | 33 +++++----
 .../report/account_analytic_report_view.xml   | 71 +++++++------------
 .../report/account_entries_report_view.xml    |  2 +-
 addons/sale/report/sale_report_view.xml       |  2 +-
 5 files changed, 52 insertions(+), 69 deletions(-)

diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index efdb4567935..137fa0c69ae 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.account.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Account Report">
+            <tree string="Accounts Analysis">
                 <field name="name" invisible="1" string="Account"/>
                 <field name="code" invisible="1"/>
                 <field name="type" invisible="1"/>
@@ -29,7 +29,7 @@
          <field name="model">account.account.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Accounts" type="bar">
+             <graph string="Accounts Analysis" type="bar">
              	<field name="name"/>
                 <field name="credit" operator="+"/>
                 <field name="debit" operator="+"/>
@@ -43,7 +43,7 @@
         <field name="model">account.account.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Accounts">
+            <search string="Accounts Analysis">
                <group>
                <filter icon="terp-account"
 	                    	string="At Date"
@@ -54,7 +54,6 @@
 	            <separator orientation="vertical"/>
             	<field name="name" string="Account"/>
             	<field name="code"/>
-                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -69,9 +68,11 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <field name="parent_account_id" />
+                    <separator orientation="vertical"/>
                     <field name="type" />
                     <field name="user_type" widget="selection"/>
-                    <field name="parent_account_id" />
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
 
             </search>
@@ -79,7 +80,7 @@
     </record>
 
     <record id="action_account_account_report" model="ir.actions.act_window">
-        <field name="name">Accounts</field>
+        <field name="name">Accounts Analysis</field>
         <field name="res_model">account.account.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 84dca63f440..610cf14a1d8 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">analytic.entries.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Analytic Entries Statistics">
+            <tree string="Analytic Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
@@ -33,26 +33,25 @@
         <field name="model">analytic.entries.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Analytic Entries">
+            <search string="Analytic Entries Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="terp-account" string="Last 365 DAys"
+	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
 		                    domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Analytic Entries of the year"/>
-	                <filter icon="terp-account" string="Last 30 Days"
+		                    help="Analytic Entries of last 365 days"/>
+	                <filter icon="gtk-media-rewind" string="Last 30 Days"
 	                		name="month"
 	                		domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                		help="Analytic Entries of this month"/>
+	                		help="Analytic Entries of last 30 days"/>
 	                <filter icon="gtk-media-rewind"
 	                        string="    7 Days    "
 	                        separator="1"
 	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                        help="Analytic Entries during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <field name="name"/>
+	                <field name="product_id" />
 	                <field name="user_id" widget="selection">
-	                <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Case"/>
+	                <filter icon="terp-account" domain="[('user_id','=',uid)]" help="My Entries"/>
 	                </field>
-	                <field name="currency_id"/>
 	            </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -73,15 +72,15 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
-					<field name="account_id" />
+					<field name="currency_id" widget="selection"/>
 					<field name="general_account_id" widget="selection"/>
-					<field name="journal_id" widget="selection"/>
-					<separator orientation="vertical"/>
-					<field name="product_id" />
 					<field name="product_uom_id" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.multi_company"/>
+					<field name="journal_id" widget="selection"/>
+					<field name="company_id" widget="selection" groups="base.multi_company"/>
+					<separator orientation="vertical"/>
+                    <field name="name"/>
+					<field name="account_id"/>
         		</group>
-
             </search>
         </field>
     </record>
@@ -90,7 +89,7 @@
          <field name="model">analytic.entries.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Analytic Entries" type="bar">
+             <graph string="Analytic Entries Analysis" type="bar">
              	<field name="user_id"/>
                 <field name="amount" operator="+"/>
                 <field name="unit_amount" operator="+"/>
@@ -99,7 +98,7 @@
          </field>
     </record>
     <record id="action_analytic_entries_report" model="ir.actions.act_window">
-        <field name="name">Analytic Entries</field>
+        <field name="name">Analytic Entries Analysis</field>
         <field name="res_model">analytic.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index a013f8a7369..2864386f582 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">analytic.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Analytic Accounts Statistics">
+            <tree string="Analytic Accounts Analysis">
             	<field name="parent_id" invisible="1" string="Analytic Account"/>
             	<field name="product_id" invisible="1"/>
                 <field name="name" invisible="1"/>
@@ -19,9 +19,9 @@
                 <field name="nbr" sum ="# of Lines"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="type" invisible="1"/>
-                <field name="debit"/>
-                <field name="credit"/>
-                <field name="balance"/>
+                <field name="debit" sum ="Debit"/>
+                <field name="credit" sum ="Credit"/>
+                <field name="balance" sum ="Balance"/>
                 <field name="state" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
@@ -34,20 +34,20 @@
         <field name="model">analytic.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Analytic Accounts">
+            <search string="Analytic Accounts Analysis">
             	<group>
-	                <filter icon="terp-account"
-	                    	string="This Year"
-	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
-	                <filter icon="terp-account"
-	                    	string="This Month"
-	                    	name="This Month"
-	                    	domain="[('month','=',time.strftime('%%m'))]"/>
-	                <filter icon="gtk-media-rewind"
-	                        string="    7 Days    "
-	                        separator="1"
-	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                        help="Entries during last 7 days"/>
+	                <filter icon="gtk-media-rewind" string="Last 365 Days"
+                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                            help="Analytic Accounts of last 365 days"/>
+                    <filter icon="gtk-media-rewind" string="Last 30 Days"
+                            name="month"
+                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                            help="Analytic Accounts of last 30 days"/>
+                    <filter icon="gtk-media-rewind"
+                            string="    7 Days    "
+                            separator="1"
+                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Analytic Accounts during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter icon="terp-account"
                     		string="Draft"
@@ -60,13 +60,14 @@
                     		domain="[('state','=','pending')]"/>
                     <separator orientation="vertical"/>
 	                <field name="name"/>
+	                <field name="product_id" />
+	                <field name="partner_id"/>
 	                <field name="user_id" widget="selection">
 	                    <filter icon="terp-account"
 	                        	string="My Accounts"
 	                        	help="My Account"
 	                        	domain="[('user_id','=',uid)]"/>
 	                </field>
-	                <field name="partner_id"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
@@ -85,34 +86,16 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
-
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                    <filter icon="terp-account"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-                    <filter icon="terp-account"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-                    <filter icon="terp-account"
-                    		string="Pending"
-                    		domain="[('state','=','pending')]"/>
-                    <filter icon="terp-account"
-                    		string="Close"
-                    		domain="[('state','=','close')]"/>
-                    <filter icon="terp-account"
-                    		string="Template"
-                    		domain="[('state','=','template')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="parent_id"/>
-                    <field name="journal_id" widget="selection"/>
-                    <newline/>
-                    <field name="product_id" />
-                    <field name="type"/>
-                    <separator orientation="vertical"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
+                    <separator orientation="vertical"/>
+                    <field name="state"/>
+                    <field name="parent_id"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="type"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
                 </search>
         </field>
@@ -122,7 +105,7 @@
          <field name="model">analytic.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Analytic Accounts" type="bar">
+             <graph string="Analytic Accounts Analysis" type="bar">
              	<field name="user_id"/>
                 <field name="credit" operator="+"/>
                 <field name="debit" operator="+"/>
@@ -132,7 +115,7 @@
          </field>
     </record>
     <record id="action_analytic_report_all" model="ir.actions.act_window">
-        <field name="name">Analytic Accounts</field>
+        <field name="name">Analytic Accounts Analysis</field>
         <field name="res_model">analytic.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index b31d3bbfd0a..f61348c290c 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -76,7 +76,6 @@
                     <field name="partner_id" />
                     <field name="account_id"/>
                     <field name="analytic_account_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
 					</group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -105,6 +104,7 @@
                 	<field name="period_id2" widget="selection"/>
                 	<field name="type"/>
                     <field name="journal_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="date_created"/>
                 	<field name="date"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 2542257ddac..91cada4c858 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -79,7 +79,6 @@
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
 	                </field>
-	                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
@@ -107,6 +106,7 @@
                     <field name="shop_id" widget="selection"/>
                     <field name="state"/>
                     <field name="categ_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
             </search>
         </field>

From 1aed90730d3115439303f580f155b94c533d1359 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 16:57:13 +0530
Subject: [PATCH 10/14] [IMP]:account:Improved SQL reports(account's reports).

bzr revid: apa@tinyerp.com-20100527112713-4g3umpeqekm7mp2e
---
 addons/account/report/account_analytic_report_view.xml | 2 +-
 addons/account/report/account_invoice_report_view.xml  | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 2864386f582..eba69e2785b 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -40,7 +40,7 @@
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts of last 365 days"/>
                     <filter icon="gtk-media-rewind" string="Last 30 Days"
-                            name="month"
+                            name="This Month"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts of last 30 days"/>
                     <filter icon="gtk-media-rewind"
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index b8b0b09490b..597e5f43675 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -21,9 +21,7 @@
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="state" invisible="1"/>
-                <field name="payment_term" invisible="1"/>
                 <field name="period_id" invisible="1"/>
-                <field name="fiscal_position" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="date_due" invisible="1"/>
@@ -110,9 +108,7 @@
                     <filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Payment Term" icon="terp-account" context="{'group_by':'payment_term'}"/>
                     <filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
-                    <filter string="Fiscal Position" icon="terp-account" context="{'group_by':'fiscal_position'}"/>
                     <newline/>
                     <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
@@ -126,14 +122,12 @@
                     <field name="type"/>
                     <field name="currency_id" widget="selection"/>
                     <field name="partner_bank" widget="selection"/>
-                    <field name="fiscal_position" widget="selection"/>
                     <separator orientation="vertical"/>
                     <field name="address_contact_id"/>
                     <field name="account_id"/>
                     <newline/>
                     <field name="date_due"/>
                     <separator orientation="vertical"/>
-                    <field name="payment_term" widget="selection"/>
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
                     <field name="state"/>

From d46d3ebdc36ad8586fe0db4f42de1aa69db6dd57 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 17:18:36 +0530
Subject: [PATCH 11/14] [IMP]:crm:Improved SQL reports(Leads Analysis).

bzr revid: apa@tinyerp.com-20100527114836-hxdrjv0c3p9sukwf
---
 addons/crm/report/crm_lead_report_view.xml | 96 +++++++---------------
 1 file changed, 31 insertions(+), 65 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c65ee0fd285..da480d21dc0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree string="Leads">
+            <tree string="Leads Analysis">
 				<field name="name" invisible="1"/>
 				<field name="month" invisible="1"/>
 				<field name="section_id" invisible="1"/>
@@ -34,7 +34,7 @@
             <field name="model">crm.lead.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Cases">
+                <form string="Leads Analysis">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
@@ -54,7 +54,7 @@
             <field name="model">crm.lead.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Leads" type="bar">
+                <graph orientation="horizontal" string="Leads Analysis" type="bar">
                     <field name="state"/>
                     <field name="nbr" operator="+"/>
                     <field group="True" name="user_id"/>
@@ -69,103 +69,69 @@
             <field name="model">crm.lead.report</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search">
-                  <group col="16" colspan="8">
-                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                <search string="Leads Analysis">
+                    <group col="16" colspan="8">
+                   	    <filter string="Last 365 Days" icon="gtk-media-rewind"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-
-                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
-                   			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                        <filter string="Last 30 Days" icon="gtk-media-rewind" name="This Month"
+                    	    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="gtk-media-rewind" string="7 Days" separator="1"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
+                        <filter icon="terp-crm"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
+					    <filter icon="terp-crm"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
+					    <filter icon="terp-crm"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
-
                    		<separator orientation="vertical" />
                    		<field name="section_id"
                    			default="context.get('section_id', False)"
                    			widget="selection"
                    			context="{'invisible_section': False}">
-
-                   			<filter icon="terp-crm"
-                   				context="{'invisible_section': False}"
-                   				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
-
+                   		<filter icon="terp-crm"
+                   			context="{'invisible_section': False}"
+                   			domain="[('section_id.user_id','=',uid)]"
+                   			help="My section" />
                    		</field>
-                   		<field name="company_id" widget="selection" groups="base.group_multi_company">
-                           <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
-                        </field>
-
                       	<field name="user_id" select="1" widget="selection">
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                        <filter string="User" name="User" icon="terp-crm"
                         	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-crm"
                         	domain="[]"
                         	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-crm"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
-
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-crm"
                         	domain="[]" context="{'group_by':'state'}" />
-
-						<filter string="Stage" icon="terp-sale" domain="[]"
+						<filter string="Stage" icon="terp-crm" domain="[]"
 							context="{'group_by':'stage_id'}" />
-
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-crm"
                         	domain="[]" context="{'group_by':'categ_id'}" />
-
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-crm"
                         	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-crm"
                         	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-crm"
                         	domain="[]" context="{'group_by':'name'}" />
-
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." groups="base.group_extended">
-
-                         <filter icon="terp-sale"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-                    	<filter icon="terp-sale"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                   		<group>
-		            	    <separator orientation="vertical"/>
-		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-			            </group>
+                       <field name="state"/>
+	            	   <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+		               <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                </search>
             </field>
@@ -199,7 +165,7 @@
 <!-- Leads by user and section Action -->
 
         <record id="action_report_crm_lead" model="ir.actions.act_window">
-            <field name="name">Leads</field>
+            <field name="name">Leads Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
@@ -246,7 +212,7 @@
             <field name="act_window_id" ref="action_report_crm_opportunity"/>
        </record>
 
-       <menuitem name="Leads" id="menu_report_crm_leads_tree"
+       <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
            groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_lead" />
 

From 834b3fcf2b4e3cf3a59f930c4df143c6eb3995a3 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.co.in>
Date: Thu, 27 May 2010 18:01:25 +0530
Subject: [PATCH 12/14] [IMP]:account:Improved account reports

bzr revid: jni@tinyerp.co.in-20100527123125-g2icffru6d7g9g3w
---
 .../account/report/account_analytic_entries_report_view.xml | 6 +++---
 addons/sale/report/sale_report_view.xml                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 610cf14a1d8..157a08f8ca5 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -13,7 +13,7 @@
                 <field name="month" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="name" invisible="1"/>
-                <field name="company_id" invisible="1" groups="base.multi_company"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="currency_id" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="general_account_id" invisible="1"/>
@@ -57,7 +57,7 @@
                 <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.multi_company"/>
+                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Account"  icon="terp-account" context="{'group_by':'account_id'}"/>
                     <filter string="General Account" icon="terp-account" context="{'group_by':'general_account_id'}"/>
@@ -76,10 +76,10 @@
 					<field name="general_account_id" widget="selection"/>
 					<field name="product_uom_id" widget="selection"/>
 					<field name="journal_id" widget="selection"/>
-					<field name="company_id" widget="selection" groups="base.multi_company"/>
 					<separator orientation="vertical"/>
                     <field name="name"/>
 					<field name="account_id"/>
+					<field name="company_id" widget="selection" groups="base.group_multi_company"/>
         		</group>
             </search>
         </field>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 91cada4c858..98e74c363b9 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -17,10 +17,10 @@
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
-                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="# of Qty"/>
+                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" avg="Days to Close"/>

From d861ea005f74d0050a256fd945ffc272f3891385 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 18:23:47 +0530
Subject: [PATCH 13/14] [IMP]:sale:Improved SQL reports(Sales Analysis).

bzr revid: apa@tinyerp.com-20100527125347-8i06sow31mmuy1aq
---
 addons/sale/report/sale_report.py       | 4 ++--
 addons/sale/report/sale_report_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 4fef5fd2595..cad05c8dcc8 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -37,7 +37,7 @@ class sale_report(osv.osv):
         'day': fields.char('Day', size=128, readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'uom_name': fields.char('Default UoM', size=128, readonly=True),
-        'product_qty':fields.float('# of Qty', readonly=True),
+        'product_uom_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),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
@@ -73,7 +73,7 @@ class sale_report(osv.osv):
                      to_char(s.date_order, 'YYYY-MM-DD') as day,
                      l.product_id as product_id,
                      u.name as uom_name,
-                     sum(l.product_uom_qty * u.factor) as product_qty,
+                     sum(l.product_uom_qty * u.factor) as product_uom_qty,
                      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 98e74c363b9..117eedf7af3 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -19,7 +19,7 @@
                 <field name="product_id" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
-                <field name="product_qty" sum="# of Qty"/>
+                <field name="product_uom_qty" sum="# of Qty"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>

From 9936ec6b22d92c2afaf33403041b05e31ea218ca Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 19:03:02 +0530
Subject: [PATCH 14/14] [IMP]:sale,project:Improved SQL reports(Sales
 Analysis,Tasks Analysis).

bzr revid: apa@tinyerp.com-20100527133302-7s6ztbuw63yqdj90
---
 addons/project/report/project_report_view.xml | 4 ++--
 addons/sale/report/sale_report_view.xml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 4eac32fb284..9babb1655ef 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -55,10 +55,10 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                 	<group>
-	                    <filter icon="gtk-media-rewind" string="Last 365 Days"
+	                    <filter icon="gtk-media-rewind" string="  365 Days  "
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Tasks performed in last 365 Days"/>
-	                    <filter icon="gtk-media-rewind" string="Last 30 Days"
+	                    <filter icon="gtk-media-rewind" string="   30 Days   "
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Tasks performed in last 30 days"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 117eedf7af3..98ae326fc14 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -51,10 +51,10 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
             	<group>
-            	    <filter icon="gtk-media-rewind" string="Last 365 Days"
+            	    <filter icon="gtk-media-rewind" string="  365 Days  "
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Tasks performed in last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="Last 30 Days"
+	                <filter icon="gtk-media-rewind" string="   30 Days   "
 	                	name="month"
 	                	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                	help="Tasks performed in last 30 days"/>