[Merge]

[odoo/odoo.git] / addons / account / account_menuitem.xml

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 3ef61c1..e6b144d 100644 (file)
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -8,23 +8,32 @@
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
-            <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
-            <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
-            <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
         <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
-            <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
-            <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
-            <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
+<<<<<<< TREE
             <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" groups="base.group_system"/>
             <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="base.group_system"/>
                 <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
                 <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
             <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration" groups="base.group_system"/>
                 <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" 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_analytic" parent="menu_analytic_accounting" name="Accounts"/>
+        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
+        <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
+        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
+>>>>>>> MERGE-SOURCE
 <!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
 <!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
 <!--        <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
@@ -35,7 +44,7 @@
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
-            groups="group_account_user"/>
+        groups="group_account_user"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
@@ -43,17 +52,17 @@
 <!--            groups="group_account_user"/>-->
         <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
 
-       <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
+        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
 
-       <menuitem 
-            parent="account.menu_finance_legal_statement" 
-            id="final_accounting_reports"
-            name="Accounting Reports"/>
+        <menuitem 
+        parent="account.menu_finance_legal_statement" 
+        id="final_accounting_reports"
+        name="Accounting Reports"/>
 
-       <menuitem 
-            parent="account.menu_finance_legal_statement" 
-            id="menu_journals_report"
-            name="Journals"/>
+        <menuitem 
+        parent="account.menu_finance_legal_statement" 
+        id="menu_journals_report"
+        name="Journals"/>
 
     </data>
 </openerp>