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 |
|
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 |