Commit Graph

27 Commits

Author SHA1 Message Date
Denis Ledoux 7cab554590 [FIX] portal_sale,website_quote: templates compatible with wysiwyg
<% are automatically escaped as soon as the wysiwyg tool
is used to edit the template.
The wysiwyg tool is not compatible with Jinja, and
it isn't expected to be.

To avoid to have this problem everytime when
editing the portal email templates, we use
a Jinja syntax compatible with the wysiwyg,
as a workaround.

opw-654223
2015-11-09 15:38:17 +01:00
Goffin Simon 9b3e606538 [FIX] sale: format date according to partner language in SO emails.
opw:625594
2015-01-29 16:22:21 +01:00
Aaron Bohy ef986fe9de [FIX] Account, portal_sale, sale, website_quote: local paypal gif
Add local copies of the paypal gif to the archive. This fix was required
for Debian packaging. It fixes the privacy-breach-donation lintian error.
2015-01-23 11:11:26 +01:00
Denis Ledoux ae65be2b2a [MERGE] forward port of branch saas-5 up to 0739bc4 2014-08-11 15:58:02 +02:00
Thibault Delavallée 2e5412fc1d [FIX] mail, BaseModel, portal_sale: fixes and improvements in the URL
management to access documents in notification emails, as well as for the
'view quotation' link in portal_sale module.

models: added a get_access_action method: basically, returns the action to
access a document. It uses the get_formview_action by default (form view
of the document). However for some documents we want to directly go to the
website, leading to an act_url action for some documents. This method allows
this behavior.

portal_sale: get_signup_url now uses the mail.action_mail_redirect method
instead of directly redirecting towards a portal menu. This allows to fall
back on a standard behavior.

portal_sale: get_formview_action updated, to match actions tailored for
portal users.

website_quote: get_access_action of sale order updated. If the sale order
has a template defined, the returned action is an act_url (website view
of the quotation), not the form action anymore.

mail: fixed signature + company signature in notification emails. Even without
user signature, the company signature + access link should be correct.

portal: signup url in notification emali was not using the mail redirection
as action. It is now the case.
2014-08-07 16:47:59 +02:00
Denis Ledoux 63dffd5e79 [FIX] portal_sale: inadvertence during the forward port 978fd47261 2014-08-06 13:50:35 +02:00
Denis Ledoux 978fd47261 [MERGE] forward port of branch 7.0 up to 095be21 2014-08-06 13:06:20 +02:00
Anael Closson f09e11f55b [FIX] sale: quote character in company name is converted to html entity
Avoid to get company names such as "L'abc" to be transformed as "L&#39;abc" opw 607221
2014-08-05 11:15:28 +02:00
Denis Ledoux 41fe705943 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9674 rev-id: dle@openerp.com-20131204133633-t7wfbnipv3jtss82
bzr revid: chs@openerp.com-20131204125051-dexejzwigpu0z1yy
bzr revid: dle@openerp.com-20131204134400-50y7ojeb8pw7k56s
2013-12-04 14:44:00 +01:00
Denis Ledoux cf052214bd [FIX]portal_sale: add the lang to the email templates (sale.order and account.invoice), for the email to be translated in the customer language (as this is the case for regular email templates from sale and account modules-
bzr revid: dle@openerp.com-20131203142554-5yrp5o5wl382oyo3
2013-12-03 15:25:54 +01:00
Christophe Simonis 0244543c71 [MERGE] forward port of branch 7.0 up to revid 9636 mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz
bzr revid: chs@openerp.com-20131122193122-wpdfsfn24ezj1qrp
2013-11-22 20:31:22 +01:00
Martin Trigaux 56d579b1e0 [FIX] email.template: add missing parenthesis to filter all data on email and not the last one
bzr revid: mat@openerp.com-20131122104509-g2pii4m5rj8qpk7w
2013-11-22 11:45:09 +01:00
Olivier Dony 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
2013-11-21 16:42:05 +01:00
Martin Trigaux c3063778ce [FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping
bzr revid: mat@openerp.com-20131121151305-t5je12s4w5uctu0k
2013-11-21 16:13:05 +01:00
Thibault Delavallée 22afd0cefd [IMP] email_template: renamed email_recipients field to partner_to, in order to have a name that means something.
bzr revid: tde@openerp.com-20130225101918-khyd6qkvtsyr2wi3
2013-02-25 11:19:18 +01:00
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
Raphael Collet 01bffef548 [IMP] sale, account, portal_sale: factor the paypal_url in the templates into function fields
bzr revid: rco@openerp.com-20121214113132-skqi1tddmkjybwpn
2012-12-14 12:31:32 +01:00
Raphael Collet 95a3a0677b [IMP] portal_sale: small improvement in email template
bzr revid: rco@openerp.com-20121214091627-1b1z56vb59kyjzxl
2012-12-14 10:16:27 +01:00
Raphael Collet 157f1db551 [IMP] email_template: small simplification in email templates
bzr revid: rco@openerp.com-20121214091057-ztar9xgmxx56cvae
2012-12-14 10:10:57 +01:00
Raphael Collet a261f54c82 [FIX] email_template: use urlencode to build urls, and adapt email templates;
also fixes incorrect usage of 'safe' in those templates"

bzr revid: rco@openerp.com-20121214090340-nd3u4ahhb4460r4q
2012-12-14 10:03:40 +01:00
Raphael Collet e07f8a7519 [IMP] portal_sale: adapt edi email templates
bzr revid: rco@openerp.com-20121213153728-v7yv82x09qtletix
2012-12-13 16:37:28 +01:00
Antony Lesuisse 045c04a3a2 [MERGE] trunk
bzr revid: al@openerp.com-20121208174511-a4dhw2odli43ftfp
2012-12-08 18:45:11 +01:00
Olivier Dony 5db87bea9c [MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
vta vta@openerp.com f5dffcfd11 [FIX] Fixed type of invoices in online payment.
bzr revid: vta@openerp.com-20121129142146-1c8z7zqrsm9icbym
2012-11-29 15:21:46 +01:00
Olivier Dony 548994707f [FIX] account.invoice: typos in default email templates: amount_residual -> residual
bzr revid: odo@openerp.com-20121121101133-i14gzydtxzevjcvt
2012-11-21 11:11:33 +01:00
Olivier Dony ddc5d6804e [IMP] portal: unify wording as `Customer Portal` + make footer link translatable + cleanup
bzr revid: odo@openerp.com-20121121100434-wq5julc2njlee7t1
2012-11-21 11:04:34 +01:00
Olivier Dony 62c64d5c4d [IMP] sale_portal: override default `Send by Email` templates to include portal signup link
bzr revid: odo@openerp.com-20121116170643-usandzkdhi0idn2d
2012-11-16 18:06:43 +01:00