Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-10click-hr-expense-tpa into
lp:~openerp-dev/openobject-addons/trunk-10click-hr.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10click-hr-expense-tpa/+merge/131841
[IMP] hr_holidays: add onchange on employee_id field to change related
department to employee.
[IMP] hr_expense: improved view of form for total amount
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10click-hr-expense-tpa/+merge/131841
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-10click-hr.
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml 2012-10-25 15:10:13 +0000
+++ hr_expense/hr_expense_view.xml 2012-10-29 10:01:43 +0000
@@ -123,8 +123,8 @@
<separator string="Notes"/>
<field name="note" placeholder="Free Notes"/>
</div>
- <group class="oe_subtotal_footer">
- <field name="amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+ <group class="oe_subtotal_footer oe_right">
+ <field name="amount" widget="monetary" options="{'currency_field': 'currency_id'}" class="oe_subtotal_footer_separator"/>
</group>
</group>
</page>
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-10-29 09:04:23 +0000
+++ hr_holidays/hr_holidays.py 2012-10-29 10:01:43 +0000
@@ -182,6 +182,13 @@
}
return result
+ def onchange_employee(self, cr, uid, ids, employee_id):
+ result = {'value': {'department_id': False}}
+ if employee_id:
+ employee = self.pool.get('hr.employee').browse(cr, uid, employee_id)
+ result['value'] = {'department_id': employee.department_id.id}
+ return result
+
# TODO: can be improved using resource calendar method
def _get_number_of_days(self, date_from, date_to):
"""Returns a float equals to the timedelta between two dates given as string."""
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-10-29 08:34:14 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-10-29 10:01:43 +0000
@@ -115,7 +115,7 @@
</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="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
<field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
</group>
</group>
_______________________________________________
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
