Commit Graph

214 Commits

Author SHA1 Message Date
Fabien Pinckaers c31a54334c [FIX] fixing default_context
bzr revid: fp@tinyerp.com-20120521160745-4bir71koyn0vqgww
2012-05-21 18:07:45 +02:00
Mayur Maheshwari (OpenERP) c71446957f [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
Raphael Collet e4efcb808d [IMP] hr*: remove group_extended
bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
2012-04-25 16:11:35 +02:00
Divyesh Makwana (Open ERP) 491641a31c [IMP] all : Improved the typos.
bzr revid: mdi@tinyerp.com-20120423102003-ze3x042iee031530
2012-04-23 15:50:03 +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 fe1631cac3 [MERGE] Merged with main addons
bzr revid: tde@openerp.com-20120330072911-yf0azg7a6x2251ow
2012-03-30 09:29:11 +02:00
Sbh (Openerp) cd66e2402f [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120329130046-6s804a2aic6d4euc
2012-03-29 18:30:46 +05:30
Meera Trambadia (OpenERP) 0e8ccd774d [MERGE] branch merged with openobject-addons
bzr revid: mtr@tinyerp.com-20120326114847-6yju1vy8h7a33iwv
2012-03-26 17:18:47 +05:30
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
Thibault Delavallée 2b82ecc930 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120323092048-4jms6lg1a87r8sbx
2012-03-23 10:20:48 +01:00
Sbh (Openerp) e17dee3a5e [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120323052530-l9fsd06fbma1l3gz
2012-03-23 10:55:30 +05:30
Jagdish Panchal (Open ERP) 8dc623fb21 [IMP] HR: change sequence of menus and apply group_no_one
bzr revid: jap@tinyerp.com-20120322123823-gpn075d2e09etchq
2012-03-22 18:08:23 +05:30
Bhumika (OpenERP) 2e402d5c3e [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120320052258-4g8zcpd248do6tw9
2012-03-20 10:52:58 +05:30
Jagdish Panchal (Open ERP) 9ab663db09 [IMP] HR: apply group_no_one on menus Categories structure,Job Positions, Contract Types,Attendance Reasons,Stages, Degrees, Sources of Applicants,Salary Structures Hierarchy, Salary Rule Categories, Salary Rule Categories Hierarchy, Salary Rules
bzr revid: jap@tinyerp.com-20120316104313-f3f7234wi8yg98zb
2012-03-16 16:13:13 +05:30
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
Thibault Delavallée b73b091858 [ADD] project: task kanban view: user avatar is now used instead of gravatar. It now takes all height in the right-side of the context box, instead of only the right-side of title box. Added a css file for new style definitions.
bzr revid: tde@openerp.com-20120308094503-cv1xt4as5lymxe95
2012-03-08 10:45:03 +01:00
Thibault Delavallée b4cf188b1e [MERGE] Merged with main addons
bzr revid: tde@openerp.com-20120308083916-3f1zlah05777wyg6
2012-03-08 09:39:16 +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
Jagdish Panchal (Open ERP) 70c7af2e7d [IMP] hr: add new menu Leaves and Leaves by Department in Reporting
bzr revid: jap@tinyerp.com-20120306063418-x7gfvebgtupf24yi
2012-03-06 12:04:18 +05:30
Olivier Dony d09e165589 [IMP] hr: remove redundant active filter on employees search view
The filter is useless now that the server was fixed
at revision 4076
revision-id: odo@openerp.com-20120223141635-p117b5wvvreuj40c
to properly respect the `active` flag even when it is
inherited.
It is always possible to find deactived employees using
an advanced search with active = False.

bzr revid: odo@openerp.com-20120223145421-edyuc43r0mkn9lim
2012-02-23 15:54:21 +01:00
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 866290db0a [IMP] Modified displayed photo in res.users form view: it displays user photo if employee photo is not prior; it displays employee photo if employee photo is prior.
bzr revid: tde@openerp.com-20120221132322-l378ovkoz1g8inpk
2012-02-21 14:23:22 +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 Pinckaers f87971efc6 [IMP] leaves kanban improvement
bzr revid: fp@tinyerp.com-20111223091744-ze375m6s7ho4myle
2011-12-23 10:17:44 +01:00
fp 8e66fe7f89 [IMP] employee view
bzr revid: fp@fp-laptop-20111222221031-6vcsojhlxj48yan0
2011-12-22 23:10:31 +01:00
Minh Tran 7469e97a3a updated demo data to pass tests
bzr revid: mit@openerp.com-20111220100828-ji0had187lv1riqo
2011-12-20 11:08:28 +01:00
Minh Tran 282e803e2a Added a div around employee vignette to control padding
bzr revid: mit@openerp.com-20111216161433-dg1quduz0v2tgwbo
2011-12-16 17:14:33 +01:00
Minh Tran 5ae686edcb [IMP] Added some fields and wide images now resize correctly
bzr revid: mit@openerp.com-20111213142329-42f4h5tto0mf6dqi
2011-12-13 15:23:29 +01:00
Minh Tran a833c62f05 [IMP] Relooked the Employee vignette
bzr revid: mit@openerp.com-20111209161556-9lsikv8kf6pk6s73
2011-12-09 17:15:56 +01:00
Fabien Meghazi ee6841e510 [IMP] Set kanban view as default view for project.tasks, hr_recruitment.applicant, project.issues, crm.opportunities and hr.employees
bzr revid: fme@openerp.com-20111206120532-sov62f6jxvnyo3nn
2011-12-06 13:05:32 +01:00
Fabien Meghazi a2486bf3c7 [IMP] Misc improvements to kanban views
bzr revid: fme@openerp.com-20111205150706-qudlh5ie7fs56cl8
2011-12-05 16:07:06 +01:00
Fabien Meghazi f122a674c8 [IMP] Improved project issue kanban view
bzr revid: fme@openerp.com-20111201130002-mflb68c7wsawzuke
2011-12-01 14:00:02 +01:00
Fabien Meghazi 58248effa2 [IMP] Misc improvements to kanban views
bzr revid: fme@openerp.com-20111130171818-6i5l2a8vsl14683x
2011-11-30 18:18:18 +01:00
Fabien Meghazi a83a2763b6 [IMP] Improved hr.employee kanban view
bzr revid: fme@openerp.com-20111130141315-4tcez7xj8lr1kukb
2011-11-30 15:13:15 +01:00
Fabien Pinckaers 5ed9e528d4 [FIX] default values for domain
bzr revid: fp@tinyerp.com-20111125170906-utelua25g25yde8x
2011-11-25 18:09:06 +01:00
Vo Minh Thu 2e1023ddbe [IMP] domain to context:
Use explicitely default_xxx in the context instead of
relying on the domain to fill form views.

bzr revid: vmt@openerp.com-20111124121433-z5du2yeu319ea1ax
2011-11-24 13:14:33 +01:00
Olivier Dony b22fa55566 [IMP] all: remove references to `object` column of ir.values, now gone
This will get rid of a lot of warnings now that the server
warns about unknown fields

bzr revid: odo@openerp.com-20111116115810-9c5kp7lql0yyhs3n
2011-11-16 12:58:10 +01:00
Fabien Pinckaers f79e0d1f59 [Merge] hr improvements
bzr revid: fp@tinyerp.com-20111114112021-neqf57c8kd0cfu0s
2011-11-14 12:20:21 +01:00
Fabien Pinckaers ec5cfd90c8 merge
bzr revid: fp@tinyerp.com-20111111142018-16azu4012vzo028h
2011-11-11 15:20:18 +01:00
Hardik Ansodariy (OpenERP) 5cce8df612 [imp] improved category structure add domain in order to open employee of particular category
bzr revid: han@tinyerp.com-20111109054255-2082i3penqx4a38j
2011-11-09 11:12:55 +05:30
Antony Lesuisse 2e2042c510 [IMP] hr hierarchy view, rename payslip run into batches
bzr revid: al@openerp.com-20111108230027-uj9bgwyhtil6ve7u
2011-11-09 00:00:27 +01:00
Serpent Consulting Services c4cda79286 [FIX] HR : Job positions were missing the statusbar widget on form view
lp bug: https://launchpad.net/bugs/885677 fixed

bzr revid: support@serpentcs.com-20111103154139-fyehb7marciauo15
2011-11-03 21:11:39 +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
Fabien Meghazi 74a9873275 [FIX] Fixed HR Employee kanban view. Required fields not specified.
No need for a gravatar because we already use the photo image field

bzr revid: fme@openerp.com-20111025123939-82kv144cwurgxtb6
2011-10-25 14:39:39 +02:00
Fabien Pinckaers 017d40fc5e [IMP] useability views
bzr revid: fp@tinyerp.com-20111001201753-cce36q1u5jdbl92z
2011-10-01 22:17:53 +02:00
Amit (OpenERP) c358d62c29 [MERGE]
bzr revid: apa@tinyerp.com-20110929051301-ncn3cyk0gag1evbq
2011-09-29 10:43:01 +05:30
Amit (OpenERP) a3b81c3a45 improved
bzr revid: apa@tinyerp.com-20110921093153-yiwv6o1xi3kwzobp
2011-09-21 15:01:53 +05:30
Amit (OpenERP) e5822caa30 set default photo if no photo in hr
bzr revid: apa@tinyerp.com-20110921072547-s52tt15emftr0lwp
2011-09-21 12:55:47 +05:30
Jigar Amin - OpenERP ac812caf17 [FIX] hr job position added new icon for in position Jobs
bzr revid: jam@tinyerp.com-20110920101001-oaweemhq5p5qsnwy
2011-09-20 15:40:01 +05:30
Jigar Amin - OpenERP 3b777a069e [FIX] hr job position current button removed
bzr revid: jam@tinyerp.com-20110920100432-p5vmqebqltr11034
2011-09-20 15:34:32 +05:30