Cecile Tonglet
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +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
33463a6bc3
[IMP] account: adapt edi email template
...
bzr revid: rco@openerp.com-20121213140135-zw9zhmx85ryucn81
2012-12-13 15:01:35 +01:00
Vo Minh Thu
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +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
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +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
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
Christophe Matthieu
42dd7711b5
[FIX] email_template: change name value and concat test
...
bzr revid: chm@openerp.com-20121107113925-1nmjicj444nez25c
2012-11-07 12:39:25 +01:00
Christophe Matthieu
71c73945fa
[IMP] email template: add a email_to_partner field for send a email to a partner with the id
...
bzr revid: chm@openerp.com-20121106191255-dd1xv90ebsejqunf
2012-11-06 20:12:55 +01:00
Olivier Dony
6fadb45325
[IMP] sale,purchase,invoice: make `Send by mail` action more robust to template/view deletion
...
bzr revid: odo@openerp.com-20121023115628-3wvxcrkgazhi9p75
2012-10-23 13:56:28 +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
48cfc1bb02
[IMP] edi,account: fix EDI import of invoices, now compatible again with 6.1, and correct wrt. partners import (vs old addresses)
...
bzr revid: odo@openerp.com-20121017162937-fprd53n4ljo5bdim
2012-10-17 18:29:37 +02:00
Olivier Dony
c7757baf77
[IMP] edi: ported web part to 7.0 + removed the EDI preview- and export-related parts
...
As started in previous commits, in 7.0 there is no more
static storage of exported EDI documents, and they are
instead replaced by the improved portal - which will
provide the preview as well as export capabilities.
(The export might be added in a second phase)
bzr revid: odo@openerp.com-20121016122913-ndl0l36buhku3kxy
2012-10-16 14:29:13 +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
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
Thibault Delavallée
620b7e9b11
[IMP] Addons: user_email -> email.
...
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
2012-08-10 16:43:39 +02:00
Fabien Pinckaers
3a1485c395
[FIX] edit without note
...
bzr revid: fp@openerp.com-20120714220123-a6m22nj0lz92cg8y
2012-07-15 00:01:23 +02:00
Quentin (OpenERP)
65031e90ef
[IMP] account: changes related to the cleaning of the invoice workflow
...
bzr revid: qdp-launchpad@openerp.com-20120525151740-vjho9b0fopbrils7
2012-05-25 17:17:40 +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
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
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)
4a274f3dda
[IMP] account, purchase, sale: Improve code to add a link in mail
...
bzr revid: psi@tinyerp.com-20120328060443-34pimg3azu50dy4v
2012-03-28 11:34:43 +05:30
Jagdish Panchal (Open ERP)
409a041c1f
[IMP] Account: change sequence of menus and apply the group_no_one
...
bzr revid: jap@tinyerp.com-20120322134657-jxu71v2ebd2o2igo
2012-03-22 19:16:57 +05:30
Turkesh Patel (Open ERP)
181042470c
[FIX]account: fixed edi.
...
bzr revid: tpa@tinyerp.com-20120322070702-19ee4c7s90ga078l
2012-03-22 12:37:02 +05:30
Jigar Amin - OpenERP
db5958f3fb
[FIX] removed filed address_contact_id
...
bzr revid: jam@tinyerp.com-20120307104205-fdvym7euls9rjsn6
2012-03-07 16:12:05 +05:30
Bhumika (OpenERP)
879ddb6130
[IMP]: remove unused field
...
bzr revid: sbh@tinyerp.com-20120307102445-m12lvui331hy0ov2
2012-03-07 15:54:45 +05:30
Jigar Amin - OpenERP
6c88d42bd4
[FIX] account pasrtner_address_id and annonymous veriable names
...
bzr revid: jam@tinyerp.com-20120307070730-69akg01n5hpvlkdo
2012-03-07 12:37:30 +05:30
Jigar Amin - OpenERP
92420a78f3
[FIX] Account edi import parent_id
...
bzr revid: jam@tinyerp.com-20120306100743-562ep2q3lr9ylt36
2012-03-06 15:37:43 +05:30
Kuldeep Joshi (OpenERP)
a082f8a977
[IMP] account: remove address filed
...
bzr revid: kjo@tinyerp.com-20120305101605-swk7at0hi1ghcr4c
2012-03-05 15:46:05 +05:30
Kuldeep Joshi (OpenERP)
fd384fe645
[IMP] account : remove invoice address
...
bzr revid: kjo@tinyerp.com-20120305064845-aezglwmj86fi2ndc
2012-03-05 12:18:45 +05:30
Numerigraphe - Lionel Sausin
779fa653c1
[IMP] Added missing vim mode lines
...
lp bug: https://launchpad.net/bugs/524279 fixed
bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
2011-11-22 09:51:38 +01:00
Olivier Dony
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
Olivier Dony
dc844d92b6
[IMP] edi: cleanup comments, copyright years, etc.
...
bzr revid: odo@openerp.com-20111108120754-vzhmszqy02a4ovkt
2011-11-08 13:07:54 +01:00
Olivier Dony
a09b95aebb
[IMP] edi: only offer payment option for Customer Invoices/Supplier Refund
...
bzr revid: odo@openerp.com-20111107185011-acqa9jfoy7nng2im
2011-11-07 19:50:11 +01:00
Olivier Dony
3d0fb53907
[IMP] edi: override after-import display action for invoices: Supplier<->Customer
...
bzr revid: odo@openerp.com-20111105023210-w8rk1uxphm1l0fd5
2011-11-05 03:32:10 +01:00
Olivier Dony
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
Olivier Dony
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
Olivier Dony
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
Olivier Dony
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
Olivier Dony
1ab22b86cc
[IMP] edi: use the new EDIfied res.currency for so/po/invoice EDI
...
bzr revid: odo@openerp.com-20111024144407-3begj09gvfijpel9
2011-10-24 16:44:07 +02:00