diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-06-08 16:57:08 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-06-08 16:57:08 +0530 |
| commit | d6d97193deffa97fdba41eccf3cb3f07e3b441d7 (patch) | |
| tree | 8a8c8a002f4945b5225ebbf13c077269e67b3ac6 | |
| parent | 4b3ffbbed467cff577d863c4bb7d555368398f1d (diff) | |
[IMP]change view in account_installer as change in server and remove errors about hr_payroll_account
bzr revid: sgo@tinyerp.com-20120608112708-5d2xfeu38d92ely6
| -rw-r--r-- | addons/account/account_installer.xml | 19 | ||||
| -rw-r--r-- | addons/hr_payroll_account/hr_payroll_account_view.xml | 2 |
2 files changed, 7 insertions, 14 deletions
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 2d05797b48d..c12fe321edf 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -10,21 +10,10 @@ <form position="attributes"> <attribute name="string">Accounting Application Configuration</attribute> </form> - <separator string="title" position="attributes"> - <attribute name="string">Configure Your Chart of Accounts</attribute> - </separator> - - <xpath expr="//label[@string='description']" position="attributes"> - <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute> - </xpath> <xpath expr="//button[@string='Install Modules']" position="attributes"> <attribute name="string">Configure</attribute> </xpath> - <xpath expr="//separator[@string="vsep"]" position="attributes"> - <attribute name="rowspan">23</attribute> - <attribute name="string"/> - </xpath> - <group colspan="8" position="inside"> + <xpath expr="//separator[@string='title']" position="after"> <group colspan="4" width="600"> <field name="charts"/> <group colspan="4" groups="account.group_account_user"> @@ -36,7 +25,11 @@ <field name="period" colspan="4"/> </group> </group> - </group> + </xpath> + <separator string="title" position="attributes"> + <attribute name="string">Configure Your Chart of Accounts</attribute> + <label string="The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default."/> + </separator> </data> </field> </record> diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml index 667b1308ec5..acc48224afa 100644 --- a/addons/hr_payroll_account/hr_payroll_account_view.xml +++ b/addons/hr_payroll_account/hr_payroll_account_view.xml @@ -44,7 +44,7 @@ <field name="type">form</field> <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page/group/field[@name='advantages']" position="after"> + <xpath expr="//field[@name='advantages']" position="after"> <separator colspan="4" string="Accounting"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="journal_id"/> |