diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2009-04-06 17:56:20 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2009-04-06 17:56:20 +0200 |
| commit | bec967906b1530105ec61e42406800b0db3c5cba (patch) | |
| tree | de8ea0254a8a9167ac978e07321d1c400eff5709 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | e5e85e31eb7cd67f604deda34582dcc792f20101 (diff) | |
| parent | ac73fbf3cbcbf2d50d76e62626c0b88597ca6e14 (diff) | |
moerge
bzr revid: fp@tinyerp.com-20090406155620-491lndaxgxry1w1c
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function_view.xml | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 1f7f0c07b10..0bb4c89c973 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -44,14 +44,28 @@ <!-- hr_timesheet_sheet.sheet inherited view --> <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit"> - <field name="name">hr.timesheet.sheet.form</field> + <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"> <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace"> - <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)"/> + <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/> + </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> + <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"> + <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace"> + <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/> </xpath> </field> </record> @@ -64,7 +78,7 @@ <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="arch" type="xml"> <xpath expr="/form/field[@name='account_id']" position="replace"> - <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/> + <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/> </xpath> </field> </record> @@ -88,7 +102,7 @@ <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"> - <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/> + <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/> </xpath> </field> </record> |