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 |