ade618a63e
[IMP] payment: renamed env field to environment, to avoid conflicts
...
with the incoming new API.
bzr revid: tde@openerp.com-20140416121055-01ygh1zer7cfv98a
2014-04-16 14:10:55 +02:00
b7f3808824
[FIX]modal not correctly destroying from DOM at exit
...
bzr revid: csn@openerp.com-20140416120034-sps3a7dc2mgpwfzt
2014-04-16 14:00:34 +02:00
fef7f9adfd
[MERGE] [REF] mass_mailing refactoring. Mass mailing is refactored to be easier to use, introducing an easy-to-use way of handling recipients, mailing lists and statistics. This branch comes with a web branch that introduce the char_domain widget, that is a widget on a char field holding a domain. It allows to select and count records without having to deal with the complexity of domains.
...
This branch comes with a cleaning of marketing modules :
- marketing now holds only the basic stuff for marketing related modules: mainly marketing settings + menu definition
- marketing_crm new module is a bridge between crm and marketing and holds the crm-related stuff previously present in marketing module.
This branch also holds some mail and template improvement in order to speedup the mass mailing process. The template edition in website_mail has also be improved. It is now a page that allows to edit email-like content (content with a subject, an email_from and a body), like templates, emails or mass mailing.
Misc :
- mail_compose_message: removed unnecessary fields coming from the template (partner_to, ...) because they are confusing -> composer should be easier to understand and use; also cleaned method generating the email values in the composer that was splitted in two methods
- fixed removed double body computation when using templates (one for template, then the wizard -> not necessary)
- mail_message: record_name is not a function field anymore, but a char field + a method in create, allowing to speedup mass mailing by avoiding browsing all records to get their name
bzr revid: tde@openerp.com-20140416115152-tnitidd4v6w37hyp
2014-04-16 13:51:52 +02:00
4f53557311
[MERGE] [ADD] web: form: added FieldCharDomain widget. This widget works on a char field and is used to manage a domain. It allows to select records in a list view and to store the domain in the field, without having to deal with the complexity of writing domains.
...
[ADD] web: form: added FieldBarChart widget. This widget works on char field and display a serialized list of values as a barchart. This is used in stat buttons, like percent pie or stat info, to display a summary of some data on form view.
[IMP] web: some fixes and improvements in the stat buttons.
[IMP] web: list view: buttons in list view can now be text button, not only icon-based buttons. Icons are so v6 and not swag.
bzr revid: tde@openerp.com-20140416114938-3qsv8b8dumw5x4pj
2014-04-16 13:49:38 +02:00
2fdc1d1905
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416111721-g2vw6140a3adhk6y
2014-04-16 13:17:21 +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
73bbf079c7
[MERGE] qweb-m2o-view - Allow to use many2one for qweb template (work also with view_id)
...
bzr revid: jke@openerp.com-20140416085407-krltmt3jhw802a5c
2014-04-16 10:54:07 +02:00
ca8b6cc703
[MERGE] Allow to use many2one for qweb template (work also with view_id)
...
bzr revid: jke@openerp.com-20140416085136-xxqsqjyie5vtf6f3
2014-04-16 10:51:36 +02:00
f9b2b667a0
[FIX] email_template: back to partner_ids generation when using templates
...
bzr revid: tde@openerp.com-20140416083946-2qlv0liu8doshh9q
2014-04-16 10:39:46 +02:00
fe8a745b02
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416082925-eph1x8vnwj6o31rt
2014-04-16 10:29:25 +02:00
482638ab27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416082917-lnqc60vm3cid3gl6
2014-04-16 10:29:17 +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
3755fa19a5
[IMP] gamification and website_forum improvements
...
gamification:
- fix batch mode when grouping by id
- fix subquery in batch mode when a ending date is set
- serialisation method can exclude categories of challenge
- view improvements
website_forum:
- enabling bages in batch mode
- fix karma computation when creating a new post
- changing previous vote affects the user karma
- do not display forum challenges on user home page
bzr revid: mat@openerp.com-20140415162400-78cklbdw0bmn94zr
2014-04-15 18:24:00 +02:00
15e151dca7
[IMP] orm: postprocess function field values in batch
...
bzr revid: chs@openerp.com-20140415162321-l8hgeh6s48252zhl
2014-04-15 18:23:21 +02:00
0443680952
[FIX] gamification: the subquery domain should use less than for ending dates
...
bzr revid: mat@openerp.com-20140415161538-mdfadjjih90wuj3d
2014-04-15 18:15:38 +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
98472d8253
[CLEAN] Removed commented print
...
bzr revid: tde@openerp.com-20140415144943-ov6g4n9tzjxtwlk9
2014-04-15 16:49:43 +02:00
86e325b9f2
[REM] mass_mailing sub-modules: removed deda code
...
bzr revid: tde@openerp.com-20140415143452-igpz14t4xjqta6dn
2014-04-15 16:34:52 +02:00
55fc583f36
[REM] mail: compose message: removed unnecessary code
...
bzr revid: tde@openerp.com-20140415143343-on2d3j92o6zifq59
2014-04-15 16:33:43 +02:00
61da3f4aba
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
...
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
457b877160
[MERGE] forward port of branch saas-3 up to revid 4000 dle@openerp.com-20140415130951-ckuv8nsl17qkb300
...
bzr revid: chs@openerp.com-20140415142910-c3fqzce7wju83f5e
2014-04-15 16:29:10 +02:00
863e295937
[MERGE] forward port of branch saas-3 up to revid 5116 chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
...
bzr revid: chs@openerp.com-20140415140548-rlg9uypv78pywqhc
2014-04-15 16:05:48 +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
f39fb269a4
[FIX] chardomain field: fixed button action
...
bzr revid: tde@openerp.com-20140415135145-1wks35wufs9b1etq
2014-04-15 15:51:45 +02:00
35c7f4814d
Allow overwrite of the serialising method to exclude some categories in the challenge search
...
bzr revid: mat@openerp.com-20140415134809-uconkvnp0z32jxjs
2014-04-15 15:48:09 +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
02d07ac47e
[ADD] web: form: added char domain widget coming from mass_mailing. This widget
...
is used to compute the number of records according ot a domain, and to allow
selecting documents.
bzr revid: tde@openerp.com-20140415133914-v8fm6wn7up9ds85i
2014-04-15 15:39:14 +02:00
3d2e9b4d2b
[MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
...
bzr revid: jke@openerp.com-20140409153527-mic1a8afcvdhsd27
bzr revid: chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
bzr revid: chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
2014-04-15 15:36:50 +02:00
c25b816a3b
[FIX] web: fixed iamge buttons taking 2 lines
...
bzr revid: tde@openerp.com-20140415132655-029ulw9jgeut4bce
2014-04-15 15:26:55 +02:00
33ebae745d
[REV] Reverted changes about sidebar as we now have
...
a widget to handle things like selection in a list view.
bzr revid: tde@openerp.com-20140415132528-0spzmcb2xmphxpwn
2014-04-15 15:25:28 +02:00
bc0738e47e
One morning I shot an elephant in my pajamas. How he got in my pajamas, I don't know.
...
bzr revid: mat@openerp.com-20140415131929-6pktlodmlgr2fuwz
2014-04-15 15:19:29 +02:00
f8d5ef0f80
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
...
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
2014-04-15 15:09:51 +02:00
4a516a4709
[FIX] web_kanban: show more button of kanban view behind the kanban cards on (ie9)
...
bzr revid: dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
2014-04-15 15:07:32 +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
ecac1a7156
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140415113817-j38p3rn3j7pz2kxg
2014-04-15 13:38:17 +02:00
1c5ed2973e
[FIX] mail template view - Set body_html field as simple text area without cke by default. Else, the mako code are considered as mal formatted and moved.
...
bzr revid: jke@openerp.com-20140415113751-h0a1tg36tht1bys1
2014-04-15 13:37:51 +02:00
15306066d0
I love the smell of napalm in the morning.
...
bzr revid: mat@openerp.com-20140415113545-31efpjddjwqr4ajl
2014-04-15 13:35:45 +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
14ff39f96e
[FIX] website_forum: mooooore baaaaaadges
...
bzr revid: mat@openerp.com-20140415101842-yf6vndw7h62q0b42
2014-04-15 12:18:42 +02:00
1e93741081
[FIX] Website banner tour - Fix test according to new banner structure
...
bzr revid: jke@openerp.com-20140415101406-54cdr44xayvyq8xo
2014-04-15 12:14:06 +02:00
90d9b497b3
[FIX] mass_mailing: various fixes in campaign view and basic management
...
bzr revid: tde@openerp.com-20140415101342-7vvadykp1udz6hgs
2014-04-15 12:13:42 +02:00
df55b1eb9d
[FIX] Website tour - Click inside the zone before to insert sampleText
...
bzr revid: jke@openerp.com-20140415100834-2pstpw357y9klc89
2014-04-15 12:08:34 +02:00
Thibault Delavallée
Cedric Snauwaert
Kersten Jeremy
Martin Trigaux
Christophe Simonis
Denis Ledoux