diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-11-28 11:09:37 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-11-28 11:09:37 +0530 |
| commit | 6933af637c24779c7c649b2bb7514f64991a23b7 (patch) | |
| tree | 78d8dfba42c2a283ce8c21b6505ec2063596c1b4 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | a0f9382704ff0614aee95bbab0c17803af297de3 (diff) | |
| parent | 847bddb3e5b0dda0d7496fccba50c5386eb6072b (diff) | |
[MERGE]: Merge with latest trunk-addons + Resolved conflicts
bzr revid: rpa@tinyerp.com-20111128053937-88tibpqgnf9y6kq0
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function_view.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 1863dd42fb5..763b3115814 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -5,7 +5,7 @@ <!-- analytic_user_funct_grid views --> <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="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"> @@ -17,7 +17,7 @@ <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="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"> @@ -55,7 +55,7 @@ </xpath> </field> </record> - + <!-- hr_timesheet_sheet.sheet inherited view --> <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit1"> <field name="name">hr.timesheet.sheet.form.form</field> |