odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
94,276 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

333 Commits

Author SHA1 Message Date
vta vta@openerp.com 4a020ad4d8 [FIX] Bug https://bugs.launchpad.net/openobject-addons/+bug/1085787. 
lp bug: https://launchpad.net/bugs/1085787 fixed

bzr revid: vta@openerp.com-20121205131723-si0uxh66zop09o7f
 2012-12-05 14:17:23 +01:00
Bharat Devnani (OpenERP) 6250b94faf [MERGE] merged with main addons 
bzr revid: bde@tinyerp.com-20121112115222-chcgfvhm2cljpybn
bzr revid: bde@tinyerp.com-20121119091444-xpdvczqzrmk6nk5b
 2012-11-19 14:44:44 +05:30
Cedric Snauwaert 2748107a66 [FIX]order the hr_employee by name 
bzr revid: csn@openerp.com-20121113150337-coj0e1uk2pdxveg6
 2012-11-13 16:03:37 +01:00
Vijaykumar Baladaniya 8f7be56b02 [IMP] Improve hr recruitment view. 
bzr revid: vba@tinyerp.com-20121109102617-yus6cne4784zlbx0
 2012-11-09 15:56:17 +05:30
Fabien Pinckaers 15be6914be [IMP] typo 
bzr revid: fp@openerp.com-20121103134730-z42xnfgieoccl16i
 2012-11-03 14:47:30 +01:00
Fabien Pinckaers 9a016b4644 [FIX] useability 
bzr revid: fp@tinyerp.com-20121025151013-cd0gvro61h8224tv
 2012-10-25 17:10:13 +02:00
Vijaykumar Baladaniya 64229a2a93 Employee create time, not have a default email address. 
bzr revid: vba@tinyerp.com-20121004064347-b6oiab179q4smhs1
 2012-10-04 12:13:47 +05:30
Fabien Pinckaers 55ae1c8b4b [FIX] 
bzr revid: fp@openerp.com-20121002211234-z6rlmxjwf762zvjb
 2012-10-02 23:12:34 +02:00
Saurang Suthar 61d87d7530 [MERGE]:merged with parent 
bzr revid: ssu@tinyerp.com-20120912093700-ookzsbpsf8mmqtbb
 2012-09-12 15:07:00 +05:30
Antonin Bourguignon 9444872152 [MERGE] trunk-bug-988165-amp, hr departement copy 
lp bug: https://launchpad.net/bugs/988165 fixed

bzr revid: abo@openerp.com-20120910170202-tf7qrdusu86dbs1m
 2012-09-10 19:02:02 +02:00
Thibault Delavallée 3982e5ba7a [IMP] mail_group, point of sale, hr: updated image fields help, as small and medium sizes are now 64x64 ans 128x128, to match more closely OpenERP image sizes. product: image_medium are not up-sized when resizing them. This means that images smaller than 128x128 won't be resized in image_medium. The purpose is to avoid having unwanted blank frame around images in POS. 
bzr revid: tde@openerp.com-20120907095155-i5hlmidnkq7r2r7b
 2012-09-07 11:51:55 +02:00
Thibault Delavallée b086b8a584 [CLEAN] mail_group, product, point_of_sale, hr: cleaned help of image, because it was too technical-related. Added a comment in code instead about PIL and base64. By the way, small cleaning of the white spaces. 
bzr revid: tde@openerp.com-20120907092333-9f745210yr3p22ay
 2012-09-07 11:23:33 +02:00
Saurang Suthar d68d1942f7 [IMP]hr:remove marital status field value automatically set to single 
bzr revid: ssu@tinyerp.com-20120903055208-3epnm8i77ypg6cxs
 2012-09-03 11:22:08 +05:30
Amit (OpenERP) f437ecfa90 [IMP] Improved the code 
bzr revid: amp@tinyerp.com-20120827131619-bo1nbuomfzlznmty
 2012-08-27 18:46:19 +05:30
Amit (OpenERP) 9ad022537b [Merge] Merge with addons 
bzr revid: amp@tinyerp.com-20120827113936-9xhv02s4g42l04bw
 2012-08-27 17:09:36 +05:30
Olivier Dony 406e58399f [FIX] mail: unify message_post calls, fix typos, various lint cleanup 
bzr revid: odo@openerp.com-20120822113439-aoy7v4njs6o34tu5
 2012-08-22 13:34:39 +02:00
Fabien Pinckaers b62858e83e [IMP] Merging different ways of posting a message: 
message_append_note
  message_append_dict
  message_append
  --> merged all to message_post

bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
 2012-08-17 12:03:02 +02:00
Thibault Delavallée 620b7e9b11 [IMP] Addons: user_email -> email. 
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
 2012-08-10 16:43:39 +02:00
Antonin Bourguignon 4388ace499 [MERGE] latest trunk 
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
 2012-08-08 11:10:48 +02:00
Fabien Pinckaers f1ad3cfdee [IMP] employee view 
bzr revid: fp@tinyerp.com-20120807162216-b1uemxzhcd9t2eto
 2012-08-07 18:22:16 +02:00
Thibault Delavallée 71d0000352 [REM] hr: removed a field that has probably been added by a copy-paste. 
bzr revid: tde@openerp.com-20120807120300-l70tx73pobb4ofe1
 2012-08-07 14:03:00 +02:00
Thibault Delavallée 023262e519 [IMP] product, hr, point of sale, mail_group: propagated function name change (now prefixed with image_) in image module. 
bzr revid: tde@openerp.com-20120807111039-57cykhxurm2wj79k
 2012-08-07 13:10:39 +02:00
Thibault Delavallée c8c95d46f9 [IMP] product, hr, pos, mail_group: removed the onchange_image, updated used images and classes in views. 
bzr revid: tde@openerp.com-20120806155354-sjkrmrffgb2ik4ba
 2012-08-06 17:53:54 +02:00
Thibault Delavallée 662e4944d9 [IMP] hr: image is not modified at display when choosing a new one; btu resized when saving. WIP, to be validated. 
bzr revid: tde@openerp.com-20120803080357-s3kkjzm3n7cquvpf
 2012-08-03 10:03:57 +02:00
Thibault Delavallée a3820b4090 [IMP] hr: changed default user image and moved it (better image, and placed in static/src/img, better name). 
bzr revid: tde@openerp.com-20120730141017-vn8s0ny3y022hd1c
 2012-07-30 16:10:17 +02:00
Thibault Delavallée 81f6d43ee4 [CLEAN] images: cleaned typos. 
bzr revid: tde@openerp.com-20120730133343-f1jofji7bl9u09zp
 2012-07-30 15:33:43 +02:00
Thibault Delavallée 238598c041 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120730081600-y92rgh002zhpp4tw
 2012-07-30 10:16:00 +02:00
Saurang Suthar(OpenERP) 25d650e96e [IMP] Improved warning messages for hr* modules 
bzr revid: pso@tinyerp.com-20120725121354-hypwxo74c43jm5gp
 2012-07-25 17:43:54 +05:30
pso (OpenERP) 8be94b1e93 [MERGE] Merge with main branch 
bzr revid: pso@tinyerp.com-20120722082152-l24vpuuxjb34126g
 2012-07-22 13:51:52 +05:30
Thibault Delavallée 2578f575e2 [IMP] hr_employee: now sends a message on All employee mail.group to welcome the new employee. 
bzr revid: tde@openerp.com-20120720132952-y0j1d4n7qaywbrrl
 2012-07-20 15:29:52 +02:00
pso (OpenERP) 8048661b01 [MERGE] Merge with main branch 
bzr revid: pso@tinyerp.com-20120719073136-a7a5t43y2nm51zji
 2012-07-19 13:01:36 +05:30
pso (OpenERP) fc26f3975d [IMP] Improved warning messages/exceptions of hr modules 
bzr revid: pso@tinyerp.com-20120716091918-hua9cjnv21nqa2yl
 2012-07-16 14:49:18 +05:30
Pinakin Nayi (OpenERP) 881148d4b1 [IMP]hr-warning-message 
bzr revid: pna@tinyerp.com-20120713121613-poze6x6838cr9xpe
 2012-07-13 17:46:13 +05:30
Pinakin Nayi (OpenERP) 27226c12b2 [IMP]hr-warning-message 
bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
 2012-07-13 12:34:25 +05:30
Frédéric van der Essen cd3a0c2b73 [MERGE] from trunk 
bzr revid: fva@openerp.com-20120711162837-xirr40vvc81xk8ra
 2012-07-11 18:28:37 +02:00
Frédéric van der Essen f8d32d3304 [MERGE] point_of_sale 
bzr revid: fva@openerp.com-20120710142447-s0z5ca89bofh0n2c
 2012-07-10 16:24:47 +02:00
Alexis de Lattre fe4151971b Add 'employee_ids' one2many field on res.users ; it is the reverse of the 'user_id' many2one field on hr.employee. 
Add the field to the form view of res.users.

bzr revid: alexis@via.ecp.fr-20120710133255-j78hqsqkfjegui2y
 2012-07-10 15:32:55 +02:00
Thibault Delavallée 282f72391b [MERGE] Merged with main addons. 
bzr revid: tde@openerp.com-20120628124420-bxjjo2jhtzps0wsf
 2012-06-28 14:44:20 +02:00
Antony Lesuisse f8daa47a0a [MERGE] portal, group_user on fields, contact form, default portal menu 
bzr revid: al@openerp.com-20120628102942-ja0qtr1eho4z3749
 2012-06-28 12:29:42 +02:00
Thibault Delavallée 1da7eebab8 [REF] hr, mail_group, product: cleaned code thanks to new tool function in image.py 
bzr revid: tde@openerp.com-20120628102707-100t2brrdxgo1fyd
 2012-06-28 12:27:07 +02:00
Thibault Delavallée bd42290522 [MERGE] Merged with trunk addons. 
bzr revid: tde@openerp.com-20120628090158-v3epmjb72eotwp3l
 2012-06-28 11:01:58 +02:00
Antonin Bourguignon d8a570a9d7 [MERGE] latest trunk 
bzr revid: abo@openerp.com-20120627150256-rc8c78zwhzf4cfhx
 2012-06-27 17:02:56 +02:00
Thibault Delavallée e542c37418 [REF] hr.employee: from photo to image. Updated demo data. 
bzr revid: tde@openerp.com-20120627144750-5vxezzvvo185nwyk
 2012-06-27 16:47:50 +02:00
Antony Lesuisse f17b0eea00 [MERGE] Use Email everywhere 
bzr revid: al@openerp.com-20120627131528-u97jw0m7cq2825ll
 2012-06-27 15:15:28 +02:00
Jigar Amin - OpenERP d9db3c44df [REN] renamed e-mail, E-mail, E-Mail to email, Email 
bzr revid: jam@tinyerp.com-20120625134253-sebauihl53zctcu0
 2012-06-25 19:12:53 +05:30
Antonin Bourguignon 3c4c6aaf77 [MERGE] latest trunk 
bzr revid: abo@openerp.com-20120622130939-bt6d9nfolgza513t
 2012-06-22 15:09:39 +02:00
Kuldeep Joshi (OpenERP) 3c50eb017a [IMP] set logging.getLogger(__name__) 
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
 2012-06-22 12:18:54 +05:30
Raphael Collet 818db0ef6c [MERGE] from trunk 
bzr revid: rco@openerp.com-20120614143107-rtnb6tzd6a5hlwm8
 2012-06-14 16:31:07 +02:00
Raphael Collet a3e9f600ee [IMP] hr: improve English in tooltips, cleanup menus and form view of hr.job 
bzr revid: rco@openerp.com-20120613131834-hjholbe4nsrh35t5
 2012-06-13 15:18:34 +02:00
Kuldeep Joshi (OpenERP) 372477ef72 [IMP]hr_holidays: remove done state and change report 
bzr revid: kjo@tinyerp.com-20120611053226-dix0kl57bnipw8dq
 2012-06-11 11:02:26 +05:30
Kuldeep Joshi (OpenERP) f139b2d594 [IMP] change in yml 
bzr revid: kjo@tinyerp.com-20120608084141-yoguolq375aaz5eg
 2012-06-08 14:11:41 +05:30
Kuldeep Joshi (OpenERP) 055d5dabce [IMP]hr: add done state and change button name 
bzr revid: kjo@tinyerp.com-20120607114832-6p0wt4sdbii900rk
 2012-06-07 17:18:32 +05:30
Stephane Wirtel ed1ceca6f9 [FIX] point_of_sale: fix a bug in the create_from_ui function 
bzr revid: stw@openerp.com-20120604160833-1ma8uim5usqgsfrc
 2012-06-04 18:08:33 +02:00
Antonin Bourguignon dc71257445 [IMP] adapt rights and display for the jobs form view 
bzr revid: abo@openerp.com-20120604124417-jb6v3lal9a55dxk5
 2012-06-04 14:44:17 +02:00
Mayur Maheshwari (OpenERP) 3be6d4ef09 [IMP]hr: Improve employee view kanban and leaves management 
bzr revid: mma@tinyerp.com-20120529124748-l4nqh230k9zat6yq
 2012-05-29 18:17:48 +05:30
Sbh (Openerp) 2a6ff8b22e [MERGE] Merge with lp:openobject-addons 
bzr revid: sbh@tinyerp.com-20120523063832-qwevi2f4caymrczo
 2012-05-23 12:08:32 +05:30
Fabien Pinckaers 5c791531aa [IMP] improved typos 
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
 2012-05-22 18:10:55 +02:00
Pinakin Nayi (OpenERP) a81d8c34af [IMP]hr_recruitment: improve job position form view 
bzr revid: pna@tinyerp.com-20120517095816-w1zphtkph49hnshg
 2012-05-17 15:28:16 +05:30
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
Amit Patel (OpenERP) 8d3365c1ba [IMP] 
bzr revid: apa@tinyerp.com-20120427095137-5v5dnze0jokg7u3f
 2012-04-27 15:21:37 +05:30
Amit (OpenERP) 76066c62c5 [FIX] hr : Fixes the problem on copy method of hr department object 
lp bug: https://launchpad.net/bugs/988165 fixed

bzr revid: amp@tinyerp.com-20120425072409-ohl0xr62lszadhnm
 2012-04-25 12:54:09 +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
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
Jay Vora (OpenERP) 6805f7a822 [FIX] Hr_payroll_account : Payslip approval crashes without notification if Property accounts are not configured 
bzr revid: jvo@tinyerp.com-20110302093722-9g2upvvd731vw91x
 2011-03-02 15:07:22 +05:30
Stephane Wirtel fb544b4212 [FIX] Remove the readonly attribute on the Manager of the department 
bzr revid: stephane@openerp.com-20110228123817-e9xstt1ugcduoqmy
 2011-02-28 13:38:17 +01:00
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