[MERGE] : Merge with lp:openobject:addons

bzr revid: sbh@tinyerp.com-20100723054623-c4q67wo2go7zm1fn

diff --cc addons/account/account.py
Simple merge

diff --cc addons/account/wizard/account_general_ledger_report_view.xml
Simple merge

diff --cc addons/account/wizard/account_report_account_balance_view.xml
index 6448b30,0000000..de32712
mode 100644,000000..100644
--- 1/addons/account/wizard/account_report_account_balance_view.xml
--- /dev/null
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@@ -1,46 -1,0 +1,46 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<openerp>
 +    <data>
 +
 +
 +        <record id="account_report_balance_view" model="ir.ui.view">
 +            <field name="name">Account Balance</field>
 +            <field name="model">account.balance.report</field>
 +            <field name="type">form</field>
 +            <field name="inherit_id" ref="account_common_report_view" />
 +            <field name="arch" type="xml">
 +               <field name="fiscalyear_id" position="after">
 +                   <field name="display_account"/>
 +                   <newline/>
 +               </field>
 +            </field>
 +        </record>
 +      <record id="action_account_balance_menu" model="ir.actions.act_window">
 +            <field name="name">Account Balance</field>
 +            <field name="type">ir.actions.act_window</field>
 +            <field name="res_model">account.balance.report</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">form</field>
 +            <field name="view_id" ref="account_report_balance_view"/>
 +            <field name="target">new</field>
 +      </record>
 +        <menuitem
 +              icon="STOCK_PRINT"
 +              name="Account Balance"
-               parent="account.menu_generic_report"
++              parent="account.final_accounting_reports"
 +              action="action_account_balance_menu"
 +              id="menu_general_Balance_report"
 +             />
 +
 +              <record model="ir.values" id="action_account_balance_report_values1">
 +            <field name="model_id" ref="account.model_account_account" />
 +            <field name="object" eval="1" />
 +            <field name="name">Account Balance</field>
 +            <field name="key2">client_print_multi</field>
 +            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_menu'))" />
 +            <field name="key">action</field>
 +            <field name="model">account.account</field>
 +              </record>
 +
 +    </data>
 +</openerp>

diff --cc addons/account/wizard/account_report_central_journal_view.xml
index fbd4737,0000000..9920a5f
mode 100644,000000..100644
--- 1/addons/account/wizard/account_report_central_journal_view.xml
--- /dev/null
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@@ -1,37 -1,0 +1,37 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<openerp>
 +    <data>
 +
 +        <record id="view_account_central_journal" model="ir.ui.view">
 +            <field name="name">Account central Journal</field>
 +            <field name="model">account.central.journal</field>
 +            <field name="inherit_id" ref="account_common_report_view" />
 +            <field name="type">form</field>
 +            <field name="arch" type="xml">
 +               <field name="fiscalyear_id" position="after">
 +                              <field name="amount_currency"/>
 +                              <newline/>
 +                 <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
 +               </field>
 +            </field>
 +        </record>
 +
 +        <record id="action_account_central_journal" model="ir.actions.act_window">
 +            <field name="name">Account Central Journal</field>
 +            <field name="type">ir.actions.act_window</field>
 +            <field name="res_model">account.central.journal</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">form</field>
 +            <field name="target">new</field>
 +            <field name="view_id" ref="view_account_central_journal"/>
 +        </record>
 +
 +        <menuitem
 +            name="Central Journals"
-             parent="account.menu_generic_report"
++            parent="account.menu_journals_report"
 +            action="action_account_central_journal"
 +            id="menu_account_central_journal"
 +            icon="STOCK_PRINT"/>
 +
 +    </data>
 +</openerp>

diff --cc addons/account/wizard/account_report_general_journal_view.xml
index cfdc5d3,0000000..ac3ede2
mode 100644,000000..100644
--- 1/addons/account/wizard/account_report_general_journal_view.xml
--- /dev/null
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@@ -1,36 -1,0 +1,36 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<openerp>
 +    <data>
 +        <record id="account_report_general_journal_view" model="ir.ui.view">
 +            <field name="name">Account General Journal</field>
 +            <field name="model">account.general.journal</field>
 +            <field name="type">form</field>
 +            <field name="inherit_id" ref="account_common_report_view" />
 +            <field name="arch" type="xml">
 +               <field name="fiscalyear_id" position="after">
 +                      <field name="amount_currency"/>
 +                      <newline/>
 +                 <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
 +               </field>
 +            </field>
 +        </record>
 +
 +        <record id="action_account_general_journal" model="ir.actions.act_window">
 +            <field name="name">Account General Journal</field>
 +            <field name="type">ir.actions.act_window</field>
 +            <field name="res_model">account.general.journal</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">form</field>
 +            <field name="target">new</field>
 +            <field name="view_id" ref="account_report_general_journal_view"/>
 +        </record>
 +
 +        <menuitem
 +            name="General Journals"
-             parent="account.menu_generic_report"
++            parent="account.menu_journals_report"
 +            action="action_account_general_journal"
 +            id="menu_account_general_journal"
 +            icon="STOCK_PRINT"/>
 +
 +    </data>
 +</openerp>

diff --cc addons/account/wizard/account_report_general_ledger_view.xml
index 61c0c14,0000000..8f3d6fd
mode 100644,000000..100644
--- 1/addons/account/wizard/account_report_general_ledger_view.xml
--- /dev/null
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@@ -1,75 -1,0 +1,75 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<openerp>
 +    <data>
 +
 +<!--        <record id="account_report_general_ledger_view_journal_removal" model="ir.ui.view">
 +            <field name="name">General Ledger</field>
 +            <field name="model">account.report.general.ledger</field>
 +            <field name="type">form</field>
 +            <field name="inherit_id" ref="account_common_report_view" />
 +            <field name="arch" type="xml">
 +               <xpath expr="/form/group[@name='Journals']" position="replace">
 +               </xpath>
 +            </field>
 +        </record>
 +-->
 +
 +        <record id="account_report_general_ledger_view" model="ir.ui.view">
 +            <field name="name">General Ledger</field>
 +            <field name="model">account.report.general.ledger</field>
 +            <field name="type">form</field>
 +            <field name="inherit_id" ref="account_common_report_view" />
 +            <field name="arch" type="xml">
 +               <field name="fiscalyear_id" position="after">
 +                   <field name="display_account"/>
 +                   <field name="landscape"/>
 +                   <field name="initial_balance" attrs="{'readonly':[('fiscalyear_id','=', False)]}"/>
 +                   <field name="sortby"/>
 +                   <field name="amount_currency"/>
 +                   <newline/>
 +               </field>
 +            </field>
 +        </record>
 +
 +        <record id="account_report_general_ledger_view_inherit" model="ir.ui.view">
 +            <field name="name">General Ledger</field>
 +            <field name="model">account.report.general.ledger</field>
 +            <field name="type">form</field>
 +            <field name="inherit_id" ref="account_report_general_ledger_view" />
 +            <field name="arch" type="xml">
 +               <field name="fiscalyear_id" position="replace">
 +                              <field name="fiscalyear_id" on_change="onchange_fiscalyear(fiscalyear_id)"/>
 +               </field>
 +            </field>
 +        </record>
 +
 +      <record id="action_account_general_ledger_menu" model="ir.actions.act_window">  <!-- rename id -->
 +            <field name="name">General Ledger</field>
 +            <field name="type">ir.actions.act_window</field>
 +            <field name="res_model">account.report.general.ledger</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">form</field>
 +            <field name="view_id" ref="account_report_general_ledger_view"/>
 +            <field name="target">new</field>
 +      </record>
 +
 +              <record model="ir.values" id="action_account_general_ledger_values">
 +            <field name="model_id" ref="account.model_account_account" />
 +            <field name="object" eval="1" />
 +            <field name="name">General Ledger</field>
 +            <field name="key2">client_print_multi</field>
 +            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_general_ledger_menu'))" />
 +            <field name="key">action</field>
 +            <field name="model">account.account</field>
 +              </record>
 +
 +        <menuitem
 +              icon="STOCK_PRINT"
 +              name="General Ledger"
-               parent="account.menu_generic_report"
++              parent="account.final_accounting_reports"
 +              action="action_account_general_ledger_menu"
 +              id="menu_general_ledger"
 +             />
 +
 +    </data>
 +</openerp>

diff --cc addons/account/wizard/account_report_print_journal_view.xml
index 3ecabfc,0000000..22cc1ac
mode 100644,000000..100644
--- 1/addons/account/wizard/account_report_print_journal_view.xml
--- /dev/null
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@@ -1,37 -1,0 +1,37 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<openerp>
 +    <data>
 +
 +        <record id="account_report_print_journal" model="ir.ui.view">
 +            <field name="name">Account Print Journal</field>
 +            <field name="model">account.print.journal</field>
 +            <field name="type">form</field>
 +            <field name="inherit_id" ref="account_common_report_view" />
 +            <field name="arch" type="xml">
 +               <field name="fiscalyear_id" position="after">
 +                   <field name="sort_selection"/>
 +                   <field name="amount_currency"/>
 +                   <newline/>
 +               </field>
 +            </field>
 +        </record>
 +
 +        <record id="action_account_print_journal" model="ir.actions.act_window">
 +            <field name="name">Account Print Journal</field>
 +            <field name="type">ir.actions.act_window</field>
 +            <field name="res_model">account.print.journal</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">form</field>
 +            <field name="target">new</field>
 +            <field name="view_id" ref="account_report_print_journal"/>
 +        </record>
 +
 +        <menuitem
 +            name="Journals"
-             parent="account.menu_generic_report"
++            parent="account.menu_journals_report"
 +            action="action_account_print_journal"
 +            id="menu_account_print_journal"
 +            icon="STOCK_PRINT"/>
 +
 +      </data>
 +</openerp>