Commit Graph

173 Commits

Author SHA1 Message Date
Saurang Suthar (OpenERP) a2a05cfc19 [IMP]:improved titles State by Status everywhere
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Quentin (OpenERP) 843d77e0e7 [MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20120330122848-3h9x1nuocdyufr7m
2012-03-30 14:28:48 +02:00
Thibault Delavallée fa131c2559 [CLEAN] Cleaned imports in hr.py
bzr revid: tde@openerp.com-20120330082650-k0b62c0cpmrcsq2r
2012-03-30 10:26:50 +02:00
Thibault Delavallée 2b415362ab [FIX] Fixing crash when clearing employee photo.
bzr revid: tde@openerp.com-20120323141749-fuzdmeuac4msmfpd
2012-03-23 15:17:49 +01:00
Thibault Delavallée 0bcf800119 [IMP] Renamed photo_stored->photo_big, which makes more sens. Updated demo data.
bzr revid: tde@openerp.com-20120323121438-upcgpsvy809hm2n5
2012-03-23 13:14:38 +01:00
Thibault Delavallée 3211541cf7 [IMP] Improved comments and doc. Note that stored photo is now resized to 540x450 maximum.
bzr revid: tde@openerp.com-20120323103308-br79vii176ncj5z0
2012-03-23 11:33:08 +01:00
Thibault Delavallée 096316f19e [IMP] Updated after changes in server user_img branch. Also updated hr photo management and comments, according to review of server branch.
bzr revid: tde@openerp.com-20120323100439-qpirgrt2my68z046
2012-03-23 11:04:39 +01:00
Quentin (OpenERP) 5218dca1d5 [FIX] hr: fix related to the merge of res.partner and res.partner.address
bzr revid: qdp-launchpad@openerp.com-20120321101232-j8qt4dhka50pp01o
2012-03-21 11:12:32 +01:00
Thibault Delavallée 7290cb3484 [IMP] Removed a debug print; added context propagation in one method
bzr revid: tde@openerp.com-20120313161022-mxkbk34zis7lmez9
2012-03-13 17:10:22 +01:00
Thibault Delavallée 0c3921a698 [IMP] hr_employee: cleaned code. Kanban view now uses photo_mini instead of photo.
bzr revid: tde@openerp.com-20120313111612-qij93zfg6uolcnvd
2012-03-13 12:16:12 +01:00
Bhumika (OpenERP) 0cf6e236e8 [FIX] hr: remove referecne of res.partner.address
bzr revid: sbh@tinyerp.com-20120307052100-ylqekp6w7xe72ucd
2012-03-07 10:51:00 +05:30
Thibault Delavallée 08267fe081 [IMP] Removed link to res.users. Employee photo is now independant from user avatar.
bzr revid: tde@openerp.com-20120221153118-o9792mljc9q0ir7d
2012-02-21 16:31:18 +01:00
Thibault Delavallée 1805d55959 [ADD] hr.employee: added a photo_mini field holding a resized version of photo field; modified inheritance of res.users to be able to use employee photo instead of user photo; added hr_photo_prior option to res.user form view
bzr revid: tde@openerp.com-20120221131228-q0w6pyk6phlnmnrd
2012-02-21 14:12:28 +01:00
Fabien Meghazi da0522edb7 [REV] Revert Revision#6353: Will use __last_update instead of write_date
bzr revid: fme@openerp.com-20120117202859-uoo6jw9nilfxs33b
2012-01-17 21:28:59 +01:00
Fabien Meghazi a76f9d6112 [ADD] Add write_date to hr.employee and product.product in order to allow image reloading in kanban views
bzr revid: fme@openerp.com-20120117134713-uewdqmv08r6r5hmq
2012-01-17 14:47:13 +01:00
fp 8e66fe7f89 [IMP] employee view
bzr revid: fp@fp-laptop-20111222221031-6vcsojhlxj48yan0
2011-12-22 23:10:31 +01:00
Raphael Collet 12a591b45a [MERGE] lp:893626 (hr: improve stored function fields of hr.job)
bzr revid: rco@openerp.com-20111130133749-h0qbls0lwsplkdlr
2011-11-30 14:37:49 +01:00
Divyesh Makwana (Open ERP) 1deaa62829 [IMP] account : Improve the variable naming convention
bzr revid: mdi@tinyerp.com-20111125083352-xdmngxu2m5di8w6f
2011-11-25 14:03:52 +05:30
Divyesh Makwana (Open ERP) c400d0b1a6 [IMP] hr : Improve the functionality
bzr revid: mdi@tinyerp.com-20111125070936-5acvboatg6muuujy
2011-11-25 12:39:36 +05:30
Divyesh Makwana (Open ERP) eee074c64b [IMP] hr : Improve the indentation
bzr revid: mdi@tinyerp.com-20111124130746-bcxabytfsj6tfm3k
2011-11-24 18:37:46 +05:30
Divyesh Makwana (Open ERP) 855a4bcb52 [FIX] hr : job position, bad computation of employee field
lp bug: https://launchpad.net/bugs/893626 fixed

bzr revid: mdi@tinyerp.com-20111124101209-frhh1qyzvhrarq6s
2011-11-24 15:42:09 +05:30
Stephane Wirtel 06b8d1e5c3 [IMP] hr: show the employees from the category
bzr revid: stw@openerp.com-20111026150324-1c5k1lsq2yvqhfq9
2011-10-26 17:03:24 +02:00
Amit (OpenERP) c358d62c29 [MERGE]
bzr revid: apa@tinyerp.com-20110929051301-ncn3cyk0gag1evbq
2011-09-29 10:43:01 +05:30
Amit (OpenERP) dc1ba50c5e [IMP]:hr:added kanban view for hr employess.
bzr revid: apa@tinyerp.com-20110916101214-hlff8uqv8y87h5bi
2011-09-16 15:42:14 +05:30
Meera Trambadia (OpenERP) ba5341a5e6 [MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110915130151-7uxiju44u28o7b9h
2011-09-15 18:31:51 +05:30
Quentin (OpenERP) dac8a9e4fb [MERGE] merged with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110913120012-339iigyjojh89sy3
2011-09-13 14:00:12 +02:00
Quentin (OpenERP) 2939abdf3d [IMP] hr: added default value for marital field
bzr revid: qdp-launchpad@openerp.com-20110913094046-gvdcr59ohvglkogq
2011-09-13 11:40:46 +02:00
mtr 02735ad34a [IMP] account,hr: removed extra space from warning message
bzr revid: mtr@mtr-20110812110557-sjt22giah9erxusl
2011-08-12 16:35:57 +05:30
mtr b3d4085714 [FIX] account,hr,hr_recruitment,hr_payroll,product:- enforced _sql_constraint to maintain uniqueness
lp bug: https://launchpad.net/bugs/789019 fixed

bzr revid: mtr@mtr-20110805052025-3w0w7ccnnlrish2b
2011-08-05 10:50:25 +05:30
Quentin (OpenERP) 5ec533eb67 [MERGE] merged main trunk addons branch
bzr revid: qdp-launchpad@openerp.com-20110711163839-v1bdt337kds3072n
2011-07-11 18:38:39 +02:00
Raphael Collet eed7ef1307 [MERGE] from trunk
bzr revid: rco@openerp.com-20110704135951-x4d5sk98ro3hwqsu
2011-07-04 15:59:51 +02:00
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
Raphael Collet 72ee5358a4 [MERGE] from trunk
bzr revid: rco@openerp.com-20110624141323-iq3pss68lf07lvzl
2011-06-24 16:13:23 +02:00
Raphael Collet 54be2c8609 [FIX] prevent automatic shortcut creation for portal users
bzr revid: rco@openerp.com-20110624085018-e8u6ykih3tdcg16q
2011-06-24 10:50:18 +02:00
Quentin (OpenERP) b5bb00cdd3 [FIX] hr: display the expected number of employees and number of employees when grouping
bzr revid: qdp-launchpad@openerp.com-20110531140258-p30r6fq5wuyl8j7h
2011-05-31 16:02:58 +02:00
psi (Open ERP) 3eb0031cae [IMP] improve searh view of hr.employee add filter on categories
bzr revid: psi@tinyerp.co.in-20110510133227-fzbbptd2tje5suf8
2011-05-10 19:02:27 +05:30
Olivier Dony 560915cb68 [MERGE] merged latest fixes from 6.0 up to r.4556
Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk.

bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i
2011-05-02 20:46:43 +02:00
ARA (OpenERP) d866edf0ae [FIX] hr: Removing Administrator employee record causes future updates of hr module to fail
lp bug: https://launchpad.net/bugs/769632 fixed

bzr revid: ara@tinyerp.com-20110426112755-2n13xwebtlx21wun
2011-04-26 16:57:55 +05:30
Tejas (OpenERP) 2afc6025ad FIX : Unwanted address_ids removed
bzr revid: tta@openerp.com-20110415105141-eq2lt4akpgr3dwi3
2011-04-15 16:21:41 +05:30
Tejas (OpenERP) ffd8f8a664 FIX : model defaults : address_id , right model now seted
bzr revid: tta@openerp.com-20110413105224-4p697u2xxss9c65y
2011-04-13 16:22:24 +05:30
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
Thibault Francois 1a45ff614d [MERGE] crm improvement
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
Quentin (OpenERP) 1548e4af21 [MERGE] cherry picking of revision 4434-4443 of lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements
bzr revid: qdp-launchpad@openerp.com-20110314105835-39g2ajzfhs8cco6q
2011-03-14 11:58:35 +01:00
Quentin (OpenERP) 670141cbf5 [MERGE] cherry picking of revision 4425-4432 of lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements
bzr revid: qdp-launchpad@openerp.com-20110314104431-xxyxcv7mercqqhzt
2011-03-14 11:44:31 +01:00
Quentin (OpenERP) 51fda3b52f [MERGE] cherry picking of revision 4422-4423 of lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements
bzr revid: qdp-launchpad@openerp.com-20110314104327-3n3xfjibl4x0yy2y
2011-03-14 11:43:27 +01: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