From 4ac2964a2f91ab593248763b86d2f2b170fb4ae3 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 3 May 2010 13:51:54 +0530
Subject: [PATCH] [IMP]: sale_journal: Improvement in sale journal report
 search view

bzr revid: atp@tinyerp.co.in-20100503082154-hpyazjwxr99203hb
---
 .../report/sale_journal_report_view.xml       | 65 ++++++++++++++-----
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index 08a802c8b98..438b510b3f3 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -9,13 +9,13 @@
 	        <field name="type">tree</field>
 	        <field name="arch" type="xml">
 	            <tree string="Sales by Journal">
-	                <field name="name"/>
-	                <field name="state"/>
-	                <field name="journal_id"/>
+	                <field name="name" invisible="1"/>
+	                <field name="state" invisible="1"/>
+	                <field name="journal_id" invisible="1"/>
 	                <field name="quantity"/>
 	                <field name="count"/>
-	                <field name="price_total"/>
 	                <field name="price_average"/>
+	                <field name="price_total"/>
 	            </tree>
 	        </field>
 	    </record>
@@ -46,9 +46,24 @@
 		            	<filter icon="terp-sale" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
 		               	<filter icon="terp-sale" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
 		               	<separator orientation="vertical"/>
+		                <filter icon="terp-sale"
+		                    	string="Quotations"
+		                    	domain="[('state','=','draft')]"/>
+		                <filter icon="terp-sale"
+		                		string="Waiting Schedule"
+		                		domain="[('state','=','waiting_date')]"/>
+		                <filter icon="terp-sale"
+		                		string="In progress"
+		                		domain="[('state','=','progress')]"/>
+		                <separator orientation="vertical"/>
 		                <field name="name" select="1"/>
 		                <field name="state" select="1"/>
-		                <field name="journal_id" select="1"/>
+		                <field name="journal_id" widget="selection"/>
+					</group>
+					<newline/>
+					<group expand="1" string="Group By..." colspan="4" col="12">
+						<filter string="journal" name="journal" icon="terp-sale" context="{'group_by':'journal_id'}"/>
+						<filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
 					</group>
 	            </search>
 	        </field>
@@ -63,6 +78,7 @@
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,graph</field>
 	        <field name="search_view_id" ref="view_sale_journal_report_search"/>
+	        <field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
 	    </record>
 
 	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" parent="base.next_id_64" action="action_sale_journal_report_open_menu_all"/>
@@ -76,16 +92,16 @@
 			<field name="type">tree</field>
 			<field name="arch" type="xml">
 				<tree string="Picking journal">
-					<field name="name" />
-					<field name="month" />
-					<field name="invoice_state" />
-					<field name="state" />
-					<field name="invoice_type_id" />
-					<field name="journal_id" />
+					<field name="name" invisible="1"/>
+					<field name="month" invisible="1"/>
+					<field name="invoice_state" invisible="1"/>
+					<field name="state" invisible="1"/>
+					<field name="invoice_type_id" invisible="1"/>
+					<field name="journal_id" invisible="1"/>
 					<field name="quantity" />
 					<field name="count" />
-					<field name="price_total"/>
 					<field name="price_average"/>
+					<field name="price_total"/>
 				</tree>
 			</field>
 		</record>
@@ -114,19 +130,31 @@
 			<field name="arch" type="xml">
 				<search string="Picking journal">
 					<group col="8" colspan="4">
-						<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice method in this year"/>
-		               	<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice method in this month"/>
+						<filter icon="terp-sale" string="This Year" name="year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice or by journal method in this year"/>
+		               	<filter icon="terp-sale" string="This Month" name="month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice or by journal method in this month"/>
+		               	<separator orientation="vertical"/>
+		                <filter icon="terp-stock"
+		                    	string="Draft"
+		                    	domain="[('state','=','draft')]"/>
+		                <filter icon="terp-stock"
+		                		string="Pending"
+		                		domain="[('state','=','waiting')]"/>
+		                <filter icon="terp-stock"
+		                		string="Confirmed"
+		                		domain="[('state','=','confirmed')]"/>
 		               	<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="month" select="1"/>
 						<field name="invoice_state" select="1"/>
-						<field name="journal_id"/>
 						<field name="state" select="1"/>
 		            </group>   	
 		            <newline/>
-		            <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="Journal" icon="terp-sale" context="{'group_by':'journal_id'}"/>
-	                    <filter string="Invoice" icon="terp-sale" context="{'group_by':'invoice_type_id'}"/>
+		            <group expand="1" string="Group By..." colspan="4" col="12">
+	                    <filter string="Journal" icon="terp-stock" context="{'group_by':'journal_id'}"/>
+	                    <filter string="Invoice" icon="terp-stock" context="{'group_by':'invoice_type_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Invoice state" icon="terp-stock" context="{'group_by':'invoice_state'}"/>
+	                    <filter string="state" icon="terp-stock" context="{'group_by':'state'}"/>
 					</group>
 				</search>
 			</field>
@@ -150,6 +178,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,graph</field>
 			<field name="search_view_id" ref="view_sale_journal_picking_report_search"/>
+			<field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
 		</record>
 		
 		<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" action="action_sale_journal_picking_report_open_menu_all"/>