Denis Ledoux
291bc4a69d
[FIX] hr_holidays: on change holiday type to employee tag, set employee to False.
...
Otherwise, the user who creates the allocation request by employee tag will benefit of the leaves he just entered, twice if he has the employee tag, once if has not the employee tag(and in this last case, he should not have this leave allocation, as he do not have the tag
bzr revid: dle@openerp.com-20131211180025-pg8kf13bt6d1vk9l
2013-12-11 19:00:25 +01:00
Olivier Dony
a0fab67694
[FIX] hr_holidays: leave holiday overlap should ignore cancelled/refused ones
...
Obviously a cancelled leave does not really
overlap with a new one.
bzr revid: odo@openerp.com-20131023162928-56vdsjxr8sa4n3jv
2013-10-23 18:29:28 +02:00
Olivier Dony
58928c5c4c
[FIX] hr_holidays: force draft.@flow_start to False to correctly update existing databases + fix validation logic
...
The check_holidays() validation was not working correctly
because it was called both before and after inserting new
leave requests, with inconsistent results.
Using it as a fixed constraint is simpler.
bzr revid: odo@openerp.com-20131015165416-in0rfd7rrjmekv0g
2013-10-15 18:54:16 +02:00
Thibault Delavallée
08b0784e76
[IMP] hr_holidays:
...
- added a workflow transition from refuse to draft, to allow resetting
a refused request
- resetting is now based on a can_reset field, taht is based on whether
it is my own request or I am an hr manager
- added an access right on crm_meeting that was preventing hr officers
to validate some requests
- improved form view to show reset to draft button accordingly
- added tests that helped trigerred the various bugs and improvements
bzr revid: tde@openerp.com-20130809144752-o21pjbc56o0t8fym
2013-08-09 16:47:52 +02:00
Thibault Delavallée
7f1e1c7246
[IMP] hr_holidays: workflow update
...
starts in confirm
from confirm, possible to get back to draft with reset signal, calling old set_to_draft, now
renamed holidays_reset, in the same workflow
from draft, possible to go to confirm
bzr revid: tde@openerp.com-20130805113023-1cs1s18dd5m4mi20
2013-08-05 13:30:23 +02:00
Thibault Delavallée
a87af992bb
[IMP] hr_holidays: cleaning + improve check_holidays
...
bzr revid: tde@openerp.com-20130724122754-59xa1k8vo81dsb7b
2013-07-24 14:27:54 +02:00
Thibault Delavallée
56b10caba5
[IMP] hr_holidays: also calculates virutal remaining leaves
...
bzr revid: tde@openerp.com-20130724112130-3tsptifx6er4yww4
2013-07-24 13:21:30 +02:00
Amit Bhavsar (Open ERP)
98f39f9d22
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130701111430-t5qp9hm97rkmjpsp
2013-07-01 16:44:30 +05:30
Thibault Delavallée
bf4ada34b4
[REF] mail_thread: message_track now uses browse records instead of read results.
...
Updated addons accordingly.
Updated tests to test corner cases using False / null browse records.
bzr revid: tde@openerp.com-20130627144647-swbj77i84vo9ii0v
2013-06-27 16:46:47 +02:00
Vishmita Jadeja (openerp)
fe128d7498
[Merge]Merge lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130418090337-51vfkhfl3lzg7mpf
2013-04-18 14:33:37 +05:30
Thibault Delavallée
efceba5b8b
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130416073641-pcelb6zsq8dg56wb
2013-04-16 09:36:41 +02:00
Thibault Delavallée
812c852fd0
[FORWARD] Merged 7.0 addons revisions until 9021
...
bzr revid: tde@openerp.com-20130415084302-hx7zxtpl5u6yphfg
bzr revid: tde@openerp.com-20130415153732-v4ols3t56rku92oz
2013-04-15 17:37:32 +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
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Christophe Matthieu
53f168daaf
[FIX] hr_holidays: traceback when the user change remaining_leaves value. Wrong reference python object: holiday_obj
...
bzr revid: chm@openerp.com-20130415093726-x2lsmf54xiqc0lng
2013-04-15 11:37:26 +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
Quentin (OpenERP)
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Fabien Pinckaers
04b3755083
[IMP] holiday request from employee form
...
bzr revid: fp@openerp.com-20130224132111-vmrxhig1puc7yh60
2013-02-24 14:21:11 +01:00
Tejas Tank
026e53d27a
[IMP] [Leaves] Context problem: creating a leave from the employee form.
...
bzr revid: tta@openerp.com-20130211105701-gzl5vsmx01ckdled
2013-02-11 16:27:01 +05:30
Ajay Chauhan (OpenERP)
f3c4e973cd
[FIX] hr_holidays: did some changes.
...
bzr revid: cha@tinyerp.com-20130201084404-uanxza6nx80l8pn9
2013-02-01 14:14:04 +05:30
Ajay Chauhan (OpenERP)
02a2c8574d
[IMP] hr_holidays:use the new ORM methods create_workflow, delete_workflow, redirect_workflow.
...
bzr revid: cha@tinyerp.com-20130130095903-6exhtm6uruk0ek30
2013-01-30 15:29:03 +05:30
Vo Minh Thu
8d50446d27
[IMP] hr_holidays: use the new signal_xxx methods instead of trg_validate.
...
bzr revid: vmt@openerp.com-20130128141623-4rxcgqx7t33yydbp
2013-01-28 15:16:23 +01:00
Vishmita
1c8227eb7d
[Merge]Merge lp:openerp-addons
...
bzr revid: vja@tinyerp.com-20130128052704-jgcoeaqrodx2wlw8
2013-01-28 10:57:04 +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
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
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
ggh-openerp
3d3e08913d
[IMP] Improve hr_holidays tooltip
...
bzr revid: ggh@tinyerp.com-20121214103701-h9i7s9si1lwzqtdc
2012-12-14 16:07:01 +05:30
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