Commit Graph

747 Commits

Author SHA1 Message Date
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 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
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
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
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
Mustufa Rangwala 43309dab99 [MERGE] merge from trunk
bzr revid: mra@mra-laptop-20110228105505-tz775fwdj8b0p94m
bzr revid: mra@mra-laptop-20110301044544-qc33bp07p9l8io4k
bzr revid: mra@mra-laptop-20110302102551-y5i60g2giyjare0c
bzr revid: mra@mra-laptop-20110303052230-nkaffu9gio1qqz90
2011-03-03 10:52:30 +05:30
Launchpad Translations on behalf of openerp d1683be192 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110303043944-epd83p1wfzk0zt2b
2011-03-03 04:39:44 +00:00
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
Launchpad Translations on behalf of openerp 0033dd0a59 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110302043901-hinshf78fz65fwl6
2011-03-02 04:39:01 +00:00
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
Mustufa Rangwala 4c53bf6012 [REVERT] hr_*: securty rules reverted
bzr revid: mra@mra-laptop-20110218122344-lb7tj7llxngkbj0p
2011-02-18 17:53:44 +05:30
ARA (OpenERP) cda3412abe [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110216124125-7orp1hxq6clpshmb
2011-02-16 18:11:25 +05:30
ARA (OpenERP) d6c8860db5 [FIX]Human Resources : employee form view : Mobile field
bzr revid: ara@tinyerp.com-20110216123845-ltf990dqca9qfedq
2011-02-16 18:08:45 +05:30
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
psi (Open ERP) 349556743b [FIX] hr_*: new user - much too many access rights
lp bug: https://launchpad.net/bugs/719063 fixed

bzr revid: psi@tinyerp.co.in-20110216104715-ak6h09kyel4imt7e
2011-02-16 16:17:15 +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
Olivier Dony 07f520a856 [MERGE] merged bugfixes from 6.0 up to revision 4401
bzr revid: odo@openerp.com-20110214114507-8uwohpcblsfhgjae
2011-02-14 12:45:07 +01:00
Launchpad Translations on behalf of openerp 958038785b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110209060136-nfjweh4nw0sfdtyb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110210053441-nhro56vsok1xjorb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110211062554-w9k6gkzfxorm7alk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110211062659-b0a6mwp18ipvn64n
bzr revid: launchpad_translations_on_behalf_of_openerp-20110212060645-t8l1wzw8znrsi1ze
bzr revid: launchpad_translations_on_behalf_of_openerp-20110213053327-7uwmixbkd8pmy53a
bzr revid: launchpad_translations_on_behalf_of_openerp-20110214054817-4wgpcwobeghg1dht
bzr revid: launchpad_translations_on_behalf_of_openerp-20110215053913-nqwsr2zc5fhc1prr
2011-02-15 05:39:13 +00:00
Mustufa Rangwala 393bbe5000 [MERGE] merge from trunk
bzr revid: mra@mra-laptop-20110210044347-5vc0jpluwx50wm8e
2011-02-10 10:13:47 +05:30
Launchpad Translations on behalf of openerp 7f5b7235ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110210043610-mqxp4vpb886lcdrj
2011-02-10 04:36:10 +00:00
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
Mustufa Rangwala 4db0767016 [FIX] HR : Correction on List view definition for model hr.employee (Ref : SaaS Maintenance Case 3990)
bzr revid: mra@mra-laptop-20110208045750-9okcwgulbh1ijaw3
2011-02-08 10:27:50 +05:30
Jay Vora (OpenERP) 3f63d065da [FIX] HR : Correction on List view definition for model hr.employee (Ref : SaaS Maintenance Case 3990)
bzr revid: jvo@tinyerp.com-20110207124724-dgq10cawnyjidobz
2011-02-07 18:17:24 +05:30
Launchpad Translations on behalf of openerp 89933f4c30 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205045946-ngssapvavvzymfc4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045319-cjbcpcr7k0jw8v8f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205050201-5kxv4wvlb171y4ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045419-syxas10vfjwq4nw9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110207052017-1qsba36kfnjc0zkj
2011-02-07 05:20:17 +00:00
Launchpad Translations on behalf of openerp bbfa775055 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110202044205-3ws4pqp0lavgg5c5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203044526-s8t9nmtqd7do7yy4
2011-02-03 04:45:26 +00:00
Launchpad Translations on behalf of openerp 7a59b73896 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131060829-cw2n1p0rxt186agi
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129054416-mqjy6dbh74m5srtu
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130055001-gehu37plrrjaogxb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131060928-xs2u6nr3y2x0h9db
2011-01-31 06:09:28 +00:00
Launchpad Translations on behalf of openerp 61a62b1dfe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045401-1zezcgk719d3dm0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130044958-yshcathln43o1wdz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045457-rzhwci5po7ea72bd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045641-xfn2nij4y67wyq3h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130045141-vh5ecttx8tj5vdg4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045711-41727n3c4e3wi0t9
2011-01-31 04:57:11 +00:00
qdp-launchpad@tinyerp.com 4e212b6f09 [FIX] hr, access rights: a simple employee should be able to see the list of departments
bzr revid: qdp-launchpad@tinyerp.com-20110128093703-fe4akspw2yq55ybq
2011-01-28 10:37:03 +01:00
qdp-launchpad@tinyerp.com 9fb4e60e68 [FIX] hr, access rights: a simple employee should be able to see the list of departments
bzr revid: qdp-launchpad@tinyerp.com-20110128092939-u6lpij6zexv6qztl
2011-01-28 10:29:39 +01:00