diff options
| author | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
|---|---|---|
| committer | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
| commit | be2e95656aaa113addea2b510fcdcf2f890eaaa4 (patch) | |
| tree | abcb3dd4ef350a1b8ad0eaffdd2b9a1cb91521af /addons/resource | |
| parent | b982ea278b33132def3927417b7a854b98b5028a (diff) | |
| parent | 3925f76ce85854e5d4834902a05f57bcfc5ace85 (diff) | |
[MERGE]merged with trunk-survey-layout-tta
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
Diffstat (limited to 'addons/resource')
| -rw-r--r-- | addons/resource/resource_demo.xml | 54 | ||||
| -rw-r--r-- | addons/resource/resource_view.xml | 4 |
2 files changed, 29 insertions, 29 deletions
diff --git a/addons/resource/resource_demo.xml b/addons/resource/resource_demo.xml index acd96cd992b..d00548dc0c9 100644 --- a/addons/resource/resource_demo.xml +++ b/addons/resource/resource_demo.xml @@ -80,45 +80,45 @@ </record> <record id="resource_analyst" model="resource.resource"> - <field eval="1.0" name="time_efficiency"/> - <field name="user_id" ref="base.user_root"/> - <field name="name">Analyst</field> - <field eval="1" name="active"/> - <field name="calendar_id" ref="timesheet_group1"/> - <field name="resource_type">user</field> + <field eval="1.0" name="time_efficiency"/> + <field name="user_id" ref="base.user_root"/> + <field name="name">Analyst</field> + <field eval="1" name="active"/> + <field name="calendar_id" ref="timesheet_group1"/> + <field name="resource_type">user</field> </record> <record id="resource_designer" model="resource.resource"> - <field eval="1.0" name="time_efficiency"/> - <field name="user_id" ref="base.user_demo"/> - <field name="name">Designer</field> - <field eval="1" name="active"/> - <field name="calendar_id" ref="timesheet_group1"/> - <field name="resource_type">user</field> + <field eval="1.0" name="time_efficiency"/> + <field name="user_id" ref="base.user_demo"/> + <field name="name">Designer</field> + <field eval="1" name="active"/> + <field name="calendar_id" ref="timesheet_group1"/> + <field name="resource_type">user</field> </record> <record id="resource_developer" model="resource.resource"> - <field eval="1.0" name="time_efficiency"/> - <field name="user_id" ref="base.user_demo"/> - <field name="name">Developer</field> - <field eval="1" name="active"/> - <field name="calendar_id" ref="timesheet_group1"/> - <field name="resource_type">user</field> + <field eval="1.0" name="time_efficiency"/> + <field name="user_id" ref="base.user_demo"/> + <field name="name">Developer</field> + <field eval="1" name="active"/> + <field name="calendar_id" ref="timesheet_group1"/> + <field name="resource_type">user</field> </record> <record id="resource_analyst_leaves_demoleave1" model="resource.calendar.leaves"> - <field name="name">2 Hours On Leave</field> - <field name="resource_id" ref="resource_analyst"/> - <field name="date_from" eval="time.strftime('%Y-%m-%d 08:00:00')"/> - <field name="date_to" eval="time.strftime('%Y-%m-%d 11:00:00')"/> - <field name="calendar_id" ref="timesheet_group1"/> + <field name="name">2 Hours On Leave</field> + <field name="resource_id" ref="resource_analyst"/> + <field name="date_from" eval="time.strftime('%Y-%m-%d 08:00:00')"/> + <field name="date_to" eval="time.strftime('%Y-%m-%d 11:00:00')"/> + <field name="calendar_id" ref="timesheet_group1"/> </record> <record id="resource_dummyleave" model="resource.calendar.leaves"> - <field name="name">Dummy Resource Leave</field> - <field name="resource_id" ref="resource_analyst"/> - <field name="date_from" eval="time.strftime('%Y-%m-%d 08:00:00')"/> - <field name="date_to" eval="time.strftime('%Y-%m-%d 11:00:00')"/> + <field name="name">Dummy Resource Leave</field> + <field name="resource_id" ref="resource_analyst"/> + <field name="date_from" eval="time.strftime('%Y-%m-%d 08:00:00')"/> + <field name="date_to" eval="time.strftime('%Y-%m-%d 11:00:00')"/> </record> </data> diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 20c1251c771..ebcd9c8a25a 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -80,7 +80,7 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Working Time" version="7.0"> - <sheet> + <sheet> <group col="4"> <field name="name"/> <field name="manager"/> @@ -225,7 +225,7 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Leave Detail" version="7.0"> - <sheet> + <sheet> <group> <group> <field name="resource_id" on_change="onchange_resource(resource_id)"/> |