Thibault Delavallée
0d14fd300a
[MERGE] [IMP] email_template: template_id field is now a many2one towards email.template
...
- changed selection field to a many2one using a domain; this
allows to edit the template while being in a composition wizard.
- improved email template and template preview form view
bzr revid: tde@openerp.com-20130329114631-fd6phvjaxojk9ja5
2013-03-29 12:46:31 +01:00
Thibault Delavallée
b2fc9d75c7
[IMP] email_template_preview: improved form view.
...
bzr revid: tde@openerp.com-20130329112722-9aulsfcixis2id6w
2013-03-29 12:27:22 +01:00
Thibault Delavallée
becbd707cf
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130329105546-epbmbbxd64cncj2h
2013-03-29 11:55:46 +01:00
Thibault Delavallée
56e28b9a56
[FIX] email_template: saving as template did not choose the right template.
...
bzr revid: tde@openerp.com-20130327151727-agbzm41sae2bsxan
2013-03-27 16:17:27 +01:00
Thibault Delavallée
d8b49e6598
[IMP] email_template, template_preview: updated form views.
...
bzr revid: tde@openerp.com-20130327142026-kfe326abxe1myl6h
2013-03-27 15:20:26 +01:00
Vo Minh Thu
9b0ced610f
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20130322134958-jhe6m0222jq7wo41
2013-03-22 14:49:58 +01:00
Turkesh Patel (Open ERP)
4da7cba96c
[IMP] fix issue of many2one in footer.
...
bzr revid: tpa@tinyerp.com-20130322060750-f0xx5a6ih79kcw4r
2013-03-22 11:37:50 +05:30
Turkesh Patel (Open ERP)
cd90ed025a
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130321045350-wrm8yh6p0zywlhbb
2013-03-21 10:23:50 +05:30
Thibault Delavallée
522f144781
[CLEAN] Misc cleaning and code review before merging.
...
bzr revid: tde@openerp.com-20130319091844-tnpd0w8tlagcbypz
2013-03-19 10:18:44 +01:00
Thibault Delavallée
7e696dfdcb
[MERGE] Sync with trunk and latest mail changes.
...
bzr revid: tde@openerp.com-20130318122027-l570iyzlljshz4ne
2013-03-18 13:20:27 +01:00
4ce8d2697d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
Thibault Delavallée
5d59401b91
[MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything.
...
bzr revid: tde@openerp.com-20130315120759-sf1o1sd80ycuuy7n
2013-03-15 13:07:59 +01:00
Quentin (OpenERP)
d0f5b28bd0
[MERGE] merge with main trunk branch to get last translations from launchpad
...
bzr revid: qdp-launchpad@openerp.com-20130315103116-lxj96usw3ipd11z5
2013-03-15 11:31:16 +01:00
72f29d98b8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
Quentin (OpenERP)
be05b374a1
[MERGE] forwardport of bugfixes made in v7 up to revision 8854.
...
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Thibault Delavallée
f4dbf7051b
[FIX] email_template: fixed behavior of email_to, email_cc, partner_to; improved form view.
...
bzr revid: tde@openerp.com-20130314110315-3gfl7mjj08jgqo93
2013-03-14 12:03:15 +01:00
cdb474f179
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130314053439-q79rdq445kptn3nn
2013-03-14 05:34:39 +00:00
Thibault Delavallée
3a95a0d6b1
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130313134656-o0ptoxr3lcre862d
2013-03-13 14:46:56 +01:00
9568673e0f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130313043736-oqoeg5hukh6fd2gw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130314044848-8m2hnsav5adqrr5k
2013-03-14 04:48:48 +00:00
Thibault Delavallée
93d815efab
[CLEAN] crm, res_partner: added name on added filters; added oline breaks in big help of notification_email_send.
...
bzr revid: tde@openerp.com-20130313125124-wbu17isbi6cay100
2013-03-13 13:51:24 +01:00
Thibault Delavallée
ecd460e0d5
[IMP] email_template: improved help for email_from.
...
bzr revid: tde@openerp.com-20130313121659-pvdy814zoq9zonf2
2013-03-13 13:16:59 +01:00
Thibault Delavallée
3dc1a58ed5
[FIX] crm, email_template: fixed help messages talking about partners and leads instead of leads and partners... well, I think this comment is not very understandable, but at least there is a commit message. Horray.
...
bzr revid: tde@openerp.com-20130313121221-lo0kmkt2lltyr94e
2013-03-13 13:12:21 +01:00
Thibault Delavallée
fdf7410acf
[FIX] crm, res_partner: added separator in search views after adding not opt-out filter.
...
bzr revid: tde@openerp.com-20130313115901-s60j69qn3e3q4bpk
2013-03-13 12:59:01 +01:00
Thibault Delavallée
2f4a59fd06
[IMP] email_template, crm: added forgotten filters for opt-out; cleaned help of opt-out; email body is back into internal note as it has been decided that it was too much change for 7.0, especially that email content parsing is not robust enough.
...
bzr revid: tde@openerp.com-20130313112013-veqzplextey1300p
2013-03-13 12:20:13 +01:00
Thibault Delavallee
d7e5763dcb
[IMP] mail, email_template: improved mass mailing action (renamed, now using a well defined template) + improved form view of mail.compose.message wizard.
...
bzr revid: tde@openerp.com-20130312133817-y9xztv6gs4ut7ndj
2013-03-12 14:38:17 +01:00
Thibault Delavallée
a2a8c238dc
[CLEAN] email_template: removed a print statement.
...
bzr revid: tde@openerp.com-20130311124254-xzxs1r6cnqw2zxxc
2013-03-11 13:42:54 +01:00
Thibault Delavallée
86d71c9a52
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130308125916-s0zfujfgxme1aak1
bzr revid: tde@openerp.com-20130311090134-m022fovlmpcm6dom
2013-03-11 10:01:34 +01:00
c5319f47f7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053740-hrhdafa05mp0s6cd
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051349-azaf8kb3hdi6ux85
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054204-8yc0hga0v6pkk36x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053843-8x3181swnc2x0rim
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051523-z6034cfpv1qbztzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054303-38ti3nq1h5jfbasa
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053849-8eqsc9sjxknzfha8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051527-tajzx0x6p7mzpg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054307-qgl6ao1a06b9an3a
2013-03-11 05:43:07 +00:00
Thibault Delavallée
d130a05e8c
[FIX] crm, email_template: opt_out parameter used only for mass mailing and marketing campaigns. Updated help accordingly.
...
bzr revid: tde@openerp.com-20130308124753-dzt5e5nf7zpaq2dk
2013-03-08 13:47:53 +01:00
Thibault Delavallée
22bba15ccd
[FIX] email_template: on_change values for m2m can be list of ids, not necessarily commands.
...
bzr revid: tde@openerp.com-20130308124341-ih0f4us81cffer7m
2013-03-08 13:43:41 +01:00
Turkesh Patel (Open ERP)
b979204344
[IMP] give name to the wizard and improve domain
...
bzr revid: tpa@tinyerp.com-20130308093740-al8tywa721h3spy1
2013-03-08 15:07:40 +05:30
Thibault Delavallée
5ebf390f96
[FIX] email_template: void value in partner_ids when generating tmeplate does not erase wizard value anymore.
...
bzr revid: tde@openerp.com-20130308091156-ytw5k4y5w321705f
2013-03-08 10:11:56 +01:00
cc87ba5db7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308052354-6aerviht20qnfh26
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060553-lujyj3qxhqljssu0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060749-69tgopwkctb0v5ei
2013-03-08 06:07:49 +00:00
Thibault Delavallée
2a849670f4
[IMP] email_template: from and subject are not required anymore, because they can have now defautl values using chatter.
...
bzr revid: tde@openerp.com-20130307165045-dihvsdo3whgsk05b
2013-03-07 17:50:45 +01:00
Thibault Delavallée
2da3ea2d62
[IMP] email_template: added _order as name.
...
bzr revid: tde@openerp.com-20130307165014-gv2gmfh9d1nvjy9h
2013-03-07 17:50:14 +01:00
Turkesh Patel (Open ERP)
439b35d9ed
[IMP] email_template:make template_id field many2one from selection and aplly domain of related model, improve view of email_template
...
bzr revid: tpa@tinyerp.com-20130307132446-gsb9yp32o7fnomco
2013-03-07 18:54:46 +05:30
Olivier Dony
1e5a3aa787
[I18N] *: update translation templates for latest term changes due to bug fixes
...
bzr revid: odo@openerp.com-20130307121934-jfwfl1q0jtvswe0c
2013-03-07 13:19:34 +01:00
Thibault Delavallée
f8481a83d0
[IMP] email_template: cleaned a bit duplicated code.
...
bzr revid: tde@openerp.com-20130305151503-t99tu53x35d3ea29
2013-03-05 16:15:03 +01:00
Thibault Delavallée
f7484297d9
[CLEAN] mail.compose.message: some cleaning in new fields strings, and in form vivew.
...
bzr revid: tde@openerp.com-20130305124259-x3vb5ds2xi9v389d
2013-03-05 13:42:59 +01:00
Thibault Delavallée
c63de2c9c2
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130305121955-49g21indundhnca3
2013-03-05 13:19:55 +01:00
b46c9dae1b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302045718-19m5dowwcweyf3fy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303050056-i10g2vgmvxm9l392
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305050744-svuruvv63292prwx
2013-03-05 05:07:44 +00:00
420f82ec0e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053802-13krr4lhrwrebwak
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053905-y30zk4dbbcc3qj4b
2013-03-05 05:39:05 +00:00
03ad9f7290
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302052257-0w9v71dump44rtov
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303052333-9kn24ocknaagn33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130304055956-54bietn1iazrisga
2013-03-04 05:59:56 +00:00
ece4451176
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301053921-r8m4764fosovd9h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301054021-crdgcw5mb7m77u0t
2013-03-01 05:40:21 +00:00
8882eca92e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301044347-0g40ffxeii67yxtr
2013-03-01 04:43:47 +00:00
be867174aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130228053125-9y59zz3w45ata4c1
2013-02-28 05:31:25 +00:00
Thibault Delavallée
0aaca4daa9
[IMP] mail: improved mass mailing. Correctly take into account email_to, email_cc, partner_to even if no template. Mass mailing is a no-subtype post with additional recipients manually notified. Added option (in technical features) to send to followers, or to directly create a mail_mail. Added some default values in mail_message. Added explicit management of email_from and reply_to. Having a reply_to bypasses the 'model-res_id' in message_id behavior allowing to construct threads. Added explicit recipient_ids field on mail_mail that replaces the recipient_ids parameter in mail_mail.send(). Updated tests accordingly.
...
bzr revid: tde@openerp.com-20130225164857-i635atksj7riq9nd
2013-02-25 17:48:57 +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
96e97f7624
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130222051332-d4jok8jmkw4d8k56
bzr revid: launchpad_translations_on_behalf_of_openerp-20130223052013-0e0cku4hw2cmvymq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130224044210-qdwdy4etryz7h438
2013-02-24 04:42:10 +00:00
Vo Minh Thu
76ec85fca1
[IMP] report: use openerp.report.render_report() instead of LocalService().create().
...
bzr revid: vmt@openerp.com-20130222124823-6u7cqzj3d60buud5
2013-02-22 13:48:23 +01:00
Thibault Delavallée