Anto has proposed merging lp:~openerp-dev/openobject-addons/trunk-10click-hr
into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10click-hr/+merge/132094
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10click-hr/+merge/132094
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-10click-hr.
=== modified file 'hr/__openerp__.py'
--- hr/__openerp__.py 2012-09-26 12:16:27 +0000
+++ hr/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -24,7 +24,7 @@
'version': '1.1',
'author': 'OpenERP SA',
'category': 'Human Resources',
- 'sequence': 12,
+ 'sequence': 21,
'website': 'http://www.openerp.com',
'summary': 'Jobs, Departments, Employees Details',
'description': """
=== modified file 'hr_evaluation/__openerp__.py'
--- hr_evaluation/__openerp__.py 2012-09-26 12:16:27 +0000
+++ hr_evaluation/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -24,6 +24,7 @@
'version': '0.1',
'author': 'OpenERP SA',
'category': 'Human Resources',
+ 'sequence': 31,
'website': 'http://www.openerp.com',
'summary': 'Periodical Evaluations, Appraisals, Surveys',
'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg'],
=== modified file 'hr_expense/__openerp__.py'
--- hr_expense/__openerp__.py 2012-10-03 09:50:03 +0000
+++ hr_expense/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -24,7 +24,7 @@
'name': 'Expense Management',
'version': '1.0',
'category': 'Human Resources',
- 'sequence': 30,
+ 'sequence': 29,
'summary': 'Expenses Validation, Invoicing',
'description': """
Manage expenses by Employees
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml 2012-10-29 09:08:47 +0000
+++ hr_expense/hr_expense_view.xml 2012-10-30 13:29:24 +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/__openerp__.py'
--- hr_holidays/__openerp__.py 2012-09-26 12:16:27 +0000
+++ hr_holidays/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -25,7 +25,7 @@
'version': '1.5',
'author': 'OpenERP SA',
'category': 'Human Resources',
- 'sequence': 28,
+ 'sequence': 27,
'summary': 'Holidays, Allocation and Leave Requests',
'website': 'http://www.openerp.com',
'description': """
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-10-12 11:42:58 +0000
+++ hr_holidays/hr_holidays.py 2012-10-30 13:29:24 +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."""
@@ -199,7 +206,14 @@
raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state))
return super(hr_holidays, self).unlink(cr, uid, ids, context)
- def onchange_date_from(self, cr, uid, ids, date_to, date_from):
+ def onchange_date_from(self, cr, uid, ids, date_from):
+ DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+ date_to = False
+ if date_from:
+ date_to = datetime.datetime.strptime(date_from, DATETIME_FORMAT) + datetime.timedelta(hours=8)
+ return {'value':{'date_to': str(date_to)}}
+
+ def onchange_date_to(self, cr, uid, ids, date_to, date_from):
result = {}
if date_to and date_from:
diff_day = self._get_number_of_days(date_from, date_to)
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-10-26 09:58:21 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-10-30 13:29:24 +0000
@@ -104,8 +104,8 @@
<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"/>
+ <field name="date_from" nolabel="1" on_change="onchange_date_from(date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline" />
+ <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>
</group>
<div>
<field name="number_of_days_temp" class="oe_inline"/> days
@@ -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>
=== modified file 'hr_recruitment/__openerp__.py'
--- hr_recruitment/__openerp__.py 2012-09-26 12:16:27 +0000
+++ hr_recruitment/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -24,7 +24,7 @@
'name': 'Recruitment Process',
'version': '1.0',
'category': 'Human Resources',
- 'sequence': 24,
+ 'sequence': 25,
'summary': 'Jobs, Recruitment, Applications, Job Interviews',
'description': """
Manage job positions and the recruitment process
=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py 2012-10-15 09:02:00 +0000
+++ hr_recruitment/hr_recruitment.py 2012-10-30 13:29:24 +0000
@@ -259,6 +259,17 @@
stage_id = stage_ids and stage_ids[0] or False
return {'value': {'stage_id': stage_id}}
+ def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
+ data = {'partner_phone': False,
+ 'partner_mobile': False,
+ 'email_from': False}
+ if partner_id:
+ addr = self.pool.get('res.partner').browse(cr, uid, partner_id, context)
+ data.update({'partner_phone': addr.phone,
+ 'partner_mobile': addr.mobile,
+ 'email_from': addr.email})
+ return {'value': data}
+
def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
""" Override of the base.stage method
Parameter of the stage search taken from the lead:
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml 2012-10-29 09:08:47 +0000
+++ hr_recruitment/hr_recruitment_view.xml 2012-10-30 13:29:24 +0000
@@ -135,7 +135,7 @@
<group>
<group>
<field name="partner_id"
- on_change="onchange_partner_id(partner_id, email_from)"/>
+ on_change="onchange_partner_id(partner_id)"/>
<field name="email_from" widget="email"/>
<field name="partner_phone"/>
<field name="partner_mobile"/>
=== modified file 'hr_timesheet/__openerp__.py'
--- hr_timesheet/__openerp__.py 2012-09-26 12:16:27 +0000
+++ hr_timesheet/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -24,6 +24,7 @@
'name': 'Timesheets',
'version': '1.0',
'category': 'Human Resources',
+ 'sequence': 23,
'description': """
This module implements a timesheet system.
==========================================
=== modified file 'hr_timesheet_sheet/__openerp__.py'
--- hr_timesheet_sheet/__openerp__.py 2012-10-01 08:36:15 +0000
+++ hr_timesheet_sheet/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -24,7 +24,7 @@
'name': 'Timesheets',
'version': '1.0',
'category': 'Human Resources',
- 'sequence': 16,
+ 'sequence': 24,
'summary': 'Timesheets, Attendances, Activities',
'description': """
Record and validate timesheets and attendances easily
=== modified file 'project_gtd/__openerp__.py'
--- project_gtd/__openerp__.py 2012-09-26 12:16:27 +0000
+++ project_gtd/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -24,7 +24,7 @@
'name': 'Todo Lists',
'version': '1.0',
'category': 'Project Management',
- 'sequence': 20,
+ 'sequence': 9,
'summary': 'Personal Tasks, Contexts, Timeboxes',
'description': """
Implement concepts of the "Getting Things Done" methodology
=== modified file 'project_issue/__openerp__.py'
--- project_issue/__openerp__.py 2012-09-26 12:16:27 +0000
+++ project_issue/__openerp__.py 2012-10-30 13:29:24 +0000
@@ -24,7 +24,7 @@
'name': 'Issue Tracker',
'version': '1.0',
'category': 'Project Management',
- 'sequence': 22,
+ 'sequence': 9,
'summary': 'Support, Bug Tracker, Helpdesk',
'description': """
Track Issues/Bugs Management for Projects
_______________________________________________
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
