From 3be71833c98a7bd419bdf6027b3053439b976276 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Wed, 3 Sep 2008 18:18:53 +0200
Subject: [PATCH] *modified menu structure

bzr revid: qdp@tinyerp.com-20080903161853-7b2a38g8oq72kzcy
---
 addons/account/__terp__.py                |  1 +
 addons/account/account_menuitem.xml       | 19 ++++++++++++
 addons/account/account_view.xml           | 38 +++++++++++++----------
 addons/account/account_wizard.xml         | 10 ++----
 addons/account/project/project_view.xml   |  2 +-
 addons/account_followup/followup_view.xml |  4 +--
 6 files changed, 46 insertions(+), 28 deletions(-)
 create mode 100644 addons/account/account_menuitem.xml

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 51175f1268b..9dd5f3ff098 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -50,6 +50,7 @@
         "account_unit_test.xml",
     ],
     "update_xml" : [
+        "account_menuitem.xml",
         "account_wizard.xml",
         "account_view.xml",
         "account_end_fy.xml",
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
new file mode 100644
index 00000000000..168d4f140f1
--- /dev/null
+++ b/addons/account/account_menuitem.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terp>
+    <data>
+
+        <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
+        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
+        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
+
+        <menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries"/>
+
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
+    </data>
+</terp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index eeb05967a4c..a3a0e92f9a5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -6,9 +6,6 @@
      Fiscal Year
     -->
 
-        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
-		<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-		<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
         <record id="view_account_fiscalyear_form" model="ir.ui.view">
             <field name="name">account.fiscalyear.form</field>
             <field name="model">account.fiscalyear</field>
@@ -275,8 +272,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_25" name="Financial Journals" parent="account.menu_finance_accounting"/>
-        <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="next_id_25"/>
+        <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="menu_finance_accounting"/>
 
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
@@ -1132,7 +1128,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_32" name="Models" parent="account.menu_finance_accounting"/><menuitem action="action_model_form" id="menu_action_model_form" parent="next_id_32"/>
+        <menuitem action="action_model_form" id="menu_action_model_form" parent="menu_finance_configuration"/>
 
 
         <!--
@@ -1194,7 +1190,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_33" name="Payment Terms" parent="account.menu_finance_accounting"/><menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="next_id_33"/>
+        <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_finance_configuration"/>
 
         <!--
     # Account Subscriptions
@@ -1274,7 +1270,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_entries"/>
+        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
@@ -1515,8 +1511,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="account_account_template_menu" name="Templates of Accounts" parent="account.menu_finance_accounting"/>
-        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_account_template_menu"/>
+
+        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_account_menu"/>
 
         <!-- Chart of Accounts Templates -->
 
@@ -1559,7 +1555,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_account_template_menu"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_account_menu"/>
 
         <!-- Account Tax Templates -->
 
@@ -1587,7 +1583,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Account Tax Template">
-                	<field name="name" />
+                    <field name="name" />
                     <field name="description"/>
                 </tree>
             </field>
@@ -1599,7 +1595,15 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_account_template_menu"/>
+        <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="next_id_27"/>
+
+        <record id="action_account_tax_code_template_form" model="ir.actions.act_window">
+            <field name="name">Account Tax Code Templates</field>
+            <field name="res_model">account.tax.code.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="next_id_27"/>
 
 
 
@@ -1632,7 +1636,7 @@
 		</record>
 
 		<record id="action_wizard_multi_chart" model="ir.actions.act_window">
-			<field name="name">Create Multiple Charts of Accounts</field>
+			<field name="name">Generate Chart of Accounts from a Chart Template</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">wizard.multi.charts.accounts</field>
 			<field name="view_type">form</field>
@@ -1640,11 +1644,11 @@
 			<field name="target">new</field>
 		</record>
 
-		<menuitem parent="account.menu_finance_configuration" action="action_wizard_multi_chart" id="menu_wizard"/>
+		<menuitem parent="account.account_account_menu" action="action_wizard_multi_chart" id="menu_wizard"/>
 
 
         <!-- wizard account duplicate chart -->
-        <record id="view_wizard_account_duplicate_chart" model="ir.ui.view">
+<!--        <record id="view_wizard_account_duplicate_chart" model="ir.ui.view">
             <field name="name">wizard.account.chart.duplicate.form</field>
             <field name="model">wizard.account.chart.duplicate</field>
             <field name="type">form</field>
@@ -1670,6 +1674,6 @@
             <field name="target">new</field>
         </record>
         <menuitem action="action_wizard_account_duplicate_chart_form" id="menu_action_wizard_account_duplicate_chart_form" parent="account_account_menu"/>
-
+-->
     </data>
 </terp>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 8573a7082b0..be734a1ba95 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
-        <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
-        <menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"/>
 
         <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Refund invoice"/>
 
@@ -74,8 +68,8 @@
         <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Account Moves"/>
 
 		<!-- Use Models -->
-        <wizard string="Use Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>
-        <menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_periodical_processing" id="menu_account_use_model"/>
+        <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>
+        <menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
 
 		<!-- account.invoice -->
 	    <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 868ac9dab0b..02476766045 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -230,7 +230,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="account.next_id_25"/>
+        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="account.menu_analytic_accounting"/>
 
         #
         # Open journal entries
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index de7b8afb9d6..3d3cb73b720 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -38,7 +38,7 @@
             <field name="res_model">account_followup.followup</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.next_id_33"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration"/>
         
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/rappel.rml" string="Followup Report"/>
         
@@ -109,4 +109,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>