Commit Graph
96 Commits
Author SHA1 Message Date
Raphael Collet adafbc707a [MERGE] from trunk
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
Quentin (OpenERP) 9c9516d21c [MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20110706145644-merwy0setzzb8c9w
2011-07-06 16:56:44 +02:00
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +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
Rucha (Open ERP) 8dc08fabe7 [REM,FIX]: hr_holidays: Removed checking for leave types in the get_remaining days function as it was giving error at the time of module installation, no need to put any exception in the function which compute data, it will return 0 if no leave type found
bzr revid: rpa@tinyerp.com-20110622125314-mn4jllnsbjwy2sd8
2011-06-22 18:23:14 +05:30
Mantavya Gajjar 9e8eea64c7 [CHANGE]: better to have self then obj
bzr revid: mga@tinyerp.com-20110620060434-xu1ds231oyn339kb
2011-06-20 11:34:34 +05:30
Quentin (OpenERP) 833a99d777 [IMP] hr_holidays: code improvements
bzr revid: qdp-launchpad@openerp.com-20110610091728-e49r3pq8tey78dhx
2011-06-10 11:17:28 +02:00
mayur maheshwari (Open ERP) 185a3bf824 [IMP]delivery,hr_timesheet,hr_holidays:Improvement is Done
bzr revid: mma@tinyerp.com-20110606055814-xa0t1idnl6zuyxy0
2011-06-06 11:28:14 +05:30
mayur maheshwari (Open ERP) e1d6ace654 [MERGE]Merge with lp:~openerp-dev/openobject-addons/trunk-configuration-rework
bzr revid: mma@tinyerp.com-20110601125239-xe32ajnl2fkkwd3c
2011-06-01 18:22:39 +05:30
Quentin (OpenERP) de91919e21 [MERGE] hr_holidays: set legal leaves to employee. merged the branch from aag + improved error message and allow leave request too
bzr revid: qdp-launchpad@openerp.com-20110527130904-kfk41z65ghwv97fq
2011-05-27 15:09:04 +02:00
aag (OpenERP) 8c5726ef5f [IMP]hr_holidayse: raise an error if there are more than 1 leave type with "allow to override limit" = False, also if there is no such leave type
bzr revid: aag@tinyerp.co.in-20110527122656-rouugxlm417tj5fp
2011-05-27 17:56:56 +05:30
mayur maheshwari (Open ERP) 67998c4c64 [IMP]base_setup,hr_holidays,POS:Improvement is Done
bzr revid: mma@tinyerp.com-20110516125031-wgqpw1lgrk0wv3ew
2011-05-16 18:20:31 +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) 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) 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 2819a946b7 fixed typo and constraint
bzr revid: hda@hda-laptop-20110419065236-ugsbpsnu0myg3qs6
2011-04-19 12:22:36 +05:30
psi (Open ERP) 3e2d509684 [FIX] hr_holidays: Improve _sql_constraint and help
bzr revid: psi@tinyerp.co.in-20110419054451-7ien3mqbaqooozj3
2011-04-19 11:14:51 +05:30
Husen Daudi baf94ebf97 fixed workflow instance problem in hr_holidays
bzr revid: hda@hda-laptop-20110418110437-875ee2zci9s09ghk
2011-04-18 16:34:37 +05:30
ARA (OpenERP) 2199cd7f34 [FIX] hr_holiday: The Flow of Hr Holiday is working Wrong, it should Got to end at end but not to Second_validation or refuse.
bzr revid: ara@tinyerp.com-20110418092007-nus4n0g7lexwh7j1
2011-04-18 14:50:07 +05:30
Mustufa Rangwala 4429813887 [IMP] Holidays: State field tooltips
bzr revid: mra@mra-laptop-20110414101532-jceuzg8bx0el02p7
2011-04-14 15:45:32 +05:30
ARA (OpenERP) b62f16753d [FIX] hr_holidays: Can not refuse leave if its category is by employee category
lp bug: https://launchpad.net/bugs/731795 fixed

bzr revid: ara@tinyerp.com-20110310095432-s4q9ijdf21gp77sg
2011-03-10 15:24:32 +05:30
Mustufa Rangwala 19cf9e1054 [IMP] hr_holidays: case_id on holidays object type changed from char to m2o (crm.meeting)
bzr revid: mra@mra-laptop-20110201124038-fwehl3uq7qo3tp6v
2011-02-01 18:10:38 +05:30
Mustufa Rangwala 60ac3e49e1 [FIX] hr_holidays: can not refuse an approved holidays => due to case_id was char
lp bug: https://launchpad.net/bugs/709130 fixed

bzr revid: mra@mra-laptop-20110131064845-2joefqn4oqh1gob1
2011-01-31 12:18:45 +05:30
Thibault Francois 4de0ca454d [IMP,FIX] calendar, recurrent meeting now work correctlty, Finally grep -Rn -A 2 -B 2 --include=*.py print .
bzr revid: tfr@openerp.com-20110118223502-ws1rruwjrajv1xwz
2011-01-18 23:35:02 +01:00
Sbh (OpenERP) 922f7caae0 [Fix] Fix buildbot warning
bzr revid: sbh@tinyerp.com-20101230060952-p0ehq3mgx7cpbfqw
2010-12-30 11:39:52 +05:30
Fabien Pinckaers 65b33b9489 [FIX] Cleaning hr holidays reporting and dashbaords
bzr revid: fp@tinyerp.com-20101229165130-jfr2h23jo7mrjqzu
2010-12-29 17:51:30 +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
qdp-launchpad@tinyerp.com d6451e011d [FIX] hr_holidays: allocation request by category fixed
bzr revid: qdp-launchpad@tinyerp.com-20101220094513-i8glqkv8z0jcjx77
2010-12-20 10:45:13 +01:00
Mustufa Rangwala b0f61a9546 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
2010-12-17 10:07:32 +05:30
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
Mustufa Rangwala 8319012fca [FIX] hr_holidays: bad behaviour of allocation requests by categories
lp bug: https://launchpad.net/bugs/680487 fixed

bzr revid: mra@mra-laptop-20101209055040-ydvesuocrt0lvc9a
2010-12-09 11:20:40 +05:30
uco (OpenERP) 097ff85deb [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101123071135-712ya21x2v77mn36
2010-11-23 12:41:35 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
Olivier Dony e1d9d1d6c6 [FIX] stock,hr,pos,project,...: cleanup some calls to _( ) - only literal strings should ever been used!
bzr revid: odo@openerp.com-20101119122003-4r52xuupedyhgmcx
2010-11-19 13:20:03 +01:00
qdp-launchpad@tinyerp.com a4a0a99f0c [FIX] hr_holidays: typo fixed
bzr revid: qdp-launchpad@tinyerp.com-20101110112009-lxa40bj0y1x1d32d
2010-11-10 12:20:09 +01:00
Mustufa Rangwala 17a5fd4ee8 [REF]
bzr revid: mra@mra-laptop-20101027131019-mx6r2q7fgpnkh0sb
2010-10-27 18:40:19 +05:30
vth cd8e9de724 [REF] hr_*
bzr revid: vth@tinyerp.com-20101027124959-phubwje70rmbec4p
2010-10-27 18:19:59 +05:30
Fabien Pinckaers 130f43b1d9 [FIX] misc fixes from xrg
bzr revid: fp@tinyerp.com-20101017222708-71xbvzflx6pe797v
2010-10-18 00:27:08 +02:00
Fabien Pinckaers b3a6611ee0 [IMP] better useability
bzr revid: fp@tinyerp.com-20101012215940-yvnh0sog8voxiz85
2010-10-12 23:59:40 +02:00
Vir (Open ERP) a141d983d9 [MOD] hr_* : applied changes from usability branch
bzr revid: vir@tinyerp.com-20101008132247-3m1ff2ngm3im61pn
2010-10-08 18:52:47 +05:30
Vir (Open ERP) 54982725c8 [Merge]
bzr revid: vir@tinyerp.com-20100923044025-scructxgs60rbbdb
2010-09-23 10:10:25 +05:30
olt@tinyerp.com 627afe0258 [IMP] hr_holidays: hr.holidays.status: performance improvement: move sql query outside the loop
bzr revid: olt@tinyerp.com-20100922082353-kf95hdpfwzxtfoj6
2010-09-22 10:23:53 +02:00
DBR (OpenERP) ec32dee73b [MOD]hr_holidays : usability improvement
bzr revid: dbr@tinyerp.com-20100906104748-g8i4tbp6azddo4rt
2010-09-06 16:17:48 +05:30
AMP (OpenERP) 973cac1c4a [MOD]hr_holidays : usability improvement
bzr revid: amp@tinyerp.com-20100906094754-gvn1ww01h0m461b2
2010-09-06 15:17:54 +05:30
psi (Open ERP) da787061db [IMP] hr_* Clean the code
bzr revid: psi@tinyerp.co.in-20100826045204-lxfawwkq2be62e8s
2010-08-26 10:22:04 +05:30
RHA (Open ERP) d5ad0b8ff1 [CLEAN]: Removed commented codes, unnecessary spaces.
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
2010-08-19 17:21:57 +05:30
vra 279d41f156 [FIX][ADD][IMP] hr_holidays: fixed the used 'category_ids'(M2M) field of employee, Added calendar view of Leave Request Object, Improved the menu string.
bzr revid: vra@tinyerp.com-20100812072802-89kthus9a1ewqbop
2010-08-12 12:58:02 +05:30
PSI(Openerp) 0f42beb105 [FIX] hr_holidays: if there is not employee on allocation request
bzr revid: mra@mra-laptop-20100802103153-q98sm13e63d5hus3
2010-08-02 16:01:53 +05:30