diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2012-08-14 14:11:17 +0200 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2012-08-14 14:11:17 +0200 |
| commit | 2376fe0add0409f5ff17218658d939de0e61ecff (patch) | |
| tree | e0ef920bd68740fd13fee9d369c459e82630c42b /addons/analytic_user_function | |
| parent | 9341a6f7912c428df70c4059e8237551b57129b4 (diff) | |
| parent | 9822629548894e746a362a5df3c4751c1a8e9a29 (diff) | |
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function_view.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 9c6e89d1bda..6fa141f480d 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -6,7 +6,6 @@ <record model="ir.ui.view" id="analytic_user_funct_grid_tree"> <field name="name">analytic_user_funct_grid.tree</field> <field name="model">analytic.user.funct.grid</field> - <field name="type">tree</field> <field name="arch" type="xml"> <tree string="User's Product for this Analytic Account" editable="bottom"> <field name="user_id" required="1"/> @@ -18,7 +17,6 @@ <record model="ir.ui.view" id="analytic_user_funct_grid_form"> <field name="name">analytic_user_funct_grid.form</field> <field name="model">analytic.user.funct.grid</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="User's Product for this Analytic Account"> <field name="user_id" required="1"/> @@ -31,7 +29,6 @@ <record model="ir.ui.view" id="view_account_analytic_account_form_inherit"> <field name="name">account.analytic.account.form</field> <field name="model">account.analytic.account</field> - <field name="type">form</field> <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> <field name="arch" type="xml"> <xpath expr="//notebook/page" position="after"> @@ -46,7 +43,6 @@ <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit"> <field name="name">hr.timesheet.sheet.form.tree</field> <field name="model">hr_timesheet_sheet.sheet</field> - <field name="type">form</field> <field name="priority" eval="18"/> <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/> <field name="arch" type="xml"> @@ -60,7 +56,6 @@ <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit1"> <field name="name">hr.timesheet.sheet.form.form</field> <field name="model">hr_timesheet_sheet.sheet</field> - <field name="type">form</field> <field name="priority" eval="19"/> <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/> <field name="arch" type="xml"> @@ -74,7 +69,6 @@ <record model="ir.ui.view" id="hr_timesheet_line_form_inherit"> <field name="name">hr.analytic.timesheet.form</field> <field name="model">hr.analytic.timesheet</field> - <field name="type">form</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="arch" type="xml"> <xpath expr="//field[@name='account_id']" position="replace"> @@ -86,7 +80,6 @@ <record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2"> <field name="name">hr.analytic.timesheet.form</field> <field name="model">hr.analytic.timesheet</field> - <field name="type">form</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="arch" type="xml"> <xpath expr="//field[@name='user_id']" position="replace"> @@ -98,7 +91,6 @@ <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit"> <field name="name">hr.analytic.timesheet.tree</field> <field name="model">hr.analytic.timesheet</field> - <field name="type">tree</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/> <field name="arch" type="xml"> <xpath expr="/tree/field[@name='account_id']" position="replace"> @@ -110,7 +102,6 @@ <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2"> <field name="name">hr.analytic.timesheet.tree</field> <field name="model">hr.analytic.timesheet</field> - <field name="type">tree</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/> <field name="arch" type="xml"> <xpath expr="/tree/field[@name='user_id']" position="replace"> |