Commit Graph

168 Commits

Author SHA1 Message Date
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
Fabien Pinckaers 591b929f5d [IMP] employee leave status info
bzr revid: fp@tinyerp.com-20111222142402-bwxyy2xihu76d4p7
2011-12-22 15:24:02 +01:00
Fabien Pinckaers 02b1e6980e [IMP] dashboard simplification
bzr revid: fp@tinyerp.com-20111211114018-di30qn6sh3j6rw8t
2011-12-11 12:40:18 +01:00
Raphael Collet eee6ce4ba4 [MERGE] lp:893491 (hr_holidays: fix domain on menu action 'Leave Requests to Approve')
bzr revid: rco@openerp.com-20111130103814-bo0w5lr6zd47neu1
2011-11-30 11:38:14 +01:00
Raphael Collet a24573cd2d [MERGE] hr_holidays: change form labels of field holiday_type
bzr revid: rco@openerp.com-20111129160312-723y0khfj7jzunww
2011-11-29 17:03:12 +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
Divyesh Makwana (Open ERP) 993778ad2d [FIX] hr_holidays : cannot approve a leave request
lp bug: https://launchpad.net/bugs/893491 fixed

bzr revid: mdi@tinyerp.com-20111123053302-snauyvdzawjti414
2011-11-23 11:03:02 +05:30
Amit (OpenERP) c8793e98f6 [IMP]:hr_holidays:rename Allocation Type to Mode and Allocation Category to Allocation Mode.
bzr revid: apa@tinyerp.com-20111121102039-clb8zx538ttkmegr
2011-11-21 15:50:39 +05:30
Raphael Collet 90e75a3920 [MERGE] lp:872245
bzr revid: rco@openerp.com-20111109082248-7z2e459oc2zvp263
2011-11-09 09:22:48 +01:00
Fabien Pinckaers a7ccc70902 merge
bzr revid: fp@tinyerp.com-20111108202204-22z34101zmgv7w67
2011-11-08 21:22:04 +01:00
Bharat (OpenERP) c27bc7faf1 [FIX] hr : Added category_id field in tree viewof hr.holidays in hr_holidays/hr_holidays_view.xml
lp bug: https://launchpad.net/bugs/872245 fixed

bzr revid: bde@tinyerp.com-20111014054047-gp46a6fqbpadu0es
2011-10-14 11:10:47 +05:30
Amit Bhavsar (Open ERP) b1602c948b [usability2],add menu in hr holidays
bzr revid: amb@tinyerp.com-20111013092115-r3254ve09e6usziu
2011-10-13 14:51:15 +05:30
Fabien Pinckaers b24f2a190a [IMP] menutip config wizard
bzr revid: fp@tinyerp.com-20111001232501-8kv8ixcrqts3sq9u
2011-10-02 01:25:01 +02:00
Fabien Pinckaers 5dc1bc2f44 [FIX] hr_holidays
bzr revid: fp@tinyerp.com-20111001225958-0d0wi1los2870utr
2011-10-02 00:59:58 +02:00
Julien Thewys 32cdec2c72 [FIX] hr_holidays: made 2 view titles more consistent
Ported from 6.0

bzr revid: jth@openerp.com-20110930132124-0iobx63ylsz352oe
2011-09-30 15:21:24 +02:00
Antony Lesuisse 26a58b22f2 [MERGE] config rework ir.action.todo stw
bzr revid: al@openerp.com-20110924142047-rdo7gwoluoydbfz4
2011-09-24 16:20:47 +02:00
Fabien Pinckaers c3a79fbc36 merge
bzr revid: fp@tinyerp.com-20110924091037-kpy965dboeutk5y4
2011-09-24 11:10:37 +02:00
Stephane Wirtel e123082d88 [IMP] Add missing configuration wizards
bzr revid: stw@openerp.com-20110922131300-uudx3uwhkyaj3ry0
2011-09-22 15:13:00 +02:00
Rucha (Open ERP) 0e861ae34a [MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
2011-09-22 11:44:19 +05:30
Atik Agewan (OpenERP) 0e0438a779 [IMP] ALL:change in all statusbar_colors quotes
bzr revid: aag@tinyerp.com-20110921050948-m2iezimspmspsvjs
2011-09-21 10:39:48 +05:30
Jigar Amin - OpenERP 861ef42bbb [IMP] hr_holidays - Leave Requests :Rearranged To Confirm To Approve Validated
bzr revid: jam@tinyerp.com-20110920093418-v9wgaooul8nkhlur
2011-09-20 15:04:18 +05:30
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
ARA (OpenERP) a2ee569514 [merge] merge with trunk addons
bzr revid: ara@tinyerp.com-20110916060758-u23zante59rblo4m
2011-09-16 11:37:58 +05:30
Atik Agewan (OpenERP) 882392394d [IMP] ALL: Remove Space from attribute values
bzr revid: aag@tinyerp.com-20110915084914-kgbpw52ym5uz8ye0
2011-09-15 14:19:14 +05:30
Atik Agewan (OpenERP) 53be1a95ef [ADD] Hr_expense,Hr_holidays,Hr_Recrutment,,Project_issue:Add widget=statusbar in state field.
bzr revid: aag@tinyerp.com-20110915054340-i84rf83h7ctkvvu3
2011-09-15 11:13:40 +05:30
Xavier Morel 178fec5c64 [FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
Antony Lesuisse 65c43a1946 [MERGE] trunk
bzr revid: al@openerp.com-20110805211034-hc8z53m6zzwksipu
2011-08-05 23:10:34 +02:00
Raphael Collet 87f239fb33 [MERGE] remove extended filters
bzr revid: rco@openerp.com-20110804102635-2ixo1tmogsulj83u
2011-08-04 12:26:35 +02:00
Xavier Morel 09cf4d40d0 [FIX] convert ir.actions.todo fields to match model definition changes
* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done

bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
2011-07-29 16:03:24 +02:00
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
Tejas (OpenERP) ba62b19daf usability
bzr revid: tta@openerp.com-20110720091819-s49ianh7xgrf3eim
2011-07-20 14:48:19 +05:30
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
ARA (OpenERP) 8d5f303693 [FIX] hr_holiday: second validation
bzr revid: ara@tinyerp.com-20110601054953-vxdw1abqpy4lcgfl
2011-06-01 11:19:53 +05:30
ARA (OpenERP) 9842299e5a [FIX] merge to main branch
bzr revid: ara@tinyerp.com-20110601054201-urr3hdbthef3xymj
2011-06-01 11:12:01 +05:30
ARA (OpenERP) 7ea9fdaa2c [FIX] hr_holiday: hr_holidays: Second validation
bzr revid: ara@tinyerp.com-20110601051941-qijpncs4kcil7ek9
2011-06-01 10:49:41 +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