b770240247
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121120113600-4oyx9sziigbxn8w8
bzr revid: odo@openerp.com-20121120163429-l4cf6r75vwqfvxty
2012-11-20 17:34:29 +01:00
e5374b93b4
[REF] email_template: cleanup/remove obsolete fields on mail composition wizard: use_template is the default
...
bzr revid: odo@openerp.com-20121116170259-08eot6wy40yehkh4
2012-11-16 18:02:59 +01:00
8ccbab8254
[MERGE] from trunk-mail-uploader-chm
...
bzr revid: chm@openerp.com-20121116151115-1u69yio8kb1h8fjd
2012-11-16 16:11:15 +01:00
01b9f4c3ed
[MERGE] removed a few warnings.
...
bzr revid: vmt@openerp.com-20121116141517-1dwjs27cwk2nq9t4
2012-11-16 15:15:17 +01:00
0cec2d9d06
[IMP] mail.compose.message: not filter the context for attachment but overwrite the value with type=binary
...
bzr revid: chm@openerp.com-20121116114348-2g80ll85rz3ha0o2
2012-11-16 12:43:48 +01:00
2cd9443b92
[IMP] email_template: dont give mail.mail.create() an unneeded email_recipients field.
...
bzr revid: vmt@openerp.com-20121116113551-le30lwfmignrxl0e
2012-11-16 12:35:51 +01:00
c1192ec3a0
[FIX] mail.compose.message: files can be attach to a document and send by mail
...
bzr revid: chm@openerp.com-20121116111226-0xvb262et94k7omh
2012-11-16 12:12:26 +01:00
e5921325bd
[REM] mail.compose.wizard: remove unused body_text and content_subtype fields
...
These fields were used in pre-7.0 to manage the plaintext variant of the
mail being composed, but as of 7.0 the composition wizard will always
use the HTML/Rich text mode, so they can be dropped.
bzr revid: odo@openerp.com-20121115135634-fcy6mexnctwg0nxb
2012-11-15 14:56:34 +01:00
c558ac6272
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121114172252-q1xj3hdugqhky532
bzr revid: odo@openerp.com-20121115135141-ia8uf5649rapj0v7
2012-11-15 14:51:41 +01:00
da9951baf9
[CLEAN] removed a commented statement, fixed a var name in js.é
...
bzr revid: tde@openerp.com-20121115124931-w20igi8qk66uvnj0
2012-11-15 13:49:31 +01:00
81d4467c8f
[REV] mail.compose.message using email_template: _reopen is back, as the spec of a wizard should be that hitting a button close it. Therefore _reopen is necessaru to reopen the wizard with its previous value, to continue working on it.
...
bzr revid: tde@openerp.com-20121115122406-d88ozw5iclsqdyff
2012-11-15 13:24:06 +01:00
45eadceea6
[FIX] email_template: udpated test according to new specs of append_content_to_html.
...
bzr revid: tde@openerp.com-20121114133438-8m1q0r02i4xory0e
2012-11-14 14:34:38 +01:00
64277d04c3
[IMP] Addons: messages when installing key apps is not of comment subtype, meaning they are effectively pushed.
...
bzr revid: tde@openerp.com-20121114115504-tvh0j9ks0jde12ed
2012-11-14 12:55:04 +01:00
fbccb823f8
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121112161523-yfp1dczcnmi85t8e
bzr revid: tde@openerp.com-20121114083900-qw40e8ii1rfl7gt1
2012-11-14 09:39:00 +01:00
f5f6547fa7
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121113164544-21tmr4bmpt2n1mfl
2012-11-13 17:45:44 +01:00
ad75b35c0e
[FIX] email_template: email_recipients, when void, generate a not-void partner_ids.
...
bzr revid: tde@openerp.com-20121113141213-j2hp2bdakjb4bw8z
2012-11-13 15:12:13 +01:00
c0d3cd2f81
[REVIEW] Removed unnecessary statements.
...
bzr revid: tde@openerp.com-20121113133815-rswtzhidara3u4zt
2012-11-13 14:38:15 +01:00
b5dbc3e5b3
[IMP] email_template list view: added email_recipients field.
...
bzr revid: tde@openerp.com-20121113133534-en53nvd7td91p1bs
2012-11-13 14:35:34 +01:00
5baafe992b
[REV] [IMP] email_template tests: reverted CHM changes about adding self everywhere; cleaned the new test.
...
bzr revid: tde@openerp.com-20121113131044-0z0286izrw35w6f1
2012-11-13 14:10:44 +01:00
a370d1c059
[IMP] email_template: relooked a bit the mail.compose.message wizard, use_template by default, on bottom-right choose the template; rendre only when use_template and template_id set.
...
bzr revid: tde@openerp.com-20121113113625-fg3jp3047gnrx2wr
2012-11-13 12:36:25 +01:00
78959edc48
[IMP] email_template: cleaned a bit tools imports.
...
bzr revid: tde@openerp.com-20121109095122-pifpwr5u1hhyjakw
2012-11-09 10:51:22 +01:00
c9d5148991
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121107114202-mt3gny8e2497m7qf
2012-11-07 12:42:02 +01:00
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
621c8b4bb7
[IMP] email_template: add test: The fields email_to, email_to_partner and email_cc return the good list of partner_id
...
bzr revid: chm@openerp.com-20121107102745-9d0dt1fkzauvfyjs
2012-11-07 11:27:45 +01:00
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
53a6056a35
[FIX] email_template: html_sanitize not in html_sanitize, but in mail.é
...
bzr revid: tde@openerp.com-20121106121134-8tws1ckwh0mhpiwm
2012-11-06 13:11:34 +01:00
87d3caa50f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
822882f118
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121019082409-lq3jdj6rptxdkzwn
2012-10-19 10:24:09 +02:00
5bfa3c5a7d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
1737a3161b
[REVIEW] Cleaning before merging.
...
bzr revid: tde@openerp.com-20121018093453-trijh79z0j7oha6f
2012-10-18 11:34:53 +02:00
ae1985702b
[REM] email_template: removed overrided chatter form view; updated legacy wizard form view.
...
bzr revid: tde@openerp.com-20121017092938-8ulu2h3ml9on4iu9
2012-10-17 11:29:38 +02:00
c3aecf0630
[FIX] Fixed fix of revision 7750. Correct fix was to add in the generated action an use_template context key, that triggers the use of templates. Eveything is then managed inside the email_template override of mail.compose.message.
...
bzr revid: tde@openerp.com-20121016115839-8cj0u9si20qo14av
2012-10-16 13:58:39 +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
30be16b0fc
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121011074626-rztxx7vnhg8sd72l
2012-10-11 09:46:26 +02:00
76a257cd1b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121010185721-in3ab4mr8h72lect
2012-10-10 20:57:21 +02:00
a8c6c4e34a
[MERGE] purchase: ps review
...
bzr revid: qdp-launchpad@openerp.com-20121010184414-eys4z5k531qwx5ck
2012-10-10 20:44:14 +02:00
fbbc0bad19
[IMP] all: replaced 'true' by 'True' in 'options' attribute in views, because now the syntax of these options must be expressed in python instead of json
...
bzr revid: qdp-launchpad@openerp.com-20121009143433-s4y6isbewqdn2fu2
2012-10-09 16:34:33 +02:00
df5071c896
[IMP] mail chatter: compose mail in js, less request
...
bzr revid: chm@openerp.com-20121005104654-t5lholex2gh11y15
2012-10-05 12:46:54 +02:00
6aba62a847
[fix]fix problem of send RFQ
...
bzr revid: pja@tinyerp.com-20121004070227-rqo5ec0mckj5vqx8
2012-10-04 12:32:27 +05:30
c93d70e919
[MERGE] chm - improved subtype - fixes
...
bzr revid: fp@openerp.com-20121002204023-8v3jf2n84xe2jol9
2012-10-02 22:40:23 +02:00
2b2288a3bd
[FIX] a few problems introduced with the last merge
...
bzr revid: abo@openerp.com-20121002111231-zo41jejkrm8afavu
2012-10-02 13:12:31 +02:00
1653332080
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
eeeabc4b57
[FIX] automated tests
...
bzr revid: fp@openerp.com-20121001211605-u74rjn9doh65vu94
2012-10-01 23:16:05 +02:00
e9f4840c93
[IMP] emoving bad code, no invitation system on events
...
[IMP] no more certifiate, will be managed in apps.openerp.com directly
bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
6359d39de2
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120924171736-awxstwkuaflv1y7r
2012-09-24 19:17:36 +02:00
1fbb4a5c16
[IMP] handling of '(copy)' l10n
...
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
2012-09-24 18:26:45 +02:00
f7b90af93a
[FIX] forgot to remove })
...
bzr revid: abo@openerp.com-20120924155600-dnaanyupa5jm0yre
2012-09-24 17:56:00 +02:00
05059bef7f
[MERGE] trunk
...
bzr revid: abo@openerp.com-20120924153547-i1r9l0i5asjhml0k
2012-09-24 17:35:47 +02:00
7b62802435
[IMP] use kwargs instead of a new dict
...
bzr revid: abo@openerp.com-20120924153430-0nb2gxker8v9is5p
2012-09-24 17:34:30 +02:00
46a60cdac7
[MERGE] from trunk-mail-concreting-tde, TODO fix bug
...
bzr revid: chm@openerp.com-20121029090847-27h3tmyvsv9c8vej
2012-10-29 10:08:47 +01:00
Olivier Dony
Christophe Matthieu
Vo Minh Thu
Thibault Delavallée
Launchpad Translations on behalf of openerp
Quentin (OpenERP)
Jalpesh Patel (OpenERP)
Fabien Pinckaers
Antonin Bourguignon
Fabien Pinckaers