From edd8bd594b87e59f0a8f45ac9491ae0bf9c60386 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 21 May 2010 15:58:04 +0530
Subject: [PATCH 1/4] [IMP]:account,stock:improved invoice report and solving
 bug in picking report when open the SQL report.

bzr revid: apa@tinyerp.com-20100521102804-0vtm3w3xqrhq5epm
---
 .../report/account_invoice_report_view.xml    | 73 ++++++++-----------
 .../report/report_stock_picking_view.xml      |  4 -
 2 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 160a77f6ffa..b974afdb8a3 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -17,7 +17,6 @@
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
-                <!--field name="delay" avg="Days to Close"/-->
                 <field name="nbr" sum="# of Lines"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
@@ -57,13 +56,13 @@
         <field name="arch" type="xml">
             <search string="Invoices">
               <group col="10" colspan="12">
-	            	<filter icon="terp-account" string="This Year"
+	            	<filter icon="terp-account" 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="Invoices of the year"/>
-	                <filter icon="terp-account" string="This Month"
+		                    help="Invoices of last 365 days"/>
+	                <filter icon="terp-account" string="Last 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="Invoices of this month"/>
+	                		help="Invoices of last 30 days"/>
 	                <filter icon="gtk-media-rewind"
 	                        string="    7 Days    "
 	                        separator="1"
@@ -82,71 +81,59 @@
 	                		icon="terp-account"
 	                		domain="[('state', '=' ,'open')]"
 	                		help = "In progress tasks"/>
+	                <filter string="Done"
+                            icon="terp-account"
+                            domain="[('state','=','paid')]"
+                            help = "Done tasks"/>
   					<separator orientation="vertical"/>
-                <field name="user_id" widget="selection">
-
+  					<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)]"/>
-                </field>
-                <field name="product_id"/>
-                <field name="partner_id"/>
-				<field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </field>
 				</group>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
-                	<filter string="Done"
-                   			icon="terp-account"
-                   			domain="[('state','=','paid')]"
-                   			help = "Done tasks"/>
-                   	<filter string="Cancelled"
-                		icon="terp-account"
-                		domain="[('state', '=' ,'cancel')]"
-                		help = "Cancelled tasks"/>
-                	<separator orientation="vertical"/>
-            		<field name="type"/>
-                	<field name="payment_term" widget="selection"/>
-                	<separator orientation="vertical"/>
-                	<field name="currency_id" widget="selection"/>
-                	<field name="journal_id" widget="selection"/>
-                	<newline/>
-                	<field name="address_contact_id"/>
+                    <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="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"/>
+                    <separator orientation="vertical"/>
                 	<field name="address_invoice_id"/>
-                	<separator orientation="vertical"/>
-                	<field name="account_id"/>
-                	<field name="partner_bank" widget="selection"/>
-                	<separator orientation="vertical"/>
-                	<field name="period_id" widget="selection"/>
-                	<field name="fiscal_position" widget="selection"/>
+                	<field name="product_id"/>
                 	<newline/>
 					<field name="date" string="Date Invoiced"/>
-					<separator orientation="vertical"/>
 					<field name="date_due"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="Payment Term" icon="terp-account" context="{'group_by':'payment_term'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
                     <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
                     <filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/>
-                    <newline/>
-                    <filter string="Contact Address Name" icon="terp-account" context="{'group_by':'address_contact_id'}"/>
-                    <filter string="Invoice Address Name" icon="terp-account" context="{'group_by':'address_invoice_id'}"/>
                     <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'}"/>
-                    <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'}"/>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index d4116313a7e..bfcb2bf54fb 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -15,9 +15,7 @@
                		<field name="month" invisible="1"/>
                		<field name="day" invisible="1"/>
                		<field name="date" invisible="1"/>
-					<field name="reference" invisible="1"/>
 					<field name="partner_id" invisible="1"/>
-					<field name="origin" invisible="1"/>
 					<field name="type" invisible="1"/>
 					<field name="state" invisible="1"/>
 					<field name="product_qty" sum="# of Products" />
@@ -61,8 +59,6 @@
                         <filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/>
 						<separator orientation="vertical"/>
 						<field name="partner_id"/>
-						<field name="reference" />
-						<field name="origin" />
 						<field name="type" groups="base.group_extended"/>
                    </group>
                    <newline/>

From 19bddf1cc737b9d209c820ef99026dde8d5c8164 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 21 May 2010 16:06:52 +0530
Subject: [PATCH 2/4] [IMP]:stock:Improved SQL report(Picking) with new
 guidlines.

bzr revid: apa@tinyerp.com-20100521103652-cwhac17kd42k4nyn
---
 .../report/report_stock_picking_view.xml      | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index bfcb2bf54fb..2c9856a0c67 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -15,13 +15,20 @@
                		<field name="month" invisible="1"/>
                		<field name="day" invisible="1"/>
                		<field name="date" invisible="1"/>
+					<field name="company_id" invisible="1"/>
 					<field name="partner_id" invisible="1"/>
+					<field name="product_id" invisible="1"/>
+					<field name="min_date" invisible="1"/>
+					<field name="order_date" invisible="1"/>
+					<field name="date_done" invisible="1"/>
+					<field name="max_date" invisible="1"/>
 					<field name="type" invisible="1"/>
+					<field name="invoice_state" invisible="1"/>
 					<field name="state" invisible="1"/>
 					<field name="product_qty" sum="# of Products" />
 					<field name="nbp" sum="# of Pickings" />
 					<field name="nbr" sum="# of Lines" />
-			        <field name="avg_days_to_deliver" sum='Avg Days to Deliver'/>
+			        <field name="avg_days_to_deliver" avg='Avg Days to Deliver'/>
 				</tree>
             </field>
         </record>
@@ -47,27 +54,44 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter icon="terp-stock" string="This Year"
+                   		<filter icon="terp-stock" 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="Picking in this year"/>
-	                	<filter icon="terp-stock" string="This Month"
+	                    	    help="Picking in last 365 days"/>
+	                	<filter icon="terp-stock" string="Last 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="Picking in this month"/>
+	                			help="Picking in last 30 days"/>
                         <separator orientation="vertical"/>
                         <filter string="Todo" icon="terp-stock" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
                         <filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/>
 						<separator orientation="vertical"/>
 						<field name="partner_id"/>
-						<field name="type" groups="base.group_extended"/>
+						<field name="company_id" groups="base.group_extended" widget="selection"/>
                    </group>
+                   <newline/>
+                	<group expand="0" string="Extended options..." colspan="10" col="12">
+                		<field name="type"/>
+                		<separator orientation="vertical"/>
+                		<field name="min_date"/>
+                		<separator orientation="vertical"/>
+                		<field name="max_date"/>
+	                    <newline/>
+	                    <field name="invoice_state"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="order_date"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="date_done"/>
+                	</group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="5">
                         <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
                     	<separator orientation="vertical"/>
-                    	<filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
+                    	<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
                     	<filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
+                    	<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
                     	<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
                     	<filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>

From 93281e8ad66c9ea556c009bc3591e70c76a6652a Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 21 May 2010 16:11:38 +0530
Subject: [PATCH 3/4] [IMP]:project:Improved SQL report(Task).

bzr revid: apa@tinyerp.com-20100521104138-1vdbvwgu4u8ma31m
---
 addons/project/report/project_report.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 1b74c7e5d7c..e6368f053d0 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -31,7 +31,7 @@ class report_project_task_user(osv.osv):
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'Assigned To', readonly=True),
-        'date_start': fields.datetime('Starting Date',readonly=True),
+        'date_start': fields.date('Starting Date',readonly=True),
         'no_of_days': fields.integer('#Days', size=128, readonly=True),
         'description': fields.text('Description',readonly=True),
         'date_end': fields.date('Ending Date',readonly=True),
@@ -96,6 +96,7 @@ class report_project_task_user(osv.osv):
                 group by
                     to_char(date_start, 'YYYY'),
                     to_char(date_start, 'MM'),
+                    to_char(date_start, 'YYYY-MM-DD'),
                     t.priority,
                     t.user_id,
                     t.state,

From 40ddc1e38da9767dca896b2701a5f0d5bc1dc1fd Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 21 May 2010 16:56:29 +0530
Subject: [PATCH 4/4] [IMP]:stock:Picking.

bzr revid: apa@tinyerp.com-20100521112629-2o47e3sut7aquuum
---
 addons/stock/report/report_stock_picking_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 2c9856a0c67..62d1b06fd19 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -87,11 +87,10 @@
                         <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
                     	<separator orientation="vertical"/>
                     	<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-                    	<filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
                     	<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                    	<filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
                     	<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
                     	<filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>