Commit Graph

127 Commits

Author SHA1 Message Date
Quentin (OpenERP) f7323eb1af [IMP] hr: replaced marital.status object by a fields.selection to ease to use in payroll module
bzr revid: qdp-launchpad@openerp.com-20110408163116-3qmhc4phurtpuzmf
2011-04-08 18:31:16 +02:00
mtr 62ff4c00d6 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110314063207-x6zetvo3b1if7nov
2011-03-14 12:02:07 +05:30
Quentin (OpenERP) bc12c091d8 [MERGE] merged the dev branch containing the HR improvements
bzr revid: qdp-launchpad@openerp.com-20110311172952-jqlv6z6kf9x64fr8
2011-03-11 18:29:52 +01:00
Quentin (OpenERP) 4cacb67193 [MERGE] lp:731332
bzr revid: qdp-launchpad@openerp.com-20110311154909-jzqf7l3f4qsezsja
2011-03-11 16:49:09 +01:00
Quentin (OpenERP) 03c8e8b36a [IMP] hr: improved recruitement
bzr revid: qdp-launchpad@openerp.com-20110311134136-jal186xbwpjf4hba
2011-03-11 14:41:36 +01:00
aag (OpenERP) 7cb99c6031 [IMP] hr,hr_timesheet:add one func _no_of_expected_employees ans change string analytic account
bzr revid: aag@tinyerp.co.in-20110311122345-g1ufdl0i4ogzwbe2
2011-03-11 17:53:45 +05:30
Rucha (Open ERP) 9bc35e9192 [IMP]: hr: Added on change department in employee form to set manager
bzr revid: rpa@tinyerp.com-20110311105449-0h02fpefhrk6kqhu
2011-03-11 16:24:49 +05:30
Rucha (Open ERP) d64d4b0d83 [MERGE]: Merge with trunk addons
bzr revid: rpa@tinyerp.com-20110311084452-hlkwjehf0tzkbdoh
2011-03-11 14:14:52 +05:30
Rucha (Open ERP) 4b4671f5e0 [IMP]: hr: All users must have "Employees" in their shortcuts
bzr revid: rpa@tinyerp.com-20110310131827-xbm0r2edcivfhr61
2011-03-10 18:48:27 +05:30
Rucha (Open ERP) 526210fc8d [IMP]: hr: Manager should not be a related to department anymore. Converted to many2one field
bzr revid: rpa@tinyerp.com-20110310131057-jrh5wegf3mclyk18
2011-03-10 18:40:57 +05:30
Rucha (Open ERP) d6f5541202 [IMP]: hr, hr_holidays: Minor improvements
bzr revid: rpa@tinyerp.com-20110310130454-495pmz0tnkp6w0tr
2011-03-10 18:34:54 +05:30
Quentin (OpenERP) 506b968b02 [MERGE] lp:718741
bzr revid: qdp-launchpad@openerp.com-20110310124914-ueig5xmxmwkq4r8m
2011-03-10 13:49:14 +01:00
ARA (OpenERP) abe22805a9 [FIX] hr: [6.0.1] HR-category: many2many link defined incorrectly
lp bug: https://launchpad.net/bugs/731332 fixed

bzr revid: ara@tinyerp.com-20110310060726-ol6ie4jrouzviinj
2011-03-10 11:37:26 +05:30
Mustufa Rangwala d39237d474 [IMP/FIX] hr_payroll: Improvement and cleaning
bzr revid: mra@mra-laptop-20110308063637-zfv8hawzqkdvsk8d
2011-03-08 12:06:37 +05:30
psi (Open ERP) f241d2e3dc [MERGE] merge with trunk-payroll branch
bzr revid: psi@tinyerp.co.in-20110304052550-jvxn2c9en9jmu1lo
2011-03-04 10:55:50 +05:30
psi (Open ERP) 016fbccf00 [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
bzr revid: psi@tinyerp.co.in-20110303124903-nopz0swoebyqtsqq
2011-03-03 18:19:03 +05:30
ARA (OpenERP) 36710d30c8 [FIX] hr_payroll_account: Payslip approval crashes without notification if Property accounts are not configured
bzr revid: ara@tinyerp.com-20110302104441-ka6xesr5qiyjmzpd
2011-03-02 16:14:41 +05:30
ARA (OpenERP) efaeed6332 [FIX]Human Resources : employee form view : Mobile field
lp bug: https://launchpad.net/bugs/719915 fixed

bzr revid: ara@tinyerp.com-20110216112343-41ufqgkdkwv2f7jt
2011-02-16 16:53:43 +05:30
ksa (Open ERP) 4fc5537bd8 [IMP]: hr related changes
bzr revid: ksa@tinyerp.co.in-20110216084531-xr94jx9116ns3qyh
2011-02-16 14:15:31 +05:30
Mustufa Rangwala b18aa2ecef [FIX] hr: try to create an employee as employee -> bug
lp bug: https://launchpad.net/bugs/713177 fixed

bzr revid: mra@mra-laptop-20110208051951-usjzx6dih5ap9o45
2011-02-08 10:49:51 +05:30
Francois Degrave e494a992dd [IMP ]added shortcuts to demo user, modified visibility of elements in employee views
bzr revid: fde@openerp.com-20101230170800-drbr5ie19trv0nxj
2010-12-30 18:08:00 +01:00
psi (Open ERP) 21199236df [FIX] hr:add an employee to a department
lp bug: https://launchpad.net/bugs/691218 fixed

bzr revid: psi@tinyerp.co.in-20101221100028-vpkskil3ur6ccjij
2010-12-21 15:30:28 +05:30
Mustufa Rangwala b0f61a9546 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
2010-12-17 10:07:32 +05:30
Olivier Dony 87495c5972 [FIX+I18N] hr: marital status should be translatable
lp bug: https://launchpad.net/bugs/685203 fixed

bzr revid: odo@openerp.com-20101215172455-411ka2can99pmpt5
2010-12-15 18:24:55 +01:00
Mustufa Rangwala 6428d964a9 [FIX] Hr: hr, passport field, bad widget
lp bug: https://launchpad.net/bugs/687310 fixed

bzr revid: mra@mra-laptop-20101213082134-1qjew9qqz2wqmrs8
2010-12-13 13:51:34 +05:30
Mustufa Rangwala c3aaa57d4f [FIX] HR: can't change email address of only on employee
lp bug: https://launchpad.net/bugs/680473 fixed

bzr revid: mra@mra-laptop-20101207092123-onw0418p01bm0tqy
2010-12-07 14:51:23 +05:30
uco (OpenERP) b1cf433ecc [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
2010-12-06 18:41:02 +05:30
Xavier Morel 0e41d853ed [ADD] hr: web_icon for human resources application
bzr revid: xmo@openerp.com-20101126114342-74fivsmdkw8mvihj
2010-11-26 12:43:42 +01:00
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
Mustufa Rangwala 62fba6d0bb [REF] HR: Removed warnings from buildbot (import statetement unused)
bzr revid: mra@mra-laptop-20101029060706-r1fmgelwv9dwrpt9
2010-10-29 11:37:06 +05:30
Mustufa Rangwala d32f945515 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101029044405-mjh05se7006rk7sy
2010-10-29 10:14:05 +05:30
Harry (OpenERP) ab9e19e595 [FIX] hr: replace tab char with white space
bzr revid: hmo@tinyerp.com-20101028114843-ujbpmns3ybtqm8s3
2010-10-28 17:18:43 +05:30
Mustufa Rangwala 859a492340 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101028101534-16fqtdcltf8as2ib
2010-10-28 15:45:34 +05:30
Thibault Francois fb379188b8 [FIX] hr.py : refactor getPhoto
bzr revid: tfr@openerp.com-20101028094532-to4vauqo1svcypbd
2010-10-28 11:45:32 +02:00
vth cd8e9de724 [REF] hr_*
bzr revid: vth@tinyerp.com-20101027124959-phubwje70rmbec4p
2010-10-27 18:19:59 +05:30
uco (OpenERP) ff7600025f [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101027050908-7c1cch1nirk10ubd
2010-10-27 10:39:08 +05:30
uco (OpenERP) b681cb4261 [FIX] : Removed tools.config['addons_path'] for bug 666714.
lp bug: https://launchpad.net/bugs/666714 fixed

bzr revid: uco@tinyerp.com-20101026132254-5gkcrrxaskc3aczf
2010-10-26 18:52:54 +05:30
nvi-openerp 53d9dc8d81 [FIX] Fixed hr get_photo issue.
bzr revid: nicolas.vanhoren@openerp.com-20101025100542-bfee6qo0t4e28269
2010-10-25 12:05:42 +02:00
nvi-openerp 673ea38b7d [merge]
bzr revid: nicolas.vanhoren@openerp.com-20101025073628-52x5qdj49z6bazjn
2010-10-25 09:36:28 +02:00
skh 340547a18e [FIX] hr, hr_expense : On change event problem
lp bug: https://launchpad.net/bugs/653690 fixed

bzr revid: skh@tinyerp.com-20101021122020-obeha6aimohkwmog
2010-10-21 17:50:20 +05:30
nvi-openerp a5f271f50d [FIX] Fixed problem with hr when we use a addons_path with multiple paths
bzr revid: nicolas.vanhoren@openerp.com-20101019144845-xaln01cug0hw8ykv
2010-10-19 16:48:45 +02:00
qdp-launchpad@tinyerp.com e43a45fc9c [MERGE] merged the usability branch (with fixesssss)
bzr revid: qdp-launchpad@tinyerp.com-20101015165315-qigrk92klwozhv5f
2010-10-15 18:53:15 +02:00
Vir (Open ERP) bef860db74 [Fix] hr : problem of ids in job position form view
bzr revid: vir@tinyerp.com-20101015060158-yhibx8xn80m30gl5
2010-10-15 11:31:58 +05:30
Vir (Open ERP) 1be14671a4 [IMP] hr_recruitment : new field added as no_of_recuirtment and functionality changed one expected employee and no_of_employee
bzr revid: vir@tinyerp.com-20101014104356-hgqehpxa0bwv9dzi
2010-10-14 16:13:56 +05:30
Fabien Pinckaers b3a6611ee0 [IMP] better useability
bzr revid: fp@tinyerp.com-20101012215940-yvnh0sog8voxiz85
2010-10-12 23:59:40 +02:00
qdp-launchpad@tinyerp.com 175e637ed3 [FIX] hr, hr_contract, hr_payroll: moved back the field bank_account on the hr.employee object into the HR module: even if it's used only in payroll it may be interssting to record that info before. besides, the view of hr_contract module was crashing
bzr revid: qdp-launchpad@tinyerp.com-20101008160155-nwpaxwqyltc6d663
2010-10-08 18:01:55 +02:00
Vir (Open ERP) a141d983d9 [MOD] hr_* : applied changes from usability branch
bzr revid: vir@tinyerp.com-20101008132247-3m1ff2ngm3im61pn
2010-10-08 18:52:47 +05:30
Mantavya Gajjar c6968eaf3e [FIX]: fix a usability problem for the hr and payroll related to the employee passport informaion
bzr revid: mga@tinyerp.com-20101007073131-ba4dkusjnz6kuj8d
2010-10-07 13:01:31 +05:30
Mantavya Gajjar 5d7b857829 [FIX]: fix a problem of partner_id required partner on employee to maintain the accounting information
bzr revid: mga@tinyerp.com-20101004143137-7qs14p36olvkl05v
2010-10-04 20:01:37 +05:30