Commit Graph

300 Commits

Author SHA1 Message Date
Mustufa Rangwala a7e16487e4 [IMP] Hr_holidays: Improve the code by making generic method for context lang get
bzr revid: mra@mra-laptop-20110630092905-4ggbh1i7bnm7ibqb
2011-06-30 14:59:05 +05:30
mtr c2ba873ab8 [IMP] hr_holidays: improved code for translation using context
bzr revid: mtr@mtr-20110630083602-au21nsi3yyw97qnp
2011-06-30 14:06:02 +05:30
mtr 5cc4b243b6 [FIX] hr_holidays:-Exception raised on confirmation of leave request is now translated in user's lang.
lp bug: https://launchpad.net/bugs/798739 fixed

bzr revid: mtr@mtr-20110628114633-78h4k4q3d8jectjo
2011-06-28 17:16:33 +05:30
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
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
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) 9d1c65eb21 [FIX] hr_holidays: Second validation
bzr revid: ara@tinyerp.com-20110329113117-yxldstrlmf4x0mpn
2011-03-29 17:01:17 +05:30
ARA (OpenERP) a3a1034596 [FIX] hr_holidays: Second validation
bzr revid: ara@tinyerp.com-20110324111833-fc0hk683vntzmetl
2011-03-24 16:48:33 +05:30
ARA (OpenERP) b71aa291ba [FIX] hr_holidays: Second validation
lp bug: https://launchpad.net/bugs/732419 fixed

bzr revid: ara@tinyerp.com-20110322100447-ey5tkdusd3l76at5
2011-03-22 15:34:47 +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
PSI(Openerp) b24856fd7a [IMP] hr related modules changes
bzr revid: mra@mra-laptop-20100728123948-5v34vtjrxckvig14
2010-07-28 18:09:48 +05:30
PSI (OpenERP) 4b1348a989 [IMP] hr related modules improvements
bzr revid: mra@mra-laptop-20100727071145-4n3z9i1jj1zosp8z
2010-07-27 12:41:45 +05:30
Mustufa Rangwala c179005fc7 [IMP] Clean hr_* module (Still need to done)
bzr revid: mra@mra-laptop-20100703102152-4ulrrzbkorpd7xei
2010-07-03 15:51:52 +05:30
vra bf8d2a73c0 [IMP][REF] Sql-injection changes, remove print statement, some space improvement.
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
2010-06-16 17:21:39 +05:30
mra (Open ERP) 41d68124f2 [IMP] hr_holidays: search view of holidays minir improve
bzr revid: mra@tinyerp.com-20100526101925-me6z7t6bt9eq0s6a
2010-05-26 15:49:25 +05:30
mra (Open ERP) f1d7c9a0a3 [IMP] hr_holidays: improve code: Made separate method for creating and removing resoure leave
bzr revid: mra@tinyerp.com-20100526095456-l4vxnyrszenx2e8v
2010-05-26 15:24:56 +05:30
psi (Open ERP) 46c1bd4e24 [IMP] hr_holidays: Improve view and change in demo data
bzr revid: psi@tinyerp.co.in-20100524073052-0gumt324nzs34wsr
2010-05-24 13:00:52 +05:30
psi (Open ERP) 174162b344 [IMP] hr_holidays: Bug fix and Improve demo data
bzr revid: psi@tinyerp.co.in-20100521134658-wo4egxgfu57qk6c2
2010-05-21 19:16:58 +05:30
psi (Open ERP) e22621085b [IMP] hr_holidays: Improve views and misc changes
bzr revid: psi@tinyerp.co.in-20100521105815-nksa5emczxbal238
2010-05-21 16:28:15 +05:30
psi (Open ERP) 48e2594272 [IMP] hr_holidays: Improve demo data, hr_timesheet_invoice:Imoprove search view
bzr revid: psi@tinyerp.co.in-20100521064654-buj0bu0pwaxfj8eu
2010-05-21 12:16:54 +05:30
psi (Open ERP) 7be3eedde5 [ADD] hr_holidays: Added demo data and improve search view
bzr revid: psi@tinyerp.co.in-20100520112131-9knxyo6soclkzt32
2010-05-20 16:51:31 +05:30
mra (Open ERP) 38dd957438 [MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
2010-05-20 09:46:31 +05:30
Fabien Pinckaers a3dd9f05dc [FIX] 3 security rules, [IMP] object names for logs
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
2010-05-19 20:32:32 +02:00
Jay (Open ERP) 206aad724a [BACKPORT] Stable fixes and refactorings to trunk
bzr revid: jvo@tinyerp.com-20100519155731-ihlx53vj31ni7d01
2010-05-19 21:27:31 +05:30
Jay (Open ERP) 50724c0a0f [MERGE] MErged from main branch
bzr revid: jvo@tinyerp.com-20100519145940-s8tk9v6lmxkp6idg
2010-05-19 20:29:40 +05:30
mra (Open ERP) 7f5c8bc140 [IMP] hr_holidays: now it will create entry in resouce.cal.leaves if request is for category wise => it will search all employee in category and create leaves for each
bzr revid: mra@tinyerp.com-20100518104030-3widlfi7j4zviqhv
2010-05-18 16:10:30 +05:30
mra (Open ERP) f065d01dfc [IMP] hr: Add category field on employee form view
[FIX] hr_holidays: fix some errors

bzr revid: mra@tinyerp.com-20100518062616-wgvs7cv6gq14n9ee
2010-05-18 11:56:16 +05:30
mra (Open ERP) adb80ffeb4 [MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100517045150-h7n3ob8hv40ep4pj
2010-05-17 10:21:50 +05:30
vra 4df75b6474 [MERGE] merged from trunk main addons branch
bzr revid: vra@tinyerp.com-20100517042328-l25ofg3t0kioeuep
2010-05-17 09:53:28 +05:30
Julien Thewys 1b559b75b3 [REF] Removed unused imports.
bzr revid: jth@openerp.com-20100514154102-z1vwoyyzeaz2i5t5
2010-05-14 17:41:02 +02:00
Julien Thewys c39cf90a90 [REF] redefined a dict with a dict literal
bzr revid: jth@openerp.com-20100514152516-rd70n272tzp0ue0y
2010-05-14 17:25:16 +02:00
Julien Thewys 27409d9bc2 [REF] factored onchange_date_to
bzr revid: jth@openerp.com-20100514152219-v9nmmkt1fy734mfj
2010-05-14 17:22:19 +02:00
Julien Thewys 1cf2760087 [REF] extract difference of datetime string as a method
bzr revid: jth@openerp.com-20100514151857-pdyiq7cr9eto486b
2010-05-14 17:18:57 +02:00
Julien Thewys 5709d04ce1 [FIX] fixed variable initialization
bzr revid: jth@openerp.com-20100514144647-pal5y6ubndtz0oai
2010-05-14 16:46:47 +02:00
mra (Open ERP) 8cc68f9e66 [IMP] hr_holidays: Workflow with second validator
bzr revid: mra@tinyerp.com-20100514091331-iafdwpxf958lrm5j
2010-05-14 14:43:31 +05:30
vra db8bacf126 [MERGE] merged from trunk main addons branch
bzr revid: vra@tinyerp.com-20100513052734-3uw250l2lmnmykr2
2010-05-13 10:57:34 +05:30
mra (Open ERP) 47ad2debc5 [MERGE]
bzr revid: mra@tinyerp.com-20100513045245-q9rgkzbbr9b0f1jt
2010-05-13 10:22:45 +05:30
Fabien Pinckaers a15093819a merge
bzr revid: fp@tinyerp.com-20100512170920-0mgiujrnhkt5t6z7
2010-05-12 19:09:20 +02:00
mra (Open ERP) ced16487d9 [IMP] hr_holidays: unlink resource leave at the time of cancel/delete
[IMP] resource: improve view

bzr revid: mra@tinyerp.com-20100511122851-yz9pb12mfzue6e8c
2010-05-11 17:58:51 +05:30
JMA (OpenERP) f495432c7f [FIX] Hr_holidays : Constraint corrected for Holidays request(start date cannot be greater than end date)
bzr revid: jma@tinyerp.com-20100511103248-g1s0vdpkh30w1v99
2010-05-11 16:02:48 +05:30
mra (Open ERP) ee2e1acc78 [FIX] hr_holidays: double validation
bzr revid: mra@tinyerp.com-20100511095944-yec60szfohq295t7
2010-05-11 15:29:44 +05:30
mra (Open ERP) f0c3f1ba59 [IMP] hr_holidays: put a boolean on the holiday type like 'double-validation holiday type', means this leave type will have to be validated by 2 people => the workflow have to be adapted (one more activity, automatic transition if boolean = false), there should be a new state for the object, there should also be a second 'validator' (m2o: user_id) that is saved when the leave/allocation is validated the second time
bzr revid: mra@tinyerp.com-20100510105832-pixohghomphs57c4
2010-05-10 16:28:32 +05:30
mra (Open ERP) b440209425 [IMP] hr_holidays
bzr revid: mra@tinyerp.com-20100510050956-o8hs4lqv9id3x5nw
2010-05-10 10:39:56 +05:30
mra (Open ERP) 1eeb22c582 [IMP] hr_holidays: onchange on holiday/allocatio type
bzr revid: mra@tinyerp.com-20100510045649-kd0ui26wrde9olqp
2010-05-10 10:26:49 +05:30
mra (Open ERP) 5b48fdc693 [IMP] hr_holidays: View improve
bzr revid: mra@tinyerp.com-20100510042853-ksgde7tujosdklfj
2010-05-10 09:58:53 +05:30
mra (Open ERP) 418ac79d94 [FIX] hr_holidays: Small fix
bzr revid: mra@tinyerp.com-20100510035307-enrmmdem5e0d795q
2010-05-10 09:23:07 +05:30
mra (Open ERP) 59ae3500aa [IMP] hr_holidays: currently we can make holiday/allocation request for one employee or for all employees. We also need to be able to select a category of employee (senior developers, sale departement employees, indian workers...) to make an holiday/allocation request
bzr revid: mra@tinyerp.com-20100505121858-52hyoatt80hmqtjq
2010-05-05 17:48:58 +05:30
mra (Open ERP) 3dade4254f [IMP] hr_holidays: Improve code
bzr revid: mra@tinyerp.com-20100504111918-h39dbg6hpno86uda
2010-05-04 16:49:18 +05:30
Stephane Wirtel 5142d98b30 [FIX] Remove the executable flag on the python and xml files
bzr revid: stephane@openerp.com-20100429080154-kmn18r5kci0uq84u
2010-04-29 10:01:54 +02:00
mra (Open ERP) 8896febf11 [FIX] hr_holidays: if there is employee has no user (computing hours on holiday status)
bzr revid: mra@tinyerp.com-20100416130503-eldr1mqv6mt9kpdf
2010-04-16 18:35:03 +05:30
Fabien Pinckaers c095986949 [IMP] Hr improvements
bzr revid: fp@tinyerp.com-20100407104120-2wn2e6sz52ipk3dm
2010-04-07 12:41:20 +02:00
Fabien Pinckaers 185277bdff [IMP] improvements in hr modules
bzr revid: fp@tinyerp.com-20100407095457-ufpmz8rrdu7i39cx
2010-04-07 11:54:57 +02:00
Fabien Pinckaers d9a506bb4c merge
bzr revid: fp@tinyerp.com-20100406161510-u7t9vi4kxlm30l6y
2010-04-06 18:15:10 +02:00
mra (Open ERP) d4f105df69 Merge with main branch
bzr revid: mra@tinyerp.com-20100322115529-e74miwjdolyba418
2010-03-22 17:25:29 +05:30
mra (Open ERP) 73aeefb0a3 merge with main branch
bzr revid: mra@tinyerp.com-20100317143933-n3k55ixfqgc6iwan
bzr revid: mra@tinyerp.com-20100318045146-p9khp3ilkz8ugt34
bzr revid: mra@tinyerp.com-20100318045602-6u5c66thniva7fc1
2010-03-18 10:26:02 +05:30
mra (Open ERP) 1ca89e906d [IMP] hr_holidays: search view for holiday per user and rename files
bzr revid: mra@tinyerp.com-20100317130209-yyy28bbpj0pa0p8x
2010-03-17 18:32:09 +05:30