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
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
jke-openerp
ecca2f99c3
[Merge] Merge With Trunk
...
bzr revid: jke@openerp.com-20140106082030-e0auqh3l9b2cpuyi
2014-01-06 09:20:30 +01:00
Thibault Delavallée
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
Denis Ledoux
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
jke-openerp
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
jke-openerp
4ca6502d5e
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131219193521-gs6ty1p0uju8cc21
2013-12-19 20:35:21 +01:00
jke-openerp
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
jke-openerp
dd285d23af
[TYPO] Rename base_calendar into calendar
...
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
Xavier ALT
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
Denis Ledoux
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
Martin Trigaux
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
jke-openerp
4be9d97332
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131218130914-w8akdktrpad5pflk
2013-12-18 14:09:14 +01:00
jke-openerp
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
jke-openerp
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
Thibault Delavallée
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
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
jke-openerp
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
Martin Trigaux
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
jke-openerp
74d698f42f
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131127175136-3qvs367ud509462n
2013-11-27 18:51:36 +01:00
jke-openerp
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
jke-openerp
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
jke-openerp
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
jke-openerp
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
jke-openerp
cee1b287d6
rb r2g.
...
bzr revid: jke@openerp.com-20131118084532-6v6fdb3no48gpuv3
2013-11-18 09:45:32 +01:00
jke-openerp
ee0c5a5610
rb r2g
...
bzr revid: jke@openerp.com-20131118084244-z82ezh0o1o56r1f9
2013-11-18 09:42:44 +01:00
jke-openerp
77ba33003a
rb r2g
...
bzr revid: jke@openerp.com-20131118081557-np5sxps572b578bg
2013-11-18 09:15:57 +01:00
2160342cea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00:00
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00: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
fadd46c5cb
hr_holidays: force refuse.@flow_stop to False to correctly update existing databases
...
bzr revid: odo@openerp.com-20131021155120-vn63of44ya0od9e2
2013-10-21 17:51:20 +02:00
Thibault Delavallée
fa9905e335
[FIX] hr_holidays: fixed tests about exception raised
...
when trying to validate too much holidays. The exception
is now a Warning, not an except_orm anymore.
bzr revid: tde@openerp.com-20131016120929-1pg7q4bjvpolfevj
2013-10-16 14:09:29 +02:00
Olivier Dony
43e88e54bf
[FIX] hr_holidays: typo - boolean values should be set with @eval!
...
bzr revid: odo@openerp.com-20131016112857-i29unpw5ee8yv3lx
2013-10-16 13:28:57 +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
566af6033f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
23620b2e54
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054843-vx0nogr2rpf5amw4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055416-ubjv2v9mogsb49f3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061626-2rcumswg0tc4e10e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055451-072mn28h3ew4cwfp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061658-4svrcqcw04av1e5w
2013-09-27 06:16:58 +00:00
fa502fd9bd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130924063729-1k9xlx0630vx6is5
2013-09-24 06:37:29 +00:00
DBR (OpenERP)
4b63de1244
[Merge] lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20130913094937-nkhpmwj0xcwaq326
2013-09-13 15:19:37 +05:30
Martin Trigaux
ab7d8c4ccf
[MERGE] refactoring of tests to be executed as normal users instead of administrator, fixed some security rules
...
bzr revid: mat@openerp.com-20130912085812-xvmjoa5fjis0l2ws
2013-09-12 10:58:12 +02:00
9dba69ba48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Martin Trigaux
5e051e9484
[FIX] resource: better access rights
...
bzr revid: mat@openerp.com-20130911142549-cpzg8588ol31b8k1
2013-09-11 16:25:49 +02:00
DBR (OpenERP)
5f733248c3
[Merge] lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20130903052652-q0kl6hmburu3ygpl
bzr revid: dbr@tinyerp.com-20130910054650-o3828e25hbgib4lt
2013-09-10 11:16:50 +05:30
Launchpad Translations on behalf of openerp