Denis Ledoux
9b3f3fecfe
[FIX] hr_holidays: employees cannot approve their holidays
...
Nor modify once approved
It wasn't possible for employees to approve their holidays themself, thanks to the GUI, but this was possible through xmlrpc calls, or when altering the html directly in the browser.
Besides, this was also possible to edit the holiday through the same trick once the holiday validated
2014-08-25 14:51:03 +02:00
Denis Ledoux
ced5852144
[FIX] hr_holidays: do not allow reduce remaining leaves
...
In the Employee form, a remaining legal leaves field is available, which shows remaining validated leaves from allocation requests
As this is not allowed to delete a validated allocation requets, it shouldn't be possible to reduce the validated remaining leaves of an employee.
To reduce the remaining leaves of an employee, the user should cancel and remove the allocation request
2014-07-25 14:45:48 +02:00
Olivier Dony
1279ca0334
[FIX] hr_holidays: proper parameter passing syntax for raw SQL
...
This instance was not actually exploitable for
SQL injection as it is not callable directly
via RPC and guarded by other queries when indirectly
called. Still plain awful.
2014-07-04 16:45:41 +02:00
Thibault Delavallée
4e0559ef97
[FIX] hr_holidays: display float for leaves remaining / leaves taken in holiday type name get
2014-06-13 08:52:25 +02:00
Martin Trigaux
c636fb9dd9
[FIX] hr_holidays: better display of leave counter (opw 605016)
...
The number of leave requests left is based on the employee_id key in the context, when displaying the status of an hr.holidays we don't have the information in the name_get of the hr.holidays.status.
The fallback on the number of employees is done with the uid but we can not rely on it as well as the name_get on m2o field is done with superuser_id.
bzr revid: mat@openerp.com-20140508124946-ttyr84iajg9q6l0y
2014-05-08 14:49:46 +02:00
Quentin (OpenERP)
273a82cc0d
[FIX] hr: typo in welcome message + [IMP] hr_holidays: better message when a constraint is fired
...
bzr revid: qdp-launchpad@openerp.com-20130415150655-ltlkfqy03jj1xgxa
2013-04-15 17:06:55 +02:00
Josse Colpaert
51ba970efa
[FIX] Clarify no employee message for leave requests + typo please help them
...
bzr revid: jco@openerp.com-20130408150635-iguk7xhn4xx84vo0
2013-04-08 17:06:35 +02:00
Nimesh (Open ERP)
555b2cbd26
[FIX] duplicate a holiday request.
...
bzr revid: nco@tinyerp.com-20121221102056-ojgcvllqtnxeuk8e
2012-12-21 15:50:56 +05:30
Thibault Delavallée
2156c83687
[IMP] hr_holidays: removed 'document created' automatic log, as the request is automatically confirmed, leading to a status update message that is now the first message logged.
...
bzr revid: tde@openerp.com-20130104145030-6t6jtu4chizgs3jk
2013-01-04 15:50:30 +01:00
Thibault Delavallée
e3c31cab9e
[IMP] track_visibility atribute: moved onto explicit strings.
...
bzr revid: tde@openerp.com-20121220114730-nip8qaaajr5mqw6s
2012-12-20 12:47:30 +01:00
Thibault Delavallée
331e420a55
[FIX] needaction: fixed last commit, harmonizing the parameters of the various needaction_domain_get.
...
bzr revid: tde@openerp.com-20121220110242-ot9ha7rt1ofyjoj5
2012-12-20 12:02:42 +01:00
Thibault Delavallée
d737a7f098
[IMP] sale, purchase, hr_timesheet_sheet, hr_holidays, event, crm_meeting: fixed, improved and cleaned needaction_domain_get.
...
bzr revid: tde@openerp.com-20121220100005-d0r0se41fx83w38c
2012-12-20 11:00:05 +01:00
Fabien Pinckaers
065821dfd6
[MOD] use read() instead of browse
...
bzr revid: fp@tinyerp.com-20121218234907-j672neyvifmo4bur
2012-12-19 00:49:07 +01:00
Thibault Delavallée
1efb2d6b0b
[REF] Hr_expense: added track on state, _track for subtypes, removed extra chatter messages.
...
bzr revid: tde@openerp.com-20121218165708-iij5o20k78m4xyax
2012-12-18 17:57:08 +01:00
Thibault Delavallée
6dc32eb287
[REF] Hr_holidays: used track_visibility and _track, removed extra chatter messages.
...
bzr revid: tde@openerp.com-20121218164217-0kn9hu9yrgkl0x8n
2012-12-18 17:42:17 +01:00
Thibault Delavallée
b95b32d644
[MERGE] Merged branch holding subtype work by APA.
...
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
Vo Minh Thu
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Foram Katharotiya (OpenERP)
955f2588a2
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121210045724-sk2hk8mmi8iahfwn
2012-12-10 10:27:24 +05:30
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Tejas Tank
f15d9483c2
Merged Latest.
...
bzr revid: tta@openerp.com-20121130093948-96mo9zas2w27jizj
2012-11-30 14:39:48 +05:00
Sanjay Gohel (Open ERP)
069d2878d3
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121128045539-fgmakwnhizu321rv
2012-11-28 10:25:39 +05:30
Fabien Pinckaers
10afab6eb6
[MERGE] addons 24
...
bzr revid: fp@openerp.com-20121127212322-soubdlrcgqx4cz88
2012-11-27 22:23:22 +01:00
Sanjay Gohel (Open ERP)
257bc28f47
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121127132410-97fdoscu8mhg7d6r
2012-11-27 18:54:10 +05:30
Tejas Tank
68ec7ac94e
Improved English Typos.
...
bzr revid: tta@openerp.com-20121120132926-zbczsj0p61ti1y57
2012-11-20 18:59:26 +05:30
Sanjay Gohel (Open ERP)
06a9cf6e1c
[IMP]remove unnecessary tooltip
...
bzr revid: sgo@tinyerp.com-20121120113308-i3ibj30m17ginea4
2012-11-20 17:03:08 +05:30
Khushboo Bhatt (Open ERP)
a56728dbc7
[Add]hr_holidays:improved code of subtype
...
bzr revid: kbh@tinyerp.com-20121120071911-z6saaldgglcr1bz2
2012-11-20 12:49:11 +05:30
Vijaykumar Baladaniya
097d4778e1
[IMP] Improve hr leaves.
...
bzr revid: vba@tinyerp.com-20121119092053-u8l4ofl6ndegumsb
2012-11-19 14:50:53 +05:30
Bharat Devnani (OpenERP)
6250b94faf
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20121112115222-chcgfvhm2cljpybn
bzr revid: bde@tinyerp.com-20121119091444-xpdvczqzrmk6nk5b
2012-11-19 14:44:44 +05:30
Pinakin Nayi (OpenERP)
d987291a63
[IMP]hr_timesheet_shhet add chatter
...
bzr revid: pna@tinyerp.com-20121112095424-p3z0bwx1f38nbv4n
2012-11-12 15:24:24 +05:30
Fabien Pinckaers
83c89a1c42
[FIX]
...
bzr revid: fp@openerp.com-20121110151229-dqgjr9l9scr4y8zq
2012-11-10 16:12:29 +01:00
Fabien Pinckaers
b5013ea195
[MERGE] misc improvements account, hr, crm, project
...
bzr revid: fp@openerp.com-20121110140519-z8x4ruqed7voa8rd
2012-11-10 15:05:19 +01:00
Atul Patel (OpenERP)
16d71823e4
[MERGE]:Merged wtih lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121109044947-n81qke33jp9p30af
2012-11-09 10:19:47 +05:30
Atul Patel (OpenERP)
428f1285d0
[MERGE]: Merged tpa branch for adding remaining days in leave types dropdown
...
bzr revid: atp@tinyerp.com-20121108033818-qmwoscdse0i6t6oc
2012-11-08 09:08:18 +05:30
Fabien Pinckaers
574405bed8
[MERGE] HR fixes
...
bzr revid: fp@tinyerp.com-20121108092451-2jk31s913mrat1jm
2012-11-08 10:24:51 +01:00
Turkesh Patel (Open ERP)
bc6747de0b
[IMP] hr_holidays: show the number of remaining days in the dropdown of leave types.
...
bzr revid: tpa@tinyerp.com-20121107112807-yb3g23qk0hy13lxy
2012-11-07 16:58:07 +05:30
Atul Patel (OpenERP)
58f5269f11
[FIX]: fix validation problem
...
bzr revid: atp@tinyerp.com-20121107061152-ch2ti57eezbw2xo8
2012-11-07 11:41:52 +05:30
Atul Patel (OpenERP)
cda1256ae8
[FIX]: Fix condition for validate holidays
...
bzr revid: atp@tinyerp.com-20121107055310-2t4j7ftz7ax4ci92
2012-11-07 11:23:10 +05:30
Atul Patel (OpenERP)
c6010c04b8
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121107043932-idazuoqwrhgha1xw
2012-11-07 10:09:32 +05:30
Atul Patel (OpenERP)
ae6287e763
[MERGE]: Merged pja branch
...
bzr revid: atp@tinyerp.com-20121106152644-cl3xcd54dlbteg9n
2012-11-06 20:56:44 +05:30
Atul Patel (OpenERP)
54fb04a368
[FIX]: Add constraints to fix same day overlaps problem
...
bzr revid: atp@tinyerp.com-20121106135515-3pp7rsrtnspvb28g
2012-11-06 19:25:15 +05:30
Jalpesh Patel (OpenERP)
a1fa0d61d6
[IMP]don't modify leave request in validate state
...
bzr revid: pja@tinyerp.com-20121106132025-9wrimitdry3bi7kk
2012-11-06 18:50:25 +05:30
Antonin Bourguignon
88f06c467c
[IMP] use tools.DEFAULT_SERVER_DATETIME_FORMAT
...
bzr revid: abo@openerp.com-20121105170318-fmq31jsjf1xriqnh
2012-11-05 18:03:18 +01:00
Antonin Bourguignon
cf4f0a1021
[WIP] better management of start and end dates
...
bzr revid: abo@openerp.com-20121105133229-e3qge2pid9j6u4ck
2012-11-05 14:32:29 +01:00
Antonin Bourguignon
d74d5d3949
[WIP] better management of start and end dates
...
bzr revid: abo@openerp.com-20121031180053-vjxk5m6i4k66c0up
2012-10-31 19:00:53 +01:00
Antonin Bourguignon
193882a19c
[IMP] remove whitespaces
...
bzr revid: abo@openerp.com-20121031173255-zj5ewj0sqvj6qmca
2012-10-31 18:32:55 +01:00
Turkesh Patel (Open ERP)
4a75f8698f
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-10click-hr
...
bzr revid: tpa@tinyerp.com-20121029095811-22t0bop2o5da96g3
2012-10-29 15:28:11 +05:30
ajay javiya (OpenERP)
69ef2bc46c
[IMP]: Improve onchange for leave request
...
bzr revid: aja@tinyerp.com-20121029090423-at3i0byeamhvgg1z
2012-10-29 14:34:23 +05:30
ajay javiya (OpenERP)
f95608ae89
[ADD]:Add onchange for contact from and leave request
...
bzr revid: aja@tinyerp.com-20121029083414-4bw6i8ii72wctevk
2012-10-29 14:04:14 +05:30
Turkesh Patel (Open ERP)
ffc347d3ae
[IMP] hr_holidays: add onchange on employee_id field to change department also.
...
bzr revid: tpa@tinyerp.com-20121029071409-r8z0q8fko35gnsjy
2012-10-29 12:44:09 +05:30
Mayur Maheshwari (OpenERP)
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30