From fd885debd511143eed735a4163faadb572565285 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 8 Jul 2008 20:56:25 +0000
Subject: [PATCH] Better Menus and Views

bzr revid: fp@tinyerp.com-6ae3ac1df449bd19db7b0366feb935e8e33d5101
---
 addons/account/account_report.xml             | 41 ++++++++++++++----
 addons/account/account_view.xml               | 42 +++++++------------
 addons/account/project/project_view.xml       |  7 +++-
 .../hr_timesheet_invoice_view.xml             | 18 ++++----
 addons/product/pricelist.py                   |  2 +-
 addons/project/project_view.xml               | 20 ++++++---
 addons/purchase/purchase_data.xml             |  3 +-
 addons/purchase/purchase_view.xml             |  5 ++-
 8 files changed, 83 insertions(+), 55 deletions(-)

diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 5b0f2821198..7ab2bb6172c 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -15,15 +15,40 @@
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
         
         <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
-        
-        
+
         <report auto="False" id="account_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" rml="account/report/tax_report.rml" string="Taxes report"/>
         
-        <wizard id="wizard_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" string="Wizard taxes report"/>
-        
-        <menuitem action="wizard_vat_declaration" id="menu_wizard_vat_declaration" parent="account.menu_finance_reporting" type="wizard"/>
-        
-        
+		<menuitem
+			id="menu_tax_report"
+			string="Taxes Reports"
+			parent="account.menu_finance_reporting"/>
+
+        <wizard 
+			id="wizard_vat_declaration" 
+			menu="False" 
+			model="account.tax.code" 
+			name="account.vat.declaration" 
+			string="Print Taxes Report"/>
+        <menuitem
+			action="wizard_vat_declaration" 
+			id="menu_wizard_vat_declaration" 
+			parent="menu_tax_report" 
+			type="wizard"/>
+
+
+        <record id="action_tax_code_tree" model="ir.actions.act_window">
+            <field name="name">Chart of Taxes</field>
+            <field name="res_model">account.tax.code</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_tax_code_tree"/>
+        </record>
+		<menuitem
+			action="action_tax_code_tree" 
+			id="menu_action_tax_code_tree"
+			parent="menu_tax_report"
+			sequence="12"/>
+ 
         <!--
 
 		<report id="analytic_journal"
@@ -34,4 +59,4 @@
 			auto="False" />
 		-->
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5e0790f5af3..fa0a2e61d49 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -372,7 +372,7 @@
             <field name="name">Statements</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_entries"/>
 
@@ -385,7 +385,13 @@
         </record>
         <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree"/>
 
-
+        <record id="action_bank_statement_tree2" model="ir.actions.act_window">
+            <field name="name">New Statement</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+        <menuitem action="action_bank_statement_tree2" id="menu_bank_statement_tree2" parent="menu_bank_statement_tree"/>
 
         <record id="view_bank_statement_reconcile" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
@@ -539,17 +545,8 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_tax_code_tree"/>
         </record>
-        <record id="action_tax_code_tree" model="ir.actions.act_window">
-            <field name="name">Tax Report</field>
-            <field name="res_model">account.tax.code</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_tax_code_tree"/>
-        </record>
-        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration"/>
+       <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration"/>
 		<menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/>
-        <menuitem id="next_id_28" name="Taxes" parent="menu_finance_periodical_processing"/>
-		<menuitem action="action_tax_code_tree" id="menu_action_tax_code_tree" parent="next_id_28" sequence="12"/>
 
 
         <!--
@@ -580,7 +577,7 @@
                             <field name="active" select="2"/>
                             <field name="type"/>
                             <field name="applicable_type"/>
-                            <field name="amount" select="2"/>
+                            <field name="amount" select="2" states="{'type==percent': {'visible': 0}"/>
                             <field groups="base.group_extended" name="include_base_amount"/>
                             <field groups="base.group_extended" name="domain"/>
                             <newline/>
@@ -616,22 +613,13 @@
                 </form>
             </field>
         </record>
-        <record id="action_tax_tree" model="ir.actions.act_window">
-            <field name="name">Taxes Structure</field>
-            <field name="res_model">account.tax</field>
-            <field name="view_type">tree</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="view_id" ref="view_tax_tree"/>
-        </record>
-        <menuitem action="action_tax_tree" id="menu_action_tax_tree" parent="account.next_id_27" sequence="12"/>
-
         <record id="action_tax_form" model="ir.actions.act_window">
             <field name="name">Taxes</field>
             <field name="res_model">account.tax</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tax_tree"/>
         </record>
-        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="menu_action_tax_tree"/>
+        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
 
 
 
@@ -649,11 +637,11 @@
             <field eval="True" name="object"/>
         </record>
 
-        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Standard Entry"/>
+        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Journal"/>
         <menuitem action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard"/>
 
         <record id="action_move_journal_period_line_form" model="ir.actions.act_window">
-            <field name="name">Open Journals</field>
+            <field name="name">Entries in Open Journals</field>
             <field name="res_model">account.journal.period</field>
             <field name="view_type">tree</field>
             <field name="domain">[('state','&lt;&gt;','done')]</field>
@@ -1300,7 +1288,7 @@
             <field name="name">Subscription Entries</field>
             <field name="res_model">account.subscription</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_subscription_form"/>
+            <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_entries"/>
 
@@ -1314,7 +1302,7 @@
         <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form"/>
 
         <record id="action_subscription_form_new" model="ir.actions.act_window">
-            <field name="name">New Subscription Entries</field>
+            <field name="name">New Subscription</field>
             <field name="res_model">account.subscription</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 9848f1713c9..8cff25efd59 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -85,7 +85,10 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
-        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_def_chart" parent="account.next_id_39"/>
+        <menuitem
+			action="action_account_analytic_account_tree2" 
+			id="account_analytic_def_chart" 
+			parent="account.next_id_39"/>
         <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
         
         <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
@@ -251,7 +254,7 @@
         
         
         <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">
-            <field name="name">Entries by Journal</field>
+            <field name="name">Analytic Entries by Journal</field>
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_analytic_journal_tree"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 6b151d6a9df..86ce7c0d5a6 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -118,7 +118,7 @@
         
         
         <record id="action_hr_analytic_timesheet_tree_invoiced_my" model="ir.actions.act_window">
-            <field name="name">My uninvoiced Entries</field>
+            <field name="name">My Uninvoiced Entries</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -128,17 +128,17 @@
          
         
         <record id="action_open_analytic_accounts" model="ir.actions.act_window">
-            <field name="name">Open analytic accounts</field>
+            <field name="name">Open Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem id="next_id_59" name="Analytic Charts of Accounts" parent="account.menu_finance_charts"/><menuitem action="action_open_analytic_accounts" id="menu_action_open_analytic_accounts" parent="next_id_59"/>
+        <menuitem action="action_open_analytic_accounts" id="menu_action_open_analytic_accounts" parent="account.account_analytic_def_chart"/>
          
         
         <record id="action_open_invoice_analytic_accounts" model="ir.actions.act_window">
-            <field name="name">Unclosed invoiced accounts</field>
+            <field name="name">Unclosed Invoiceable Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -149,24 +149,24 @@
         
         
         <record id="action_draft_analytic_accounts" model="ir.actions.act_window">
-            <field name="name">Draft analytic accounts</field>
+            <field name="name">Draft Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem action="action_draft_analytic_accounts" id="menu_action_draft_analytic_accounts" parent="hr_timesheet_invoice.next_id_59"/>
+        <menuitem action="action_draft_analytic_accounts" id="menu_action_draft_analytic_accounts" parent="account.account_analytic_def_chart"/>
          
         
         
         <record id="action_pending_analytic_accounts" model="ir.actions.act_window">
-            <field name="name">Pending analytic accounts</field>
+            <field name="name">Pending Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','pending'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem action="action_pending_analytic_accounts" id="menu_action_pending_analytic_accounts" parent="hr_timesheet_invoice.next_id_59"/>
+        <menuitem action="action_pending_analytic_accounts" id="menu_action_pending_analytic_accounts" parent="account.account_analytic_def_chart"/>
          
         
         
@@ -206,4 +206,4 @@
         <menuitem action="action_hr_timesheet_invoice_factor_form" id="hr_timesheet_invoice_factor_view" parent="account.next_id_39"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 78b9fcf6cbf..4cf2fdc1807 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -88,7 +88,7 @@ class product_pricelist(osv.osv):
 	_name = "product.pricelist"
 	_description = "Pricelist"
 	_columns = {
-		'name': fields.char('Name',size=64, required=True),
+		'name': fields.char('Name',size=64, required=True, translate=True),
 		'active': fields.boolean('Active'),
 		'type': fields.selection(_pricelist_type_get, 'Pricelist Type', required=True),
 		'version_id': fields.one2many('product.pricelist.version', 'pricelist_id', 'Pricelist Versions'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3f77f702818..e7ee126ee28 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -399,8 +399,8 @@
             <field name="name">My Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id', '=', uid)]</field>
-            <field name="view_id" ref="view_task_form2"/>
         </record>
         <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_main"/>
         
@@ -411,7 +411,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id', '=', uid),('state','=','pending')]</field>
         </record>
-        <menuitem id="next_id_55" name="My Tasks" parent="project.menu_main"/><menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" parent="next_id_55"/>
+        <menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" parent="menu_action_view_task4"/>
         
         <record id="action_view_task5" model="ir.actions.act_window">
             <field name="name">My Open Tasks</field>
@@ -420,7 +420,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id', '=', uid),('state','=','open')]</field>
         </record>
-        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="project.next_id_55"/>
+        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="menu_action_view_task4"/>
         
         <record id="action_view_task5_prog" model="ir.actions.act_window">
             <field name="name">My Tasks in Progress</field>
@@ -429,8 +429,16 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id', '=', uid),('state','=','open')]</field>
         </record>
-        <menuitem action="action_view_task5_prog" id="menu_tasks_yours_prog" parent="project.next_id_55"/>
-        
+        <menuitem action="action_view_task5_prog" id="menu_tasks_yours_prog" parent="menu_action_view_task4"/>
+
+        <record id="action_view_task_new" model="ir.actions.act_window">
+            <field name="name">New Task</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+        <menuitem action="action_view_task_new" id="menu_action_view_task_new" parent="menu_action_view_task4"/>
+                
         <record id="action_view_task6" model="ir.actions.act_window">
             <field name="name">Open Tasks</field>
             <field name="res_model">project.task</field>
@@ -513,4 +521,4 @@
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index c218394d75f..207c2c338d7 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
+
         <record id="req_link_purchase_order" model="res.request.link">
             <field name="name">Purchase Order</field>
             <field name="object">purchase.order</field>
@@ -39,4 +40,4 @@
         <function eval="('default',False,'warehouse_id', [('purchase.order', False)], ref('stock.warehouse0'), True, False, False, False, True)" id="purchase_default_set" model="ir.values" name="set"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b335775da82..57bdae954ec 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
+        <record id="category_supplier" model="res.partner.category">
+            <field name="name">Suppliers</field>
+        </record>
         
         <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"/>
         
@@ -20,7 +23,7 @@
                             <newline/>
                             <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)"/>
                             <field name="date_order" select="2"/>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" domain="[('category_id','child_of', [%(category_supplier)d])]"/>
                             <field name="partner_address_id"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id"/>
                             <field name="partner_ref" select="2"/>