Commit Graph

64 Commits

Author SHA1 Message Date
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
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