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
Cecile Tonglet
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Raphael Collet
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
Fabien Pinckaers
b4d72207b2
[IMP] cleaning sales team stuff
...
bzr revid: fp@tinyerp.com-20121216155843-kl2mgr3ecyi85mw1
2012-12-16 16:58:43 +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
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
34cc7611f4
[IMP] sale, purchase: adapt edi email templates
...
bzr revid: rco@openerp.com-20121213141700-t7glyfnl6gfmr0e2
2012-12-13 15:17:00 +01:00
Vo Minh Thu
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +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
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Olivier Dony
07677b361e
[IMP] type: uniform naming of Send By Email
...
bzr revid: odo@openerp.com-20121116161638-rjv0mqa9f2fonxx0
2012-11-16 17:16:38 +01:00
Olivier Dony
f5f6547fa7
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121113164544-21tmr4bmpt2n1mfl
2012-11-13 17:45:44 +01:00
Thibault Delavallée
3dba2e9932
[IMP] sale: edi template uses email_recipients.
...
bzr revid: tde@openerp.com-20121113131803-lndvum7wl68v96ov
2012-11-13 14:18:03 +01:00
Olivier Dony
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
Olivier Dony
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
Olivier Dony
e0fcab1f62
[FIX] edi,sale,purchase: fix EDI import of SO/PO, now compatible again with 6.1, and correct wrt. partners import (vs old addresses)
...
bzr revid: odo@openerp.com-20121018152129-s22uozt77s37urp1
2012-10-18 17:21:29 +02:00
Olivier Dony
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
Quentin (OpenERP)
bc1dc41c34
[FIX] sale_stock: removed empty wizard folder
...
bzr revid: qdp-launchpad@openerp.com-20120920103053-69kuxfvsq9bw8e9c
2012-09-20 12:30:53 +02:00
Quentin (OpenERP)
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
Atul Patel (OpenERP)
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
Thibault Delavallée
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
Atul Patel (OpenERP)
30bf8715cf
[IMP]: Change workflow transition. remove type field
...
bzr revid: atp@tinyerp.com-20120909123216-vys9dyuqk5i7grgr
2012-09-09 18:02:16 +05:30
Atul Patel (OpenERP)
e60d4abafc
[REM]: move sale_stock wizard into sale wizard
...
bzr revid: atp@tinyerp.com-20120909121903-62z33di4idwsrzjf
2012-09-09 17:49:03 +05:30
Atul Patel (OpenERP)
f1cf4c04b9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
2012-09-09 16:32:14 +05:30
Olivier Dony
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
Fabien Pinckaers
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
Atul Patel (OpenERP)
81a1bd6898
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120816051123-ekldd1gox8py3pgl
2012-08-16 10:41:23 +05:30
Thibault Delavallée
620b7e9b11
[IMP] Addons: user_email -> email.
...
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
2012-08-10 16:43:39 +02:00
Atul Patel (OpenERP)
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
Fabien Pinckaers
16cce23c1a
[IMP] invoice layout + merge note&name
...
bzr revid: fp@openerp.com-20120714203623-9n1iap9hplafnjp9
2012-07-14 22:36:23 +02:00
Quentin (OpenERP)
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
Quentin (OpenERP)
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
Olivier Dony
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
Olivier Dony
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
Purnendu Singh (OpenERP)
735c6d5946
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120419063305-w5oj03h687trdik2
2012-04-19 12:03:05 +05:30
Quentin (OpenERP)
b750360694
[FIX] sale: fix related to the print of edi document (the partner address was not displayed because we changed the name of variable by mistake)
...
bzr revid: qdp-launchpad@openerp.com-20120402150747-47u9r3j1y486s0h8
2012-04-02 17:07:47 +02:00
Divyesh Makwana (Open ERP)
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
Purnendu Singh (OpenERP)
e9efa4f61e
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120402053427-xhu1v33sxuptbd9q
2012-04-02 11:04:27 +05:30
Quentin (OpenERP)
ffd0c86ec2
[FIX] a lot of fixes in several modules, as the result of the code review of the merge of the objects res.partner and res.partner.address
...
bzr revid: qdp-launchpad@openerp.com-20120330090837-s87z2qzsvynhlbwr
2012-03-30 11:08:37 +02:00
Sbh (Openerp)
cd66e2402f
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120329130046-6s804a2aic6d4euc
2012-03-29 18:30:46 +05:30
Purnendu Singh (OpenERP)
5da8966b21
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120327092417-jrydzrz9biecyn06
2012-03-27 14:54:17 +05:30
Turkesh Patel (Open ERP)
f5f9d458b6
[FIX] improved code in edi and l10n_ch modules.
...
bzr revid: tpa@tinyerp.com-20120322061846-021c8rb9yfkespr4
2012-03-22 11:48:46 +05:30
Kuldeep Joshi (OpenERP)
f54017daeb
[Fix] sale: Fix edi issue
...
bzr revid: kjo@tinyerp.com-20120321132007-618c7dirzqtlu3ob
2012-03-21 18:50:07 +05:30
Jagdish Panchal (Open ERP)
593e8e00c6
[IMP] crm: add menu Miscellaneous
...
bzr revid: jap@tinyerp.com-20120321095036-zhyhyyc5cxhbvq4u
2012-03-21 15:20:36 +05:30