diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-07-12 17:30:40 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-07-12 17:30:40 +0200 |
| commit | 413d44c9156f37b9e91c576ec1a0c2d59ec84fc3 (patch) | |
| tree | 6456851d5078385ba9610d8c0afa781e846765cd /addons/resource/resource_view.xml | |
| parent | 660060516de50396250f2eb69881c4ba09ba5918 (diff) | |
| parent | 6182f663c00489d90851e57130ab7c7386ffad13 (diff) | |
[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120712153040-tglxx3gc7gjlry72
Diffstat (limited to 'addons/resource/resource_view.xml')
| -rw-r--r-- | addons/resource/resource_view.xml | 69 |
1 files changed, 39 insertions, 30 deletions
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 6779592f82d..8a0823a8c15 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -120,11 +120,12 @@ <field name="model">resource.calendar.attendance</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Working Time"> + <tree string="Working Time" editable="top"> <field name="name"/> <field name="dayofweek"/> - <field name="hour_from" widget="float_time" /> - <field name="hour_to" widget="float_time" /> + <field name="hour_from" widget="float_time"/> + <field name="hour_to" widget="float_time"/> + <field name="date_from"/> </tree> </field> </record> @@ -138,9 +139,11 @@ <group> <field name="name"/> <field name="date_from"/> - <field name="dayofweek"/> - <field name="hour_from" widget="float_time"/> - <field name="hour_to" widget="float_time"/> + <label for="hour_from" string="Hours"/> + <div> + <field name="hour_from" widget="float_time" class="oe_inline"/> - + <field name="hour_to" widget="float_time" class="oe_inline"/> + </div> </group> </form> </field> @@ -181,16 +184,18 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Resource" version="7.0"> - <group col="4"> - <field name="name" colspan="4"/> - <field name="active"/> - <newline/> - <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/> - <field name="resource_type" /> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <newline/> - <field name="calendar_id" string="Working Period"/> - <field name="time_efficiency"/> + <group> + <group> + <field name="name"/> + <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> + <field name="active"/> + </group> + <group> + <field name="resource_type" /> + <field name="calendar_id"/> + <field name="time_efficiency"/> + </group> </group> </form> </field> @@ -206,7 +211,7 @@ <field name="user_id" /> <field name="company_id" groups="base.group_multi_company"/> <field name="resource_type" /> - <field name="calendar_id" string="Working Period"/> + <field name="calendar_id"/> <field name="time_efficiency"/> </tree> </field> @@ -227,25 +232,29 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Leave Detail" version="7.0"> - <sheet> + <group> + <group> + <field name="resource_id" on_change="onchange_resource(resource_id)"/> + <field name="name" string="Reason"/> + </group> + <group> + <field name="calendar_id"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> + </group> + </group> <group> <group> - <field name="resource_id" on_change="onchange_resource(resource_id)"/> - <field name="name" string="Reason"/> - </group> - <group> - <field name="date_from"/> - <field name="calendar_id" string="Working Period"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - </group> - <group> - <field name="date_to"/> + <label for="date_from" string="Duration"/> + <div> + <field name="date_from" class="oe_inline"/> - + <field name="date_to" class="oe_inline"/> + </div> </group> - </group> - </sheet> + </group> </form> </field> </record> + <record id="resource_calendar_leave_tree" model="ir.ui.view"> <field name="name">resource.calendar.leaves.tree</field> <field name="model">resource.calendar.leaves</field> |