Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-leave-req-imp-dbr-leave-req-pna
into lp:~openerp-dev/openobject-addons/trunk-leave-req-imp-dbr.
Requested reviews:
Devishree Brahmbhatt (OpenERP) (dbr-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-leave-req-imp-dbr-leave-req-pna/+merge/113909
Hello,
I improved the hr_holidays form view.
Thanks,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-leave-req-imp-dbr-leave-req-pna/+merge/113909
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-leave-req-imp-dbr.
=== modified file 'hr_holidays/hr_holidays_demo.xml'
--- hr_holidays/hr_holidays_demo.xml 2011-12-22 13:35:59 +0000
+++ hr_holidays/hr_holidays_demo.xml 2012-07-09 06:20:27 +0000
@@ -12,7 +12,7 @@
<record model="hr.holidays" id="hr_holidays_employee1_cl">
<field name="name">Trip with Family</field>
- <field name="holiday_status_id" ref="holiday_status_cl"/>
+ <field name="holiday_status_id" ref="holiday_status_sl"/>
<field eval="time.strftime('%Y-%m-01')" name="date_from"/>
<field eval="time.strftime('%Y-%m-03')" name="date_to"/>
<field name="type">remove</field>
@@ -52,13 +52,10 @@
<field name="employee_id" ref="hr.employee_fp"/>
</record>
- <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
<workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
- <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
<workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
- <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
<workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
</data>
</openerp>
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-07-09 05:48:43 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-07-09 06:20:27 +0000
@@ -102,7 +102,6 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
- <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
<button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
<button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
@@ -112,6 +111,7 @@
<sheet string="Leave Request">
<group>
<group>
+<<<<<<< TREE
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
<label for="number_of_days_temp" string="Duration"/>
<group col="3">
@@ -141,6 +141,39 @@
</group>
<newline/>
<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+=======
+ <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+ <label for="number_of_days_temp" string="Duration"/>
+ <div>
+ <group col="3">
+ <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline" />
+ <field name="date_to" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+ </group>
+ <div>
+ <field name="number_of_days_temp" class="oe_inline"/> days
+ </div>
+ </div>
+ <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
+ </group>
+ <group>
+ <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
+ <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+ <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+ </group>
+ </group>
+ <group colspan="4">
+ <group>
+ <group>
+ <field name="double_validation" invisible="1"/>
+ </group>
+ <group>
+ <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
+ </group>
+ </group>
+ <newline/>
+ <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
+ </group>
+>>>>>>> MERGE-SOURCE
</sheet>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
=== modified file 'hr_holidays/hr_holidays_workflow.xml'
--- hr_holidays/hr_holidays_workflow.xml 2011-11-03 15:12:46 +0000
+++ hr_holidays/hr_holidays_workflow.xml 2012-07-09 06:20:27 +0000
@@ -53,7 +53,7 @@
<record model="workflow.transition" id="t1">
<field name="act_from" ref="act_draft" />
<field name="act_to" ref="act_confirm" />
- <field name="signal">confirm</field>
+ <field name="signal"></field>
</record>
<record model="workflow.transition" id="t2">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
