From 6c02799adff884cebf07197bc5a24e981576c98e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 27 Jul 2010 13:06:42 +0530
Subject: [PATCH] [IMP]: improvement in analytic accounting

bzr revid: mga@tinyerp.com-20100727073642-4c2gn41fuymaae10
---
 addons/account/project/project_view.xml       | 114 +++++++++---------
 .../hr_timesheet_invoice_view.xml             |   2 +-
 2 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index f49e90b99a6..d4d5050e5bb 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -23,25 +23,25 @@
             <field name="model">account.analytic.account</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Analytic Account">
-	           		<group col="8" colspan="4">
-	            		<filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
-	            		<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
-						<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-						<field name="code" select="1"/>
-						<field name="partner_id" select="1"/>
-						<field name="user_id" widget="selection"/>
-	           		</group>
-	            	<newline/>
-	            	<group expand="0" string="Group By...">
-	                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
-	                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
-	                        <separator orientation="vertical"/>
-	                        <filter string="Associated Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-	                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                <search string="Analytic Account">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
+                        <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="partner_id" select="1"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
-            	</search>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Associated Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -54,17 +54,17 @@
                 <tree toolbar="True" colors="red:(date&lt;=current_date);black:(date&gt;current_date)" string="Analytic account">
                     <field name="name"/>
                     <field name="code"/>
-                    <field name="date"/>
-                    <field name="company_currency_id"/>
-                    <field name="debit"/>
-                    <field name="credit"/>
                     <field name="balance"/>
-                    <field name="quantity"/>
-                    <field name="quantity_max"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="type" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="user_id" invisible="1"/>
+                    <field name="company_currency_id"/>
+<!--                    <field name="date"/>-->
+<!--                    <field name="debit"/>-->
+<!--                    <field name="credit"/>-->
+<!--                    <field name="quantity"/>-->
+<!--                    <field name="quantity_max"/>-->
+<!--                    <field name="parent_id" invisible="1"/>-->
+<!--                    <field name="type" invisible="1"/>-->
+<!--                    <field name="partner_id" invisible="1"/>-->
+<!--                    <field name="user_id" invisible="1"/>-->
                 </tree>
             </field>
         </record>
@@ -109,13 +109,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
-			<field name="context">{"search_default_user_id":uid}</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
         <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic"/>
 
-		<record id="act_account_renew_view" model="ir.actions.act_window">
+        <record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
@@ -141,7 +141,7 @@
 <!--            parent="account_analytic_def_account"/>-->
 <!--        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
 
-<!--		<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
+<!--        <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>-->
 
         <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
@@ -200,22 +200,26 @@
             <field name="model">account.analytic.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Search Analytic Lines">
-            		<group col='6' colspan='4'>
+                <search string="Search Analytic Lines">
+                    <group col='6' colspan='4'>
                         <field name="name" select="1"/>
-                        <field name="journal_id" select="1"/>
                         <field name="account_id" select="1"/>
+                        <field name="amount" select="1"/>
                         <field name="date" select="1"/>
                         <field name="user_id" widget="selection"/>
-            		</group>
-            		<newline/>
-            		<group string="Group By..." expand="0">
-            			<filter string="General Account" context="{'group_by':'general_account_id'}"/>
-                    	<filter string="Analytic Account" context="{'group_by':'account_id'}"/>
-                    	<filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
-                    	<filter string="Product" context="{'group_by':'product_id'}"/>
-            		</group>
-            	</search>
+                    </group>
+                    <newline/>
+                    <group col='6' colspan='4'>
+                        <field name="journal_id" select="1" widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group string="Group By..." expand="0">
+                        <filter string="General Account" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+                        <filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
+                        <filter string="Product" context="{'group_by':'product_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
         <record id="action_account_analytic_line_form" model="ir.actions.act_window">
@@ -298,16 +302,16 @@
             </field>
         </record>
 
-		<record id="view_analytic_journal_search" model="ir.ui.view">
+        <record id="view_analytic_journal_search" model="ir.ui.view">
             <field name="name">account.analytic.journal.search</field>
             <field name="model">account.analytic.journal</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="analytic Journals">
-	            	<group expand="0" string="Group By...">
+                <search string="analytic Journals">
+                    <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
                     </group>
-            	</search>
+                </search>
             </field>
         </record>
 
@@ -446,14 +450,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
-                	<group col="8" colspan="4">
-	                	<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-		               	<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
-		               	<separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	               		<field name="month" select="1"/>
-	                    <field name="account_id" select="1"/>
-					</group>
+                    <group col="8" colspan="4">
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
+                           <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
+                           <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                           <field name="month" select="1"/>
+                        <field name="account_id" select="1"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b10c1cc32ac..877afa57965 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -187,7 +187,7 @@
         <menuitem
             action="action_hr_timesheet_invoice_factor_form"
             id="hr_timesheet_invoice_factor_view"
-            parent="account.account_analytic_def_account"/>
+            parent="account.menu_low_level"/>
 
     </data>
 </openerp>