Commit Graph
347 Commits
Author SHA1 Message Date
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
Rvo(Open ERP) 8147f311c3 [MERGE] merged refactoring of superfluous "My ..." buttons in search views
bzr revid: odo@openerp.com-20100519134531-eb6ki0snr5e0xr41
2010-05-19 15:45:31 +02:00
apa-tiny 3651dde82c [MERGED]
bzr revid: apa@tinyerp.com-20100519092629-u3mfxtul93hp1q7g
2010-05-19 14:56:29 +05:30
mra (Open ERP) 94e99e0bd1 [MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100519062007-0rynghgrxpmfn49f
2010-05-19 11:50:07 +05:30
Launchpad Code Hosting 27dca2a6c7 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100519051216-2hu0shg576awh8rk
2010-05-19 06:12:16 +01:00
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) a938cbb9d4 [IMP] hr_holidays: Reports improved for holidays with category wise also
bzr revid: mra@tinyerp.com-20100518102525-gs25stucjcwkf7x4
2010-05-18 15:55:25 +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
Vir (Open ERP) 441d653c59 [Merge] Merge with trunk addons
bzr revid: vir@tinyerp.com-20100514104208-jqi5k13n7k3bg1w0
2010-05-14 16:12:08 +05:30
psi (Open ERP) 5d74da23f5 [MERGE] merge with dev3 branch
bzr revid: psi@tinyerp.co.in-20100514093539-nf5f0iddmm52wily
2010-05-14 15:05:39 +05:30
psi (Open ERP) b6d9cc184e [MERGE] merge with dev3 branch
bzr revid: psi@tinyerp.co.in-20100514091714-y1xdnk7ud1b465y1
2010-05-14 14:47:14 +05:30
psi (Open ERP) 22e38ea30b [IMP] (task id=740) changes according to technical meeting review
bzr revid: psi@tinyerp.co.in-20100514091502-ln2doe2ev1h70q58
2010-05-14 14:45:02 +05:30
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
Vir (Open ERP) bba3dcfe5a [MOD] general usability chabges
bzr revid: vir@tinyerp.com-20100513132923-y3uo7pzwmqhfmc91
2010-05-13 18:59:23 +05:30
Rvo (Open ERP) 8728f6bd0a [IMP,REM]: removed my_button from search view and set it as search_default_field_name:value
bzr revid: rvo@tinyerp.co.in-20100513131719-tw1z2sl5fgagxnil
2010-05-13 18:47:19 +05:30
mra (Open ERP) 02cad04eda [MERGE]
bzr revid: mra@tinyerp.com-20100513121431-t2d189xl3s0swpxf
2010-05-13 17:44: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
apa-tiny b4de923a5a merge
bzr revid: apa@tinyerp.com-20100513052224-eyfh3i918xyyodb3
2010-05-13 10:52:24 +05:30
mra (Open ERP) 47ad2debc5 [MERGE]
bzr revid: mra@tinyerp.com-20100513045245-q9rgkzbbr9b0f1jt
2010-05-13 10:22:45 +05:30
Launchpad Code Hosting cf6db2b993 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100513043701-41cmj2olsqommizr
2010-05-13 05:37:01 +01:00
Fabien Pinckaers a15093819a merge
bzr revid: fp@tinyerp.com-20100512170920-0mgiujrnhkt5t6z7
2010-05-12 19:09:20 +02:00
mra (Open ERP) e19d54b84c [MERGE]
bzr revid: mra@tinyerp.com-20100512140224-35q7rp2s9f2hcn2u
2010-05-12 19:32:24 +05:30
vra d573aba827 [MERGE] merged from trunk main addons branch
bzr revid: vra@tinyerp.com-20100512114348-lck7xpps38bqbxza
2010-05-12 17:13:48 +05:30
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
Rvo (Open ERP) 220d5b2f37 [IMP]: usability of HR
bzr revid: rvo@tinyerp.co.in-20100510125915-dqiyo6eeuygftuhc
2010-05-10 18:29:15 +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
apa-tiny 1985469856 merge
bzr revid: apa@tinyerp.com-20100506125134-7e0vgt6m32sl8mmf
bzr revid: apa@tinyerp.com-20100510044949-nvqciion3mkozsf8
2010-05-10 10:19: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
Launchpad Code Hosting bde8ea7fdc Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100508040513-p3elhkh9rqj55rxm
bzr revid: codehost@crowberry-20100510041751-yaaphx6tqpaf0glb
2010-05-10 05:17:51 +01:00
mra (Open ERP) 0708546deb [MERGE]
bzr revid: mra@tinyerp.com-20100510035822-kd0y4lsglr5o5qa0
2010-05-10 09:28:22 +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
apa-tiny 57f0a4c738 merge
bzr revid: apa@tinyerp.com-20100505045927-zzdg9yqdzt27x5lz
2010-05-05 10:29:27 +05:30
mra (Open ERP) 3ddccc2971 [MERGE]
bzr revid: mra@tinyerp.com-20100505035153-zly81r77vq7arhtu
2010-05-05 09:21:53 +05:30
Launchpad Code Hosting 6bdf0db637 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100505034816-w6vkp8pe29vr2c1b
2010-05-05 04:48:16 +01:00