Commit Graph

15 Commits

Author SHA1 Message Date
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