odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
83,357 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

1685 Commits

Author SHA1 Message Date
Martin Trigaux 6d41af4432 Forward port of branch 7.0 up to d80c0ff 2015-01-05 12:41:05 +01:00
Yannick Vaucher 5906f10436 [FIX] hr_holidays: Add missing context check 
Backport of ead3f03
Fixes #4341
 2015-01-05 11:37:15 +01:00
Christophe Simonis b67eb530b0 [FIX] hr_holidays: remove now invalid xml attribute "model" (introduced by last forward-port) 2014-08-28 17:17:10 +02:00
Christophe Simonis ada9724655 [MERGE] forward port of branch 7.0 up to 3509e15 2014-08-28 16:12:55 +02:00
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
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations 
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
 2014-08-14 02:24:24 +02:00
Denis Ledoux 6b1a804b29 [MERGE] forward port of branch 7.0 up to b91a75f7ef 
Conflicts:
	addons/base_vat/base_vat.py
	openerp/tools/safe_eval.py
 2014-07-29 10:42:50 +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
Christophe Simonis a35aec2a0b [MERGE] forward port of branch 7.0 up to 6e96ffd 2014-07-10 22:02:01 +02:00
antonylesuisse 6b274e4451 Merge pull request #946 from joshuajan/7.0_hr_holidays_report_fix 
skip the inactivate employee in leaves summary
 2014-07-07 20:48:19 +02:00
JoshuaJan 6c776d5406 Update holidays_summary_report.py 2014-07-07 18:17:20 +08:00
JoshuaJan 9da1214de3 Update holidays_summary_report.py 
Add context to search method
 2014-07-07 17:30:25 +08:00
JoshuaJan 6c623b59b5 skip the inactivate employee in leaves summary 2014-07-06 17:41:07 +08:00
Olivier Dony f3880a8a09 [MERGE] Forward-port of 7.0 up to 64ac1b0 2014-07-04 17:07:53 +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
Denis Ledoux 3c0292645f [MERGE] Forward-port of 7.0 bugfixes up to 63ea0df73f 2014-06-16 17:37:10 +02:00
Thibault Delavallée 2f43cf041d [FIX] hr_holidays: date_from, date_to required in form view only for leave requests, not for allocation requests 2014-06-13 09:25:48 +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 8ea4f581ed Forward-port of latest 7.0, up to rev. 10046 (rev-id: launchpad_translations_on_behalf_of_openerp-20140514062049-vjclnuxlkbto0tsj) 2014-05-14 10:04:16 +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
Launchpad Translations on behalf of openerp fdfcb6bf47 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
 2014-04-29 06:41:21 +00:00
Launchpad Translations on behalf of openerp 0811d29337 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140409070627-o5ns6nniq2dc1lme
 2014-04-09 07:06:27 +00:00
Launchpad Translations on behalf of openerp 8f174e13bd Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
 2014-04-04 07:07:59 +00:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
 2014-04-02 06:44:59 +00:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
 2014-03-04 08:27:04 +00:00
Kersten Jeremy f87524a257 [FIX] Set event from hr_holiday with a class confidential by default. 
bzr revid: jke@openerp.com-20140225213121-hyz46xpsiqtao18o
 2014-02-25 22:31:21 +01:00
Launchpad Translations on behalf of openerp 5d2f1c68ac Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
 2014-02-17 06:03:28 +00:00
Denis Ledoux 6185dbf5a2 [FIX]hr_hodlidays: date_from and date_to are required only if leave request, not if leave alloc 
bzr revid: dle@openerp.com-20140211154827-d1529gkf30e57wz5
 2014-02-11 16:48:27 +01:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
 2014-02-04 06:48:35 +00:00
Olivier Dony 74ce50fe6e [FIX] hr.holidays test: adapt assertRaises due to constraint validation change in server 
See revision odo@openerp.com-20140130094337-7g8ez92viwmbzbft in server

bzr revid: odo@openerp.com-20140130182351-m8mwjz4pbglm8af7
 2014-01-30 19:23:51 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk 
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
 2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v 
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
 2014-01-28 18:58:35 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
 2014-01-28 06:41:39 +00:00
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates 
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
 2014-01-27 17:09:46 +01:00
Gery Debongnie 9cd84a5834 [IMP] replace the Leaves analysis views in reporting by the new pivot graph view (addon hr_holidays) 
bzr revid: ged@openerp.com-20140127103408-8a1fi88gdhl2sud5
 2014-01-27 11:34:08 +01:00
Launchpad Translations on behalf of openerp 805d3757e9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
 2014-01-23 05:57:32 +00:00
Launchpad Translations on behalf of openerp d5bc07f898 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
 2014-01-22 06:13:35 +00:00
Gery Debongnie 2bdf3039d0 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140121142943-tuqsdpf6wax7fuqv
 2014-01-21 15:29:43 +01:00
Launchpad Translations on behalf of openerp 698e2de138 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
 2014-01-21 06:20:40 +00:00
Launchpad Translations on behalf of openerp 28d79433c3 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
 2014-01-20 05:59:55 +00:00
Launchpad Translations on behalf of openerp 58907da3ee Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116051828-hd2t5q9ysbk5wm3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119052609-764otsas6xg8r8a2
 2014-01-19 05:26:09 +00:00
Gery Debongnie 00c6d55ac9 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
 2014-01-16 15:43:26 +01:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. 
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
 2014-01-16 11:39:10 +01:00
jke-openerp 46b0c7aa00 [REF] Rename model crm.meeting into calendar.event 
Remove 2 unsused field from calendar.event model (dir,sequence)

bzr revid: jke@openerp.com-20140115093805-1g1j1oymyxsb6kgh
 2014-01-15 10:38:05 +01:00
jke-openerp 0072915549 [MERGE] Merge with trunk 
bzr revid: jke@openerp.com-20140114135240-c7r0ma18f1ls2yae
 2014-01-14 14:52:40 +01:00
Stephane Wirtel 0aadcf42c9 [FIX] hr_holidays: Reverse previous patch with the warning 
bzr revid: stw@openerp.com-20140114114559-ri5ts0vgv2vmyfth
 2014-01-14 12:45:59 +01:00
jke-openerp facb8547db [MERGE] Merge with trunk 
bzr revid: jke@openerp.com-20140113193830-igvzvf8gsic5okm8
 2014-01-13 20:38:30 +01:00
jke-openerp 5626a5a391 [REF] Removing the quick create overriding for hr_holiday - that was a test/sample not used 
bzr revid: jke@openerp.com-20140113174701-nmvtarylf19d63nx
 2014-01-13 18:47:01 +01:00
Stephane Wirtel e091efecb8 [FIX] hr_holidays: Use osv.except_osv instead exceptions.Warning, because 
Warning does not inherit from osv.except_osv and this exception is not catched
by the system.

bzr revid: stw@openerp.com-20140113162727-5au3iimfz4d1mszw
 2014-01-13 17:27:27 +01:00
Launchpad Translations on behalf of openerp c2794d0e85 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc
 2014-01-13 05:59:13 +00:00