Commit Graph
776 Commits
Author SHA1 Message Date
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
Quentin (OpenERP) f1658260e4 [MERGE] bugfix for assert error: Human Resources/Configuration/Human Resources/Employees/Categories of Employee/Categories structure
while open the employee view form above menu and try to filter results, i am getting this assertion error.

bzr revid: qdp-launchpad@openerp.com-20110530165804-h46rxi92qxzljr8w
2011-05-30 18:58:04 +02:00
Launchpad Translations on behalf of openerp d08352c14e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110526043628-iggxpe3dtuzm615i
bzr revid: launchpad_translations_on_behalf_of_openerp-20110527044622-w39rbfftxxgek3f8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110529043625-9tpnzf4lz10ypg5f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110530045915-u5a8nm8u0h54ujyv
2011-05-30 04:59:15 +00:00
Launchpad Translations on behalf of openerp e7bb8477dc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110521050137-14v8hzg4qgfwpf2m
bzr revid: launchpad_translations_on_behalf_of_openerp-20110520043441-u9e1vje80f6he7xj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110521050229-ayodl6xmd20k7wd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20110522044744-l0biw9ydemk013yv
bzr revid: launchpad_translations_on_behalf_of_openerp-20110523043818-uc1feowa93sym0df
2011-05-23 04:38:18 +00:00
Launchpad Translations on behalf of openerp 826bbaa0a3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110505044018-zo2laq7vbyynd7p7
2011-05-05 04:40:18 +00:00
psi (Open ERP) 7177961073 [FIX] set priority of view of hr.employee list views
bzr revid: psi@tinyerp.co.in-20110504100910-7dgkl0r7d65m6nn4
2011-05-04 15:39:10 +05:30
psi (Open ERP) 7d52cfed37 [FIX] set priority of view of hr.employee list views
bzr revid: psi@tinyerp.co.in-20110504093457-rdb8w8l0p40wks07
2011-05-04 15:04:57 +05:30
psi (Open ERP) a01a3da44d [FIX] hr: small fix for the search view
bzr revid: psi@tinyerp.co.in-20110503130543-iw281vgnrk0aer4m
2011-05-03 18:35:43 +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
Launchpad Translations on behalf of openerp 4eb213855e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430060855-5u495d7r5747wf64
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501060400-go1qlvkfuyg5tk1c
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502060719-c9oa62lpvkf87sl3
2011-05-02 06:07:19 +00:00
Launchpad Translations on behalf of openerp d553615695 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Launchpad Translations on behalf of openerp 7464803d7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426060409-o8efsi8e0x8qdgpj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110427054644-lhqa0wkovwihv339
bzr revid: launchpad_translations_on_behalf_of_openerp-20110428054929-cx8ppeco060z80wm
2011-04-28 05:49:29 +00: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
Quentin (OpenERP) 9a5464529c [MERGE] lp: 746488
bzr revid: qdp-launchpad@openerp.com-20110420123421-icikmbziprf7hzs1
2011-04-20 14:34:21 +02:00
Launchpad Translations on behalf of openerp 45d4391258 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110418062630-eth2g6msxzxkqvjw
2011-04-18 06:26:30 +00:00
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
Thibault Francois 1a45ff614d [MERGE] crm improvement
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
Launchpad Translations on behalf of openerp ce937912ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110406060228-pyb9f2qgl1betbp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407055457-2bu9my2e5ltros01
2011-04-07 05:54:57 +00:00
Launchpad Translations on behalf of openerp ffee41cbed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110406043928-xqladzrd05q5t19g
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407043758-7t6u87d24s7yq2lf
2011-04-07 04:37:58 +00:00
pso (OpenERP) 468f05c209 [FIX] hr: Put groups on HR menu
lp bug: https://launchpad.net/bugs/746488 fixed

bzr revid: pso@tinyerp.com-20110401055351-uor3osh5vz761612
2011-04-01 11:23:51 +05:30
Launchpad Translations on behalf of openerp 4159771311 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329062207-ch1excca4t55xtq1
2011-03-29 06:22:07 +00:00
Launchpad Translations on behalf of openerp d8ca559b5d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329044041-qyy3q7u1em74acq9
2011-03-29 04:40:41 +00:00
Launchpad Translations on behalf of openerp ed4c641982 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110324061752-u9lxt6wjq0g5g07q
bzr revid: launchpad_translations_on_behalf_of_openerp-20110325061430-fjv19l7id8dq8g80
bzr revid: launchpad_translations_on_behalf_of_openerp-20110326150652-3m5g39xj5wvr4ygj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110327062900-m7iwe7fiuezytgm2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110328052519-xcxvtq0i05gaab8i
2011-03-28 05:25:19 +00:00
Launchpad Translations on behalf of openerp 82de026e8f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110316054257-o0k1zy1zk9o5tb9k
bzr revid: launchpad_translations_on_behalf_of_openerp-20110317061249-jfr5yx3lj00vn20k
bzr revid: launchpad_translations_on_behalf_of_openerp-20110318061727-rl00oqonw601p5uh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110319070951-7hc0io27922zyb89
bzr revid: launchpad_translations_on_behalf_of_openerp-20110320063141-rae2iw1pdee0o57e
bzr revid: launchpad_translations_on_behalf_of_openerp-20110321062259-umxel4cvlvocrdsd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110322062342-4gpy4ewvfc3ef4gc
2011-03-22 06:23:42 +00:00
niv-openerp cf07e58016 [MERGE] Other improvements of descriptions in module manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
vro 437ed909c2 [IMP]: Module descriptions.
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp a898038b47 [MERGE] Merged module screenshots and improvements to module descriptions.
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
niv-openerp edbb2d7168 [MERGE] Improvements to manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
rch-openerp 721d40f606 [ADD]: Images of hr, hr_attendance and hr_contract modules.
bzr revid: rch@tinyerp.com-20110314112013-zwazl3oanlsh7fz5
2011-03-14 16:50:13 +05:30
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
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
Quentin (OpenERP) 73b00ed701 [IMP] hr,hr_holidays: remove extended view on employee category (was conflicting with hr/manager group)
bzr revid: qdp-launchpad@openerp.com-20110311113204-kxmskgilat5vlk3f
2011-03-11 12:32:04 +01:00
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) 9777a599c6 [IMP]: hr: "Employee Hierarchy" > "Subordonate Hierarchy"
bzr revid: rpa@tinyerp.com-20110310130704-i1tb4qzjyinngq1t
2011-03-10 18:37:04 +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
Els Van Vossel a69c473f52 [IMP] Changed all module categories, limited number of categories
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
Launchpad Translations on behalf of openerp ab69f51931 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305063056-5iflsg9hrc66kov4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110306061056-8ookl3wbwu5bl1a1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307062130-ncl17m2is4h0np20
2011-03-07 06:21:30 +00:00
Quentin (OpenERP) 5a2123a9a0 [MERGE] merged the dev3 branch for the last time :-). Contains few bugfixes and refactoring of account
bzr revid: qdp-launchpad@openerp.com-20110303155944-kzs2fjuxewwmnr7q
2011-03-03 16:59:44 +01:00
Launchpad Translations on behalf of openerp d95d102ebe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110302141435-m0mvq1l2y1icmkz8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110303060152-qtz8ijrlofyw635z
2011-03-03 06:01:52 +00:00