Commit Graph

133 Commits

Author SHA1 Message Date
Xavier Morel cc13113641 [REF] reformat xml files before applying automated search&replace on them
bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
2011-07-29 15:48:10 +02:00
Xavier Morel a5fdb75ad6 [FIX] ir.actions.todo are now unskippable
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
Quentin (OpenERP) 664ba7bba3 [MERGE] merge with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
Quentin (OpenERP) 837f2a4a69 [MERGE] merged aag branch with hr_holidays usability improvements
bzr revid: qdp-launchpad@openerp.com-20110608144616-k80dn77ii0f3dlj5
2011-06-08 16:46:16 +02:00
aag (OpenERP) cb6e9d7e13 [IMP]hr_holidays:Assign Legal Leaves to Employees in HR Management -5 categ
bzr revid: aag@tinyerp.co.in-20110603131117-iylt0fehko6cj71w
2011-06-03 18:41:17 +05:30
aag (OpenERP) a7fe59285a [ADD]hr_holidays:Assign Legal Leaves to Employees add to Human Resource -4 seq category
bzr revid: aag@tinyerp.co.in-20110602105049-gdpdhlrth95t649g
2011-06-02 16:20:49 +05:30
aag (OpenERP) 9d969a1564 [IMP]hr,hr_holidays: Rename saprator "position" into "job information and inherit remaining legal leaves field to hr.employee form
bzr revid: aag@tinyerp.co.in-20110530121307-ykwl0qfjf9k5ihdj
2011-05-30 17:43:07 +05:30
aag (OpenERP) cb46f35091 [IMP]hr_holidayse: Rename column "Remaining leaves" into "remaining legal leaves"
bzr revid: aag@tinyerp.co.in-20110527113919-40be1anwsqhntfu5
2011-05-27 17:09:19 +05:30
Rucha (Open ERP) 33d9a30005 [IMP, REF]: base_setup, hr_holidays: Code improvement and refactoring in assign legal leave wizard
bzr revid: rpa@tinyerp.com-20110512123920-m82iqsnw0c2v6gqj
2011-05-12 18:09:20 +05:30
aag (OpenERP) 7483f436cf [ADD]hr_holidays:aad new config wiz -Assign Legal Leaves to Employees
bzr revid: aag@tinyerp.co.in-20110512112629-it13t2lgtupum6gk
2011-05-12 16:56:29 +05:30
Quentin (OpenERP) cfa9e170ac [MERGE] lp: 751299 (+change priority of new view)
bzr revid: qdp-launchpad@openerp.com-20110504075525-edkp4hcu3guxj3kz
2011-05-04 09:55:25 +02:00
Quentin (OpenERP) f9a1e706a8 [MERGE] lp:767238
bzr revid: qdp-launchpad@openerp.com-20110427080332-qdwytwgd97ekj35v
2011-04-27 10:03:32 +02:00
pso (OpenERP) 6812297887 [IMP] hr_holidays: Improved search, tree view of holiday and onchange method
bzr revid: pso@tinyerp.com-20110426064116-47pn4y5yuifsbjmg
2011-04-26 12:11:16 +05:30
pso (OpenERP) 428944635f [IMP] hr_holidays: Improved Indentation
bzr revid: pso@tinyerp.com-20110426060513-nxbcemw0cfbkpdga
2011-04-26 11:35:13 +05:30
pso (OpenERP) bcbccd8eb8 [FIX] hr_holidays: Wrong allocation request created when allocating holidays per category of employee
lp bug: https://launchpad.net/bugs/767238 fixed

bzr revid: pso@tinyerp.com-20110426053714-i0jpn1fh620mk1j4
2011-04-26 11:07:14 +05:30
Husen Daudi 29e05874b6 merged with trunk
bzr revid: hda@hda-laptop-20110421052650-rtn75wn5o3ue87wp
bzr revid: hda@hda-laptop-20110426053533-gn68qmvhikeefike
2011-04-26 11:05:33 +05:30
skh c6cc93fcb0 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421121226-40h4sahiuoydnjgt
2011-04-21 17:42:26 +05:30
skh 8b2d082ff9 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421072031-r6l3uxk91bewcfrk
2011-04-21 12:50:31 +05:30
skh 309493382d [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421063936-a2k70vufxdvt3efm
2011-04-21 12:09:36 +05:30
skh 0f3d174ff2 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406095919-rsp0rzugqglp901b
2011-04-06 15:29:19 +05:30
skh a45a076aba [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406072520-vd8qj7iphmzkry3r
2011-04-06 12:55:20 +05:30
skh fd9fcd3ac7 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406065736-944f5id53aesdf8b
2011-04-06 12:27:36 +05:30
AMP (OpenERP) 84f97f57e6 [FIX] hr_holidays : Fixes the holidays workflow issue
bzr revid: amp@tinyerp.com-20110405103134-2lu512lqup2w57o5
2011-04-05 16:01:34 +05:30
pso (OpenERP) 838d9a3e60 [FIX] hr_holidays: possible to set to draft a refused allocation request
lp bug: https://launchpad.net/bugs/746471 fixed

bzr revid: pso@tinyerp.com-20110401052532-5op996ya8rxbq0kb
2011-04-01 10:55:32 +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) 36fe64becc [IMP]: Rename "Confirm" to "Submit to Manager"
bzr revid: rpa@tinyerp.com-20110311101016-gzi2lkvfj5029n8x
2011-03-11 15:40:16 +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) 22ab283619 [IMP]: hr_holidays: Holidays => Leaves
bzr revid: rpa@tinyerp.com-20110310132900-gl2i53oa7mgcq1sz
2011-03-10 18:59:00 +05:30
Rucha (Open ERP) 4f4f02bad2 [IMP]: hr_holidays: Leave Type => Allocation Type
bzr revid: rpa@tinyerp.com-20110310132540-3pns1pqcfiltkytp
2011-03-10 18:55:40 +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
Thibault Francois e3e979a498 [MERGE] default value in act_window
bzr revid: tfr@openerp.com-20110309130345-uraw50vl1xlzqy6t
2011-03-09 14:03:45 +01:00
Quentin (OpenERP) e4a7ae6236 [IMP] hr_holidays: set department_id as readonly instead of invisible on attrs
bzr revid: qdp-launchpad@openerp.com-20110223143637-n8nesmli4d0w9cs7
2011-02-23 15:36:37 +01:00
ARA (OpenERP) 46c1818aea [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110217112123-wwp1i98s2zjd2kvv
2011-02-17 16:51:23 +05:30
ARA (OpenERP) 990befd610 [FIX]Holiday Request - Two different fields with same labels
lp bug: https://launchpad.net/bugs/720582 fixed

bzr revid: ara@tinyerp.com-20110217111720-nbqov0u17qqgxvjq
2011-02-17 16:47:20 +05:30
Mustufa Rangwala 59a5219269 [FIX] Holidays - Department field is not relevant if we assign holidays or allocation by Employee's Category
lp bug: https://launchpad.net/bugs/720585 fixed

bzr revid: mra@mra-laptop-20110217091754-ow18gxcbx2h2l3lg
2011-02-17 14:47:54 +05:30
ron@tinyerp.com f34b5ba2f1 [IMP]hr_holidays,hr_recruitment:improved HR module related changes and also make one wizard
bzr revid: ron@tinyerp.com-20110216120450-nvul499jx6f3wekd
2011-02-16 17:34:50 +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
Ujjvala Collins (OpenERP) 4bac6d8969 [FIX] all: Fixed incomplete behavior of act_window.
lp bug: https://launchpad.net/bugs/708467 fixed

bzr revid: uco@tinyerp.com-20110127094939-v8gugx666pakihva
2011-01-27 15:19:39 +05:30
mtr 07a63fcf71 [IMP] hr_holidays:In xml,added field 'name' on model=ir.actions.act_window
bzr revid: mtr@mtr-20110121065940-d37nys61ta3b1556
2011-01-21 12:29:40 +05:30
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
ARA (OpenERP) 2e76a8328c [FIX]hr_holidays:shouldn't see employee's categories in simplify view
lp bug: https://launchpad.net/bugs/701410 fixed

bzr revid: ara@tinyerp.com-20110111122019-tozyw72p2npu3yqk
2011-01-11 17:50:19 +05:30
Mustufa Rangwala 3bdca04e28 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110103090825-h3f9ie8qu7l09ceb
2011-01-03 14:38:25 +05:30
François Degrave 6e90f9165b [IMP] buttons visibility on HR
bzr revid: fde@openerp.com-20101230155348-o7571z970z1m2uha
2010-12-30 16:53:48 +01:00
François Degrave a8a2183a77 [IMP] HR access rights
bzr revid: fde@openerp.com-20101230122428-wqsf7qcck7rasbfp
2010-12-30 13:24:28 +01:00
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
Fabien Pinckaers e2f6d60065 fix
bzr revid: fp@tinyerp.com-20101229201026-ybz9nifb3nmwh0m3
2010-12-29 21:10:26 +01:00
Fabien Pinckaers 889038611d fix
bzr revid: fp@tinyerp.com-20101229162607-fpmdqtm0x9bo17yt
2010-12-29 17:26:07 +01:00
François Degrave 469b5a8c6e [IMP] removed contract tab in employee form view + fixed holidays shortcut
bzr revid: fde@openerp.com-20101229161029-o5cko7yu1sf3li45
2010-12-29 17:10:29 +01:00
Fabien Pinckaers 0a7c9c6ee2 [FIX] complete rewrite for clean up of hr_holidays
bzr revid: fp@tinyerp.com-20101229124123-7tt4ttk3jmkispw7
2010-12-29 13:41:23 +01:00
François Degrave e678fd472a [IMP] access rights, menus for HR
bzr revid: fde@openerp.com-20101228153417-ps9ql3h4lij87jx8
2010-12-28 16:34:17 +01:00