psi (Open ERP) 0be7eecb8f [MERGE] merge with mtr's branch ...

bzr revid: psi@tinyerp.co.in-20110314050010-pkqhcumi84fhmfdd

2011-03-14 10:30:10 +05:30

..

i18n

Launchpad automatic translations update.

2011-03-09 04:40:26 +00:00

security

[IMP] hr_contract:added access rights for hr.passport object

2011-03-09 11:52:31 +05:30

test

[MERGE] merged the dev3 branch

2011-01-14 01:11:01 +01:00

__init__.py

merged with trunk

2010-12-30 15:28:09 +05:30

__openerp__.py

[IMP] changes as per hr_payroll_new file given by QDP sir: move hr_passport obj to hr module, move some fields of hr.contract from hr_paroll to hr_contract, remove working_days_per_week field for contart and get it from resource calender

2011-03-03 18:19:03 +05:30

hr_contract_data.xml

[IMP] hr_payroll,hr_contract:commented 'hr.contract.wage.type' and improved strings of menuitem in payroll.

2011-03-07 16:58:17 +05:30

hr_contract_view.xml

[MERGE] branch merged with trunk-payroll-salary_rules-psi

2011-03-11 15:42:20 +05:30

hr_contract.py

[IMP] improve _caluculate method on hr.payslip object so it will consider all line_ids of hr.payslip

2011-03-11 17:53:26 +05:30