Commit Graph

436 Commits

Author SHA1 Message Date
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Twinkle Christian (OpenERP) 721adad01e [IMP]Remove type field from the whole hr module
bzr revid: tch@tinyerp.com-20120808124839-ecd1uic8mscg3s7f
2012-08-08 18:18:39 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
help 41d1135812 [IMP]improved exception warnings in remaining modules as per suggestion
bzr revid: help-20120731133425-2zlm5sakpowuc6rk
2012-07-31 19:04:25 +05:30
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Stephane Wirtel 6a84f697b1 [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-mma
bzr revid: stw@openerp.com-20120725143446-2ir9qawtn20iimz2
2012-07-25 16:34:46 +02:00
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Mayur Maheshwari (OpenERP) 8903313f8f [IMP]hr_all: fix some traceback issue related to hr module
bzr revid: mma@tinyerp.com-20120723063055-bfxz1s0kj8hb8lnn
2012-07-23 12:00:55 +05:30
Turkesh Patel (Open ERP) 4429ce743e [IMP] hr_contract: improved search views.
bzr revid: tpa@tinyerp.com-20120720102210-9tjwcd5hc709lrv5
2012-07-20 15:52:10 +05:30
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +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
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Pinakin Nayi (OpenERP) 27226c12b2 [IMP]hr-warning-message
bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
2012-07-13 12:34:25 +05:30
Quentin (OpenERP) e93b1c9dbf [IMP] hr_contract: usability, review of hr.contract form view
bzr revid: qdp-launchpad@openerp.com-20120706144019-lf4avjk3kc6vcapk
2012-07-06 16:40:19 +02:00
Quentin (OpenERP) e6ef77b047 [MERGE] hr review of form views
bzr revid: qdp-launchpad@openerp.com-20120705092921-0edv4n7z0392ia83
2012-07-05 11:29:21 +02:00
Quentin (OpenERP) 6867bc1375 [IMP] review of some hr form view
bzr revid: qdp-launchpad@openerp.com-20120704162910-zatsmoxyu2reaab2
2012-07-04 18:29:10 +02:00
Sanjay Gohel (Open ERP) 900081de80 [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120704125902-wf202qb5p14iew7n
2012-07-04 18:29:02 +05:30
Sanjay Gohel (Open ERP) faddab4935 [IMP]reorganize group in contract form and remove total from my timesheet
bzr revid: sgo@tinyerp.com-20120629064443-kwyp4r59620qse3k
2012-06-29 12:14:43 +05:30
Amit Patel (OpenERP) 1325558868 [IMP]:improved HR Application view after reviewed
bzr revid: apa@tinyerp.com-20120628131210-gpy7i3d2ekg6b7da
2012-06-28 18:42:10 +05:30
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
2012-06-28 12:10:05 +05:30
Amit Patel (OpenERP) 87e079367a [IMP]:hr,hr_contract:improved view
bzr revid: apa@tinyerp.com-20120625062922-lvv1arp9yr7z801y
2012-06-25 11:59:22 +05:30
Amit Patel (OpenERP) 0b367184b5 [IMP]:hr_contract:improved view
bzr revid: apa@tinyerp.com-20120625055531-y9w9vwztzrgrl99l
2012-06-25 11:25:31 +05:30
Amit Patel (OpenERP) 5e12f8dbf6 [MERGE]
bzr revid: apa@tinyerp.com-20120625045019-86qrhmewdodwbbis
2012-06-25 10:20:19 +05:30
Amit Patel (OpenERP) b6b97caa6b [IMP]:hr_contract:improved view
bzr revid: apa@tinyerp.com-20120622132735-hds4xywi4rckbuq8
2012-06-22 18:57:35 +05:30
Quentin (OpenERP) c9ef276770 [REF] search views: removed filter_domain if only one element was inside + made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622102959-fhc1oe2w8in8y6v2
2012-06-22 12:29:59 +02:00
Sanjay Gohel (Open ERP) 3f068c097b [IMP]Payslip Info and Advantage should be in 2 columns
bzr revid: sgo@tinyerp.com-20120621065608-5mw14bj3iwec2z0o
2012-06-21 12:26:08 +05:30
Purnendu Singh (OpenERP) 2e3728db21 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
Stephane Wirtel 9ed4ca5dca [MERGE] lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp
bzr revid: stw@openerp.com-20120618085532-coxsmpot2dz0er1m
2012-06-18 10:55:32 +02:00
Purnendu Singh (OpenERP) 4395463c57 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120618070239-h6zjmw4hvn3oq543
2012-06-18 12:32:39 +05:30
Purnendu Singh (OpenERP) 2663cbca6e [MERGE] hr_*: make some improvements and Merge cha branch
bzr revid: psi@tinyerp.com-20120615125750-7yanak6d4282nk4u
2012-06-15 18:27:50 +05:30
Ajay Chauhan (OpenERP) 6db119b7d8 [IMP]hr_* : improve search code in xml
bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2
2012-06-13 18:11:57 +05:30
Jalpesh Patel (OpenERP) 478946c86d [IMP]hr:improve page sheet
bzr revid: pja@tinyerp.com-20120613123644-0na4ddmkjvwpz26m
2012-06-13 18:06:44 +05:30
Sbh (Openerp) 234084df87 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120612105345-d10lp54bywb7y7oz
2012-06-12 16:23:45 +05:30
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
Kuldeep Joshi (OpenERP) 7496ae5bf0 [IMP] set no one group
bzr revid: kjo@tinyerp.com-20120530101238-atvcsna2vc5jwad9
2012-05-30 15:42:38 +05:30
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Launchpad Translations on behalf of openerp e58dd0966e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120503052638-qmjv3od50louuhyr
2012-05-03 05:26:38 +00:00
Launchpad Translations on behalf of openerp 75daaf4123 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120419043835-l1vrldcmgh9o6s0c
2012-04-19 04:38:35 +00:00
Launchpad Translations on behalf of openerp d60ca9a5fa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120407045605-5anp5gdq7lknrlzu
bzr revid: launchpad_translations_on_behalf_of_openerp-20120409045650-vb086pw3whwuub1e
bzr revid: launchpad_translations_on_behalf_of_openerp-20120410045646-c2eyze1zzi2rjspi
2012-04-10 04:56:46 +00:00
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
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
Launchpad Translations on behalf of openerp 88c25488a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
Launchpad Translations on behalf of openerp 2094148de5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050419-fgzhvlogc71u42qe
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050718-lf9hgvr1p33jpm2h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216052148-ta5bwtqg3bzmvp3i
2012-02-16 05:21:48 +00:00
Launchpad Translations on behalf of openerp 74b3b0bc69 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054303-2gawtr1s4zulhhhs
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054630-925y7kotw7axa7z4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214061906-2g5kxwe0xle5u54c
2012-02-14 06:19:06 +00:00