87172d90d2
[MERGE] saas-3
...
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +01:00
4ecf5bb09a
[FIX] mail: create and edit of template_id in compose message now works, as we pass the template model in context (among others useful default value)
...
bzr revid: dle@openerp.com-20140207104637-lkx5am24608n8jka
2014-02-07 11:46:37 +01:00
4208281471
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201060213-5gub5wavdno2vcu4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202053135-qolj2vd2n4tjwbp3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203051828-wflc11kw2q8wc0aq
2014-02-03 05:18:28 +00:00
c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
731019154a
[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
...
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +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
b15dbfa3a6
[IMP] mini imp
...
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
2014-01-25 13:37:58 +01:00
1fb1a6f2af
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
...
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00
b845b708af
[CLEAN] email_template: cleaned code
...
bzr revid: tde@openerp.com-20140124114743-m6s8d1byabl78l63
2014-01-24 12:47:43 +01:00
c5dd038011
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062506-2xq1lhj82n923dbl
2014-01-24 06:25:06 +00:00
43ba81ad1b
[IMP] use product.template model for templates
...
bzr revid: tpa@tinyerp.com-20140123134233-vp52fv0e047bbfgk
2014-01-23 19:12:33 +05:30
b25d08f917
[FIX] email_template: error message instead of traceback when sending an email from a user without user
...
bzr revid: mat@openerp.com-20140122094837-a0bkx2huqvkylniy
2014-01-22 10:48:37 +01:00
d5bc07f898
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
698e2de138
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
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
722aee5336
[MERGE]Merge with Parent
...
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
2014-01-17 11:20:56 +05: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
91aaaec0a5
[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
...
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
ba458f6abc
[MERGE]Merge with Parent
...
bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d
2014-01-15 17:30:52 +05:00
7084d9259f
[FIX] email_template: fix test email_template, list of emails space-separated is not correct, should be comma-separated
...
bzr revid: dle@openerp.com-20140114180652-xeoil4jgjh7k5i2e
2014-01-14 19:06:52 +01:00
899166ecac
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1
...
bzr revid: dle@openerp.com-20140114173653-xhh85ubx27uu1306
2014-01-14 18:36:53 +01:00
a7cb9b762d
[FIX] email_template: fix invalid uses of tools.email_split
...
This is necessary to have the tests pass after
the corresponding server patch in server 7.0
at revision 5198 revision-id: odo@openerp.com-20140114120344-r58wndgybqusnnq7
lp bug: https://launchpad.net/bugs/1199386 fixed
lp bug: https://launchpad.net/bugs/1165531 fixed
bzr revid: odo@openerp.com-20140114134627-6j83f4s6pvnj4uma
2014-01-14 14:46:27 +01:00
778de23d6f
[IMP] email_template: body_html is now an html file, not a text file anymore.
...
Now that tools.mail.html_sanitize() has been detroyed, there is
no need anymore to keep this field as a text field.
bzr revid: tde@openerp.com-20140113092440-je3vpgohvljukjmn
2014-01-13 10:24:40 +01:00
2a5a05f49d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140114064936-uengc20ppbqnn5ut
2014-01-14 06:49:36 +00:00
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
7692df62c6
[FIX] test depends on demo data, demo data changed, test borken. Fix test. Tests depending on demo data suck.
...
bzr revid: xmo@openerp.com-20140109091946-s77bgymh3pmzkyh3
2014-01-09 10:19:46 +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
e0951d6e18
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
9cbe77bc90
[IMP] several cleaning
...
bzr revid: fp@tinyerp.com-20140101154754-cp4m9u84okx7m057
2014-01-01 16:47:54 +01:00
67e479e96e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00: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
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
b92ad39005
[FIX] email_template: support of email_recipients in send_mail.
...
email_recipients is a char fields holding a comma separated list of partner_ids
that are the email recipients. This field is correctly handled in the composer
but was not taken into account in the send_mail method email_template.
However due to model limitations, this field can only be taken into account
when sending the email directly using force_send. When the email is
queued, no field is available to hold the value of email_recipients.
This is already fixed in trunk/v8 as a field has been added to handle
this value.
[FIX] mail: when sending email to some recipients_ids, filter to have only
the existing partner_ids. Trusting email template to generate valid
partner_ids is a bit risky.
[TESTS] email_template: added tests for send_mail
bzr revid: tde@openerp.com-20131220144652-h18yam60vpedbh7x
2013-12-20 15:46:52 +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
4a1208b39b
[IMP] Redo tuto to get api key, because Google have changed console UI during the dev
...
bzr revid: jke@openerp.com-20131219174536-msjd005fxhxgl9qq
2013-12-19 18:45:36 +01:00
a6a5278747
[FIX] Partner_to changed form template to be a python list and not a list of int separed by comma
...
bzr revid: jke@openerp.com-20131219152801-e70jmpfw10vf6ruy
2013-12-19 16:28:01 +01:00
306dd6e397
[IMP] Add span with class for footer received in mail
...
[FIX] convert partner_to from template_mail (string with comma) to recipent_ids (list of partner_id) in model mail_mail
bzr revid: jke@openerp.com-20131219133144-zbt100e8030wd927
2013-12-19 14:31:44 +01:00
ba73588c6c
[FIX] email_template: fixed default_get, not possible ot render when we do not have any data about the record used for rendering
...
bzr revid: tde@openerp.com-20131217165931-muxsi0hwhihcvo1f
2013-12-17 17:59:31 +01:00
8f4617c335
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20131210050701-116a01x8r194arg2
2013-12-10 10:37:01 +05:30
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
1037874e15
[CLEAN] mail: removed modifications that have nothing to do with website in mail.js + typo introduced in a test file
...
bzr revid: tde@openerp.com-20131206101716-08q6f4ufhj50e239
2013-12-06 11:17:16 +01:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
3e5ae00690
[ADD]: Quote roller module
...
bzr revid: aja@tinyerp.com-20131202123437-zn6u2ckxbid3jknb
2013-12-02 18:04:37 +05:30
289023d92f
[MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
...
It’s over NINE THOUSAAAAAAAND!
bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
2013-11-30 14:07:25 +01:00
f2c23488c3
[FIX] email_template: fixing to have the correct report suppose to correctly fix. So, fix the fix to fix it
...
bzr revid: tde@openerp.com-20131126120843-gt8vdhl3yn61vd8r
2013-11-26 13:08:43 +01:00
6f322004cc
[FIX] email_template: when generating reports
...
in batch, update the values for all res_ids, not only the
last one of the current template.
bzr revid: tde@openerp.com-20131126110742-aecac7r0zyappo0a
2013-11-26 12:07:42 +01:00
bb1e256f5b
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
...
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Antony Lesuisse
Denis Ledoux
Launchpad Translations on behalf of openerp
Christophe Simonis
Frédéric van der Essen
Fabien Pinckaers
Thibault Delavallée
Turkesh Patel (Open ERP)
Martin Trigaux
Pooja Zankhariya (OpenERP)
Olivier Dony
Xavier Morel
jke-openerp
Fabien Pinckaers
ajay javiya (OpenERP)
Christophe Matthieu