[Merge]

bzr revid: vir@tinyerp.com-20100726050249-tfvk8aywuekl5zlf

diff --cc addons/account/account_menuitem.xml
index 3ef61c1,58cc997..e6b144d
--- 1/addons/account/account_menuitem.xml
--- 2/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@@ -15,16 -15,16 +15,25 @@@
  <!--            <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"/>-->

diff --cc addons/stock/stock_view.xml
Simple merge