d9cda97cf4
[MERGE] Forward-port saas-4 up to 5ceded9
2014-07-05 01:28:19 +02:00
5ceded9d69
[MERGE] Forward-port saas-3 up to 4fa30f5
2014-07-05 01:04:19 +02:00
4fa30f5569
[FIX] mass_mailing: avoid mutable values for dict.fromkeys(), simplify with RIGHT JOIN
2014-07-04 23:56:22 +02:00
d32fc5c597
[FIX] mass_mailing: wrong copy-paste of statistics computation code
...
Mixes the mass_mailing_id and mass_mailing_campaign_id
between the two models. Introduced by 9fc4ad9#472
2014-07-04 23:15:22 +02:00
0ce1ecd6db
[FIX] mass_mailing: various fixes
2014-06-18 11:10:31 +02:00
9fc4ad99f0
[FIX]mass mailing: performance issue on stats #469
2014-06-11 11:36:11 +02:00
1dc7d4d3d8
[FIX] mass_mailing: fixed computation of mailing domain when having more than 1 mailing list added in the recipients. A bit longer, but less buggy.
2014-06-04 18:54:20 +02:00
00b8f5b001
[FIX] mass_mailing: mailing form view: better display of action buttons, avoiding having several 'red action buttons' at the same time.
2014-06-04 18:20:55 +02:00
b1c0bc0b46
[MERGE] forward port of branch saas-4 up to 65f68c1
2014-06-03 19:45:19 +02:00
4be1ba8b6f
[FIX] mass_mailing: newsletter snippet:
...
- fixed subscription, was always subscribing to the last created list;
- slightly improved the snippet display, now displaying a 'thanks' when subscribed instead of just making everything disabled;
- removed unnecessary JS line
2014-06-03 15:21:29 +02:00
e02759a58e
[FIX] website_mail: fixed template choice and body duplication in the email designer that was buddy; added some css to the page to make it more look like an email designer; also added a demo data for a template for mass mailing contacts in mass_mailing module.
2014-06-03 10:56:05 +02:00
cbdf7830b1
[FIX] mass_mailing: fixes:
...
- fixed keeping the original message for routing, only when choosing to reply in the
original thread (notification=True)
- auto delete sent emails explicitely
- mail_thread: routing: fixed replies always choosen even when replying to emails
with a specified reply_to (using ref_match in the algorithm)
- mail_thread: routing: instead of exclusive routing heuristics, use each case
as a fallback of the previous.
2014-06-02 13:52:27 +02:00
dd36a0e509
[FIX] mass_mailing: on mass mailing sending, set same_thread for message composer
...
same_thread boolean field of mail.compose.message model define wether or not replies should be posted in the thread or not
On composer creation, this boolean should be passed according to the reply_to_mode of the mass_mailing
Otherwise, all replies would be posted in the thread, and the reply_to will be ignored (if same_thread id True, reply_to is poped from the mails values, mail/wizard/mail_compose_message.py:284)
2014-06-01 22:08:56 +02:00
d6a2ae642b
[FIX] mass_mailing: avoid to eval an undefined domain
2014-06-01 21:45:26 +02:00
46712acaec
[FIX] bunch of changes lost in incorrect merge f4d78ae738
2014-05-30 17:00:52 +02:00
d325c0caef
[REV] attempt to revert incorrect removals in f4d78ae738
2014-05-30 16:00:28 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
c93d169fde
[FIX] mail: fixed get_default_recipient, trying to call a method even if the target model do not have it; also fixed default recipients generation on the contact model; sending a mass mailing when not having recipient now raise a warning.
2014-05-27 13:33:10 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
f4d78ae738
Merge branch 'server-trunk'
...
Conflicts:
addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
e863668bc3
[IMP] email_template simplified form view: add link to website
2014-05-13 10:35:09 +02:00
4cecbd919f
[FIX] mass_mailing,website*,survey: leftover calls to website.get_public_user()
...
This method was (partially) removed at rev.9421
rev-id al@openerp.com-20140507153223-q73u5lhyrfw98o3a
bzr revid: odo@openerp.com-20140512103935-o0ue9wzenm5wjejq
2014-05-12 12:39:35 +02:00
555d4879c8
Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w)
...
bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj
2014-05-12 09:23:31 +02:00
6f60eb218f
[IMP] subscribe to group / newsletter widgets: wording cleaning
...
bzr revid: tde@openerp.com-20140509132156-qbmop9au07cllgkk
2014-05-09 15:21:56 +02:00
4c4d610336
[IMP] mass_mailing: added newsletter as mailing list data + imported contact still demo data
...
bzr revid: tde@openerp.com-20140509125358-2kjc462ttrnxmpxm
2014-05-09 14:53:58 +02:00
59b9344bab
[IMP] website_mail, mass_mailing: icon in editor for the snippets + renaming
...
bzr revid: tde@openerp.com-20140507090029-fh312buk013t1gdp
2014-05-07 11:00:29 +02:00
6c8db2ce68
[ADD] mass_mailing: add a snippet to allow subscribing to a contact list (newsletter)
...
bzr revid: tde@openerp.com-20140506145145-qvncr41sdmplc0bp
2014-05-06 16:51:45 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
f38387820d
[TYPO] mass_mailing: rename wrongly named function field (dayly -> daily).
...
[FIX] mass_mailing: add `oldname` attribute to some renamed fields.
[FIX] mass_mailing: replace int field with many2one field to enforce fkey
bzr revid: chs@openerp.com-20140429165430-6w4xplwr4c5ymi1j
2014-04-29 18:54:30 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
96b9d8b9d5
[FIX] mass_mailing: avoid using werkzeug API only present in 0.9+
...
bzr revid: odo@openerp.com-20140424131451-rhtokro13piol7ji
2014-04-24 15:14:51 +02:00
a32ccdbbd1
[FIX] mass_mailing: fixed test mailing wizard, still using unsubscribe url that is
...
now delegated on the mail_mail model.
bzr revid: tde@openerp.com-20140417122633-bej72c8yhv2y2y4z
2014-04-17 14:26:33 +02:00
ffc7bccef9
[IMP] removes an useless button_box in addon mass mailing to allow the stat button contained inside to be aligned properly (addon mass mailing)
...
bzr revid: ged@openerp.com-20140417094543-03q0sxu0jqpdva0k
2014-04-17 11:45:43 +02:00
d264cd1640
[IMP] website_mail: make the template / mail editor work. We now have a limited
...
set of fields that we try to edit (body_html and body for body, email_from and email for
email-from, name and subject for subject), because t-field is not dynamic. If the model
that should be edited does not hold those fields, the mail editor won't work.
Also fixed editor not being actiated when going into the body edition.
bzr revid: tde@openerp.com-20140416105901-vavkh9erjsq4mof9
2014-04-16 12:59:01 +02:00
fe8a745b02
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416082925-eph1x8vnwj6o31rt
2014-04-16 10:29:25 +02:00
4336c64a7c
[IMP] mail, mass_mailing: using a _mail_mass_mailing class attribute
...
it is now possible to compute models allowing mass mailing using mass_mailing_campaign
module. This allows to completely remove the bridges modules, using a more generic
controller for unsubscription.
bzr revid: tde@openerp.com-20140416082851-8duo6yrwr5hwd8c2
2014-04-16 10:28:51 +02:00
c5627c4d3f
[FIX] mass_mailing: fixed issue when generating unsubscirbe urlé
...
bzr revid: tde@openerp.com-20140415160743-5i0pjieo4o031ico
2014-04-15 18:07:43 +02:00
f7d7e34467
[REM] mass_mailing: removed now dead code
...
bzr revid: tde@openerp.com-20140415154754-60uvhxt8ho78pdqd
2014-04-15 17:47:54 +02:00
3eaeae55a0
[IMP] mail, mass_mailing: better recipientsz computation
...
for mass mailing, composer and template. This allows to have one method computing recipints
and avoid repetiting myself.
bzr revid: tde@openerp.com-20140415154700-zu2izvxfjq1k4h4a
2014-04-15 17:47:00 +02:00
7ffffe6889
[FIX] mass_mailing: fixed demo data
...
bzr revid: tde@openerp.com-20140415135846-ql9883kwc3skqelo
2014-04-15 15:58:46 +02:00
19a2f350fa
[IMP] mass_mailing: cleaned demo data
...
bzr revid: tde@openerp.com-20140415135157-blrw8vcv66nzs6wa
2014-04-15 15:51:57 +02:00
da7cb60cfc
[MOVE] Moved mass mailing chardomain widget to web.
...
bzr revid: tde@openerp.com-20140415133933-1uqlj3yujdwozz2m
2014-04-15 15:39:33 +02:00
4808ca3796
[FIX] mass_mailing: various fixed in chardomain widget
...
bzr revid: tde@openerp.com-20140415125222-uzvzgzo5gx6hmgor
2014-04-15 14:52:22 +02:00
ea2e59f86b
[FIX] mass_mailing: fixed email sending
...
bzr revid: tde@openerp.com-20140415113944-hjwjc2lh4ydzugr1
2014-04-15 13:39:44 +02:00
4aa717b695
[FIX] mass_mailing: form view: usability imp
...
bzr revid: tde@openerp.com-20140415113934-xu033xxibolvl62w
2014-04-15 13:39:34 +02:00
7e1e475d89
[IMP] mass_mailing :handle attachments for mailings
...
bzr revid: tde@openerp.com-20140415110439-j72v9cnz3nml7g04
2014-04-15 13:04:39 +02:00
922e8b610f
[IMP] mass_mailing :improved demo data
...
bzr revid: tde@openerp.com-20140415104337-gokvkpvx36wch132
2014-04-15 12:43:37 +02:00
d538a02c0e
[FIX] mass_mailing: fixed graph buttons in form view + fixed stat computation
...
bzr revid: tde@openerp.com-20140415104328-yll2kgxtjmg6f3hc
2014-04-15 12:43:28 +02:00
1e643d4ce5
[FIX] mass_mailing: fixed demo data: reply_to specified + remove create_date, not allowed
...
bzr revid: tde@openerp.com-20140415102818-zcm9vfc7zalg29f4
2014-04-15 12:28:18 +02:00
Olivier Dony
Thibault Delavallée
Anthony Muschang
Christophe Simonis
Denis Ledoux
Xavier Morel
Martin Trigaux
Gery Debongnie
Antony Lesuisse
Christophe Simonis
Fabien Meghazi