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
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
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
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
7145b7f5f3
[MERGE] trunk-mako_to_jinja-rco: use Jinja2 instead of mako to render email templates (fixes security vulnerability)
...
bzr revid: rco@openerp.com-20121217102829-zzj1974m9ojdp1zy
2012-12-17 11:28:29 +01:00
b4d72207b2
[IMP] cleaning sales team stuff
...
bzr revid: fp@tinyerp.com-20121216155843-kl2mgr3ecyi85mw1
2012-12-16 16:58:43 +01:00
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
157f1db551
[IMP] email_template: small simplification in email templates
...
bzr revid: rco@openerp.com-20121214091057-ztar9xgmxx56cvae
2012-12-14 10:10:57 +01:00
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
34cc7611f4
[IMP] sale, purchase: adapt edi email templates
...
bzr revid: rco@openerp.com-20121213141700-t7glyfnl6gfmr0e2
2012-12-13 15:17:00 +01:00
5db87bea9c
[MERGE] Bugfixes from 6.1 until revision 6800
...
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
07677b361e
[IMP] type: uniform naming of Send By Email
...
bzr revid: odo@openerp.com-20121116161638-rjv0mqa9f2fonxx0
2012-11-16 17:16:38 +01:00
f5f6547fa7
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121113164544-21tmr4bmpt2n1mfl
2012-11-13 17:45:44 +01:00
3dba2e9932
[IMP] sale: edi template uses email_recipients.
...
bzr revid: tde@openerp.com-20121113131803-lndvum7wl68v96ov
2012-11-13 14:18:03 +01:00
21b56902b7
[FIX] sale/edi: paypal payment should be possible as soon as SO is not draft
...
Most companies won't mind if customers pay too early.
Even if the amount is not 100% correct, it can be
adjusted later, and it's better than missing a
revenue opportunity.
bzr revid: odo@openerp.com-20121024125957-oo8r9zmazzdonhd7
2012-10-24 14:59:57 +02:00
67d4646d09
[IMP] sale,purchase,invoice: attach PDF report to `Send by mail` template
...
This is quite useful in general, and partly
compensates for partial EDI integration, e.g.
when the sender company does not have a portal
or any way for customers to see the document.
bzr revid: odo@openerp.com-20121023114214-8zpl96jxqvqxv4xw
2012-10-23 13:42:14 +02:00
5f24594223
[IMP] edi: work-in-progress: remove permanent storage of edi.document
...
The EDI documents will now be generated on demand
and available from the Portal view of each document.
Instead of getting a link to a statically generated
EDI document, customers will receive a link to
the portal access to the document. They will be able
to signup on the portal the first time as well,
provided they are using the secure token that was
sent to them (i.e. the right link).
The link to pay online will be available in the
portal as well.
Still much to do, this is a small first step,
with edi.document renamed to edi.edi for
consistency, as it will not persist any
edi.document anymore.
bzr revid: odo@openerp.com-20121011152008-bht7ub6woaex0a7u
2012-10-11 17:20:08 +02:00
bd06e2f3f4
[IMP] sale, edi: removed auto-email sending at sale.order confirmation (not needed anymore since the email sending is included in the workflow) + removed the stuff related to delay field (moved to sale_stock, but not needed anyway)
...
bzr revid: qdp-launchpad@openerp.com-20120919131049-ccbplqqum4c7eah4
2012-09-19 15:10:49 +02:00
2e65d4319f
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120912051440-raj6egoom3qyfsmm
bzr revid: atp@tinyerp.com-20120913034436-i09g3lujgvy81gr6
bzr revid: atp@tinyerp.com-20120914051314-m5g13izj55f4sxqi
2012-09-14 10:43:14 +05:30
de5c80fb90
[FIX] sale.order: fixed a typo in template, leading to the company not being displayed.
...
bzr revid: tde@openerp.com-20120911115238-4r0oq2g5x4ffurde
2012-09-11 13:52:38 +02:00
30bf8715cf
[IMP]: Change workflow transition. remove type field
...
bzr revid: atp@tinyerp.com-20120909123216-vys9dyuqk5i7grgr
2012-09-09 18:02:16 +05:30
e60d4abafc
[REM]: move sale_stock wizard into sale wizard
...
bzr revid: atp@tinyerp.com-20120909121903-62z33di4idwsrzjf
2012-09-09 17:49:03 +05:30
f1cf4c04b9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
2012-09-09 16:32:14 +05:30
d6ddb23a4e
[REM] email.template: remove all text versions of demo/data templates
...
bzr revid: odo@openerp.com-20120904132803-9cgj4g10xtm121ko
2012-09-04 15:28:03 +02:00
06f60b3517
[FIX] body_text --> body, not ure it's good enough
...
bzr revid: fp@tinyerp.com-20120817120606-t97l9x2dguuv7kmp
2012-08-17 14:06:06 +02:00
81a1bd6898
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120816051123-ekldd1gox8py3pgl
2012-08-16 10:41:23 +05:30
620b7e9b11
[IMP] Addons: user_email -> email.
...
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
2012-08-10 16:43:39 +02:00
06c0ead10d
[ADD]: Add dependency
...
ii) move wizard , yaml file
iii) move stock method into sale_stock.
iv) add security into sale_stock module.
bzr revid: atp@tinyerp.com-20120726205659-xiyx39r3dibshyjs
2012-07-27 02:26:59 +05:30
ab07d440ce
[IMP] purchase: changes related to the cleaning of the PO workflow
...
bzr revid: qdp-launchpad@openerp.com-20120525143549-w8ste0euwmqg9ji9
2012-05-25 16:35:49 +02:00
c4d31012d1
[IMP] sale: changes related to the cleaning of the SO workflow
...
bzr revid: qdp-launchpad@openerp.com-20120525133536-2rrkqkffpdmt35nt
2012-05-25 15:35:36 +02:00
437ebb0403
[FIX] account,sale,purchase: translations were not enabled for mail notifications
...
bzr revid: odo@openerp.com-20120430143527-ly9g4q33p7ib2jk2
2012-04-30 16:35:27 +02:00
dc59277a43
[FIX] account,sale,purchase: avoid white text in email notifications due to broken mail clients
...
Some strange mail client implementations seem to
selectively strip the background-color CSS in emails,
making a white-on-black button become white-on-white
invisible text. Replaced #FFF with #DDD in order
to more gracefully degrade in those cases.
Reproduced with Lotus Notes 8.
bzr revid: odo@openerp.com-20120430132103-ei61f9m9irpmh2ys
2012-04-30 15:21:03 +02:00
aa8e83ea2d
[IMP] account, sale, purchase : Cleanup the use of dicts, remove the automatic email send by the EDI and use proper template based on an XML ID.
...
bzr revid: mdi@tinyerp.com-20120402123651-ekqw8z66ltpqnxgz
2012-04-02 18:06:51 +05:30
cd66e2402f
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120329130046-6s804a2aic6d4euc
2012-03-29 18:30:46 +05:30
593e8e00c6
[IMP] crm: add menu Miscellaneous
...
bzr revid: jap@tinyerp.com-20120321095036-zhyhyyc5cxhbvq4u
2012-03-21 15:20:36 +05:30
09152cd66c
[IMP] sale_order_action_data.xml: remove menu Email Templates from sale>>Configuration
...
bzr revid: jap@tinyerp.com-20120320094856-ctcbyt7t7sf8ifwt
2012-03-20 15:18:56 +05:30
55ac4f44f1
[IMP] sale:change the sequence of menus under Configuration
...
bzr revid: jap@tinyerp.com-20120319122413-aytom21csngf9bi3
2012-03-19 17:54:13 +05:30
7427dcd7b1
[IMP] base_*,crm*,plugin_*,product,sale:-added group no_one and reorganised menus
...
bzr revid: mtr@tinyerp.com-20120319100954-zjkb81m63v5irf4t
2012-03-19 15:39:54 +05:30
50997f9fe8
[Fix]sale: remove res.address.partner.address
...
bzr revid: kjo@tinyerp.com-20120305132543-92ba124cpg4zbrix
2012-03-05 18:55:43 +05:30
e83457423d
[IMP] edi: minor improvements to mail/edi preview templates
...
bzr revid: odo@openerp.com-20111109173817-9kw9x53lb8rged3u
2011-11-09 18:38:17 +01:00
dc844d92b6
[IMP] edi: cleanup comments, copyright years, etc.
...
bzr revid: odo@openerp.com-20111108120754-vzhmszqy02a4ovkt
2011-11-08 13:07:54 +01:00
1327b45c6a
[IMP] edi,email: moved mail menus to avoid using Tools top-level
...
Application-specific templates should be accessible
from the application's configutation menu, and the
rest should go to the Administration menu
bzr revid: odo@openerp.com-20111105015922-m7r2de9pux5k6pg9
2011-11-05 02:59:22 +01:00
6860e3381c
[IMP] edi: mark EDI email.templates as auto-deleted, to avoid polluting databases
...
bzr revid: odo@openerp.com-20111103011034-i97kuta2nvwdz567
2011-11-03 02:10:34 +01:00
d1dbd1876a
[IMP] edi: sale.order EDI export: offer online payment only if prepaid
...
bzr revid: odo@openerp.com-20111102235224-3sarzzsol6gzpsh0
2011-11-03 00:52:24 +01:00
429aa8ab07
[IMP] edi: use original Paypal button in email notifications
...
bzr revid: odo@openerp.com-20111028134932-pjl0c7x2yx7ahep3
2011-10-28 15:49:32 +02:00
326a7b562c
[IMP] edi: review/improve EDI templates, cleanup, minor fixes (wip)
...
bzr revid: odo@openerp.com-20111026000110-12zecr32uyola9lc
2011-10-26 02:01:10 +02:00
8e7b2cd2aa
[IMP] edi: whitespace/typo fixes in EDI server actions
...
bzr revid: odo@openerp.com-20111024143954-amx8hb2h53kh5nqu
2011-10-24 16:39:54 +02:00
dbb5b3862a
[IMP] edi web layer cleanups
...
bzr revid: al@openerp.com-20111018140627-str2i0uj4aswf3jx
2011-10-18 16:06:27 +02:00
a5677f23b2
[IMP] edi: no need for XML markup escaping inside CDATA
...
bzr revid: odo@openerp.com-20111010143627-dkxk2xab2phyob3g
2011-10-10 16:36:27 +02:00
1ab7b52db0
[IMP] account,purchase,sale: proper URL quoting in auto-mail templates
...
bzr revid: odo@openerp.com-20111010103904-cqn71nkh3h6rli9c
2011-10-10 12:39:04 +02:00
Olivier Dony
Martin Trigaux
Thibault Delavallée
Raphael Collet
Fabien Pinckaers
Quentin (OpenERP)
Atul Patel (OpenERP)
Divyesh Makwana (Open ERP)
Sbh (Openerp)
Jagdish Panchal (Open ERP)
Meera Trambadia (OpenERP)
Kuldeep Joshi (OpenERP)
Antony Lesuisse