9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
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
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
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
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
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
5585a38ecc
[MERGE] from trunk, need point_of_sale updates
...
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
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
2bdf3039d0
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140121142943-tuqsdpf6wax7fuqv
2014-01-21 15:29:43 +01:00
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
00c6d55ac9
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +01:00
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
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
0072915549
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140114135240-c7r0ma18f1ls2yae
2014-01-14 14:52:40 +01:00
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
facb8547db
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140113193830-igvzvf8gsic5okm8
2014-01-13 20:38:30 +01:00
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
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
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
ecca2f99c3
[Merge] Merge With Trunk
...
bzr revid: jke@openerp.com-20140106082030-e0auqh3l9b2cpuyi
2014-01-06 09:20:30 +01:00
9dfb5de2f8
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20131224112327-r1evm1pcw2gpn8dh
bzr revid: ged@openerp.com-20131226132625-33fgmyb0fbu0c9ia
2013-12-26 14:26:25 +01:00
bb5a2662c8
[IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_holidays)
...
bzr revid: ged@openerp.com-20131224102813-l818l4lp6ml5164i
2013-12-24 11:28:13 +01:00
1aa92dbc46
[FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958)
...
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
2013-12-20 17:55:19 +01:00
1508c5dd00
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
...
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
6bb986a2e5
[FIX] Fix according to APR's Review
...
- Access Right too restrictif for user
- Bug UI between Firefox and Chrome
- Bug UI many2many_tag cursor on bullet
- Temp Fix on email_template to manage partner_to
- Manage attendee from hr_holidays
- Manage avatar_model in sidebar_items for filter (res.partner was hard coded)
- Remove quick add from HR-holiday, because some field (as day) is calculated on event "onchange"
bzr revid: jke@openerp.com-20131220141855-mbhxtr07fn0sroe0
2013-12-20 15:18:55 +01:00
4ca6502d5e
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131219193521-gs6ty1p0uju8cc21
2013-12-19 20:35:21 +01:00
eeb4e9629f
[TYPO] Replace base_calendar to calendar in csv security
...
bzr revid: jke@openerp.com-20131219160620-kcjrqv0uald99qqe
2013-12-19 17:06:20 +01:00
dd285d23af
[TYPO] Rename base_calendar into calendar
...
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
6df572aae4
[FIX] hr_holidays, hr_timesheet: fix XMLSyntaxError when company name contain an ampersand '&' sign
...
bzr revid: xal@openerp.com-20131219135147-jpli369iqlanf3t3
2013-12-19 14:51:47 +01:00
ecb223da04
[FIX] hr: merge of views Leave Request & Allocation request, as they are allmost similar.
...
Moreover, before this fix, when you clicked on an allocation request from a mail.message (for instance, from the messaging inbox page), you were not redirected to the right view: You were redirected to the view of Leave request instead of Allocation request.
bzr revid: dle@openerp.com-20131219130901-nxciudhsacru2tmb
2013-12-19 14:09:01 +01:00
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
4be9d97332
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131218130914-w8akdktrpad5pflk
2013-12-18 14:09:14 +01:00
7eda17615b
[IMP] Show button google cal only on crm meeting model
...
bzr revid: jke@openerp.com-20131217121808-miv2zlo2guuxrt1r
2013-12-17 13:18:08 +01:00
08f00af5ab
[TYPO] Continue install module google calendar and descriptions + typo + ...
...
bzr revid: jke@openerp.com-20131216162147-qygweglpl0k6qzux
2013-12-16 17:21:47 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
6b164eb7b3
[IMP] hr: minor usability improvements
...
- hr_holidays: renamed My Leaves filter by My Requests, more accurate
- hr_recruitment: string of name field is not Subject / Application Name, more accurate; this string is used in the search view also.
bzr revid: tde@openerp.com-20131212104612-2fbn9130emyvxg7s
2013-12-12 11:46:12 +01:00
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
f60e279f1c
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131210165643-q9y3um1wkik52aam
bzr revid: jke@openerp.com-20131211085000-k34jnv099p667is4
2013-12-11 09:50:00 +01:00
cca8bb4d64
[FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
...
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
2013-12-09 14:34:31 +01:00
a092227c6e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
2013-12-08 05:46:53 +00:00
ef8322273e
[FIX] [TESTS] project, hr_holidays and portal-related modules: fixed tests, because the raised errors have been updated
...
bzr revid: tde@openerp.com-20131206125751-lx5ki1nz10pdo63r
2013-12-06 13:57:51 +01:00
74d698f42f
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131127175136-3qvs367ud509462n
2013-11-27 18:51:36 +01:00
e6c1545262
[REF] Remove temp field from view and add sequence for view form of crm.metting
...
bzr revid: jke@openerp.com-20131126200506-zr5fp99xa2lq4qno
2013-11-26 21:05:06 +01:00
61cb04c5af
[FIX] Add dependency on web_calendar for base_calendar
...
bzr revid: jke@openerp.com-20131126194120-6lthkig6agf08ngo
2013-11-26 20:41:20 +01:00
b4af563c5e
[FIX] Add right in security of hr_holidays to allow hr user to delete attendee
...
bzr revid: jke@openerp.com-20131126190610-ow8qwiajddi7gvdy
2013-11-26 20:06:10 +01:00
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
5f9ee3b2d2
[IMP] Bck not running
...
bzr revid: jke@openerp.com-20131123113627-csxj0qx8s030dhi7
2013-11-23 12:36:27 +01:00
271ed43e7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
cee1b287d6
rb r2g.
...
bzr revid: jke@openerp.com-20131118084532-6v6fdb3no48gpuv3
2013-11-18 09:45:32 +01:00
ee0c5a5610
rb r2g
...
bzr revid: jke@openerp.com-20131118084244-z82ezh0o1o56r1f9
2013-11-18 09:42:44 +01:00
Launchpad Translations on behalf of openerp
Denis Ledoux
Olivier Dony
Antony Lesuisse
Frédéric van der Essen
Gery Debongnie
Thibault Delavallée
jke-openerp
Stephane Wirtel
Xavier ALT
Martin Trigaux