odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
95,293 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

1074 Commits

Author SHA1 Message Date
Gery Debongnie 0c24df7074 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
 2014-04-17 08:53:56 +02:00
Thibault Delavallée 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
Martin Trigaux 1ab962d338 [FIX] mail: convert attachments to binary as it is the expected format of message_post opw 604205 
The double convertion (render_message and send_mail) is done to keep the API but should be changed in next version.

bzr revid: mat@openerp.com-20140415161441-q6pfueetvv0namgw
 2014-04-15 18:14:41 +02:00
Thibault Delavallée 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
Gery Debongnie f57b767361 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
 2014-04-15 17:01:46 +02:00
Thibault Delavallée 55fc583f36 [REM] mail: compose message: removed unnecessary code 
bzr revid: tde@openerp.com-20140415143343-on2d3j92o6zifq59
 2014-04-15 16:33:43 +02:00
Gery Debongnie ecd2b4fd30 [IMP] improves the add/remove actions and preview buttons in email template form view (addon email_template) 
bzr revid: ged@openerp.com-20140414130910-hrx1wqy71ahdsmy4
 2014-04-14 15:09:10 +02:00
Thibault Delavallée 5ea15d56fb [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140414090428-y435e4tsy4ju5nc3
 2014-04-14 11:04:28 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch 
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
 2014-04-10 16:51:31 +02:00
Launchpad Translations on behalf of openerp bb8560f779 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140405061904-60l019fp9qbl890t
bzr revid: launchpad_translations_on_behalf_of_openerp-20140406065319-1cr9ypow2w870fbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140407065316-8z3pm4a79uff45z5
 2014-04-07 06:53:16 +00:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
 2014-04-02 06:44:59 +00:00
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views 
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
 2014-03-28 19:00:51 +05:30
Thibault Delavallée e65b472cb5 [IMP] email_template: previw improvements : 
- usability improveemnts on the sample document, more clear
- add partner_ids fields, displaying result of email template rendering that now also
generated partner_ids that will be recipient_ids on a mail_mail
- added attachment display

bzr revid: tde@openerp.com-20140327141241-2w2lxj5hkq8nqcu5
 2014-03-27 15:12:41 +01:00
Thibault Delavallée 272a7e5f80 [FIX] email_template: fixed error in default recipients calculation 
bzr revid: tde@openerp.com-20140327141141-qe47tlnnfb5xt9s8
 2014-03-27 15:11:41 +01:00
Thibault Delavallée dae3551132 [IMP] mass_mailing: usability improvements 
- from mass_mailing, creating or editing a template now goes through a wizard to avoid
tweaking too much the email.template view. This allows an easier management of templates
and their link with mailings.
- moved email.template minimal form view from email_tmeplate to mass_mailing, because it
is the sole module to use it. Tweaked it a bit by the way.
- removed dead code about actions not used anymore in mass_mailing
- empty list help on mail.mass_mailing.list
- various small usability fixes

bzr revid: tde@openerp.com-20140327130827-h9dy2m6mq10gzg1s
 2014-03-27 14:08:27 +01:00
Randhir Mayatra rma-openerp 457a62dee6 [IMP] add stat button for point of sale, email template 
bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
 2014-03-27 17:07:20 +05:30
Thibault Delavallée f002d9ff17 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140327093823-ev9mv771enwmdgrz
 2014-03-27 10:38:23 +01:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Thibault Delavallée d9ff66c3de [FIX] email_template minimal form view: add some required field in invisible 
in the view, to be able ot use default values when creating records

bzr revid: tde@openerp.com-20140325154031-vi773ggoz2q3qkxz
 2014-03-25 16:40:31 +01:00
Thibault Delavallée 2dc0372431 [FIX] email_template: protect against possible non existent value 
bzr revid: tde@openerp.com-20140325154006-fb5bu1khcvg6vdjb
 2014-03-25 16:40:06 +01:00
Thibault Delavallée 8c270f9b87 [FIX] email_template: fixed iteration on a dict 
bzr revid: tde@openerp.com-20140325142519-z3j1saqry9j23e0p
 2014-03-25 15:25:19 +01:00
Thibault Delavallée 97d49659d0 [IMP] email_template: added an option to automatically generate 
recipients instead of using template-based values. This should be the default way of using
templates actually, to avoid confusion with mako, ill-defined templates, ...

email_template code has been updated to handle recipient_ids when creating an email, depending
on its generated template values or default recipients.

mail_compose_message has also been updated, delegating the calculation of recipient when
having a template to the template itself, using some context keys to force the use
of partners instead of email_to and email_cc.

Also updated email_template form view to be a bit less confusing.

bzr revid: tde@openerp.com-20140325140324-bljvybigk3zv5ugm
 2014-03-25 15:03:24 +01:00
Randhir Mayatra rma-openerp c086291ddd [MERGE] merge with latest trunk 
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
 2014-03-25 19:26:35 +05:30
Randhir Mayatra rma-openerp 3caf591550 [IMP] change related button into stat for account,project 
bzr revid: rma@tinyerp.com-20140325124531-kkwm1v8bhndzs846
 2014-03-25 18:15:31 +05:30
Thibault Delavallée 9c80b99e5e [FIX] email_template: sending an email using the 
send_mail method of a template is not related to openchatter anymore;
therefore recipients should not be called 'followers of XX', but use
their real name instead. This is already done, but the tests were not
updated.

bzr revid: tde@openerp.com-20140325103955-oc7ob98b1jql7tlz
 2014-03-25 11:39:55 +01:00
Thibault Delavallée 7185a68775 [MERGE] Sync with trunk. 
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
 2014-03-25 10:02:09 +01:00
Thibault Delavallée 7945d4bb97 [IMP] email_template: added a minimal form view + some custo in mass mailing views 
bzr revid: tde@openerp.com-20140324171017-mcv5m493zpba5tgd
 2014-03-24 18:10:17 +01:00
Thibault Delavallée 1ce1468cea [CLEAN] email_template: mail_compose_message: small code cleaning and dead code removal 
bzr revid: tde@openerp.com-20140321172025-ntwxfakem8odo2nt
 2014-03-21 18:20:25 +01:00
Simon Lejeune 1c5a57a129 [FIX] email_template now use the new get_pdf method on the report model in order to avoid the blocking bug of generating a pdf with a public request.session 
bzr revid: sle@openerp.com-20140319185350-5t8iuvnzikwfajei
 2014-03-19 19:53:50 +01:00
Thibault Delavallée 48deceb6c6 [IMP] [REF] mail_compose_message: slightly cleaned wizard code to lessen the number of corner cases and 
to remove unnecessary code.
post and filter_id fields have been removed as they are not necessary.
Updated tests accordingly to new mass mailing tests: mass mailing create
emails, no message_post anymore using followers.

bzr revid: tde@openerp.com-20140317115315-ws8dvjbiv5rspk43
 2014-03-17 12:53:15 +01:00
Thibault Delavallée fd85a00311 [MERGE] Merged prototyping branch about improving performances 
in messaging, especially for mass mailing and mail mail creation. Some things will
probably be discarded or improved further, but this work will serve as a basis
for the whole mass mailing refactorign about speed.

bzr revid: tde@openerp.com-20140314165621-stpmdbq92fbigc3u
 2014-03-14 17:56:21 +01:00
Thibault Delavallée 08ab922468 [IMP] [REF] mass_mailing: first draft for the saas-4 refactoring. 
Improved mass mailing form view, that is used as a central point to create new
mailings.
Added concept of contact list (based on partner, or leads (to add)), as well as
contact (a list of name / email to import). Mailings are done un contact list
to simplify the way it works.
Added a kanban view of templates, with a flag to filter only mass mailing templates
(to avoid havign to deal with acknoledgments).
Using campaigns is now an option (a group), mailings can be done without having to
deal with campaigns.
Mailings and campaigns now have a status, used to display their kanban view.

bzr revid: tde@openerp.com-20140314165113-g4gvvifrhr2nfu15
 2014-03-14 17:51:13 +01:00
Thibault Delavallée e6f6960d17 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140314162124-fn8f9ne80skha19h
 2014-03-14 17:21:24 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6 
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
 2014-03-11 15:52:05 +01:00
Olivier Dony 9a3261da85 [IMP] email_template: allow extra builtins in rendering sandbox 
bzr revid: odo@openerp.com-20140310102410-m66aa8164tekr51t
 2014-03-10 11:24:10 +01:00
Thibault Delavallée db2bdee343 MERGE] [FIX] email_template: fix relative -> absolute url conversion 
Local URLs are converted into absolute URLs, notably because when using the
email designer, images are added using local URLs. Previously to this fix
the template was analyzed to find local URLs and make them absolute.
However this causes 2 issues :
- mako-based URLs are broken because a scheme is added before the mako that
generated the image src
- when changing the base url, the templates are not updated
The URLs are now converted dynamically when generating the content of the
html. This is done by passing a new parameter that enable the post processing
of the generated content.
Also fixed double body generation when using templates; fields parameter
was not propagated correctly.

bzr revid: tde@openerp.com-20140304112957-l9b10gyjqphs5fgc
 2014-03-04 12:29:57 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
 2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
 2014-03-04 07:52:38 +00:00
Thibault Delavallée 05fdc2290a [IMP] email_template: relocate url rewritign stuff directly into the rendering method. 
bzr revid: tde@openerp.com-20140303104044-hgmii31ga6msf72z
 2014-03-03 11:40:44 +01:00
Thibault Delavallée a9a4767d17 [FIX] email_template : 
- fixed composer using template that were rendering the body twice, once form the template and
once from the composer body. Only the latter one is used, so avoid generating the template body
that is not necessary
- fixed email_template generating values for a set of given fields, ignoring the field list
given into parameter
- fixed post processing of templates to transform local urls into absolute urls; now urls are
transformed after body generation, when sending email based on templates , or when generating
the content when using the composer.

bzr revid: tde@openerp.com-20140227153835-gmqnxrzed9fnbxhm
 2014-02-27 16:38:35 +01:00
Thibault Delavallée a17c09afff [IMP] [FIX] email_template: do not sanitize the template content. 
Indeed its content may contain invalid html that could be stripped by the
sanitizer. The content generated based on the template will be sanitized
when stored in the mail_mail or mail_message body field, thus after
rendering.

bzr revid: tde@openerp.com-20140227144228-d275lxz6ryarkg4t
 2014-02-27 15:42:28 +01:00
Thibault Delavallée b1f88d634d [IMP] [FIX] email_template: do not sanitize the template content. 
Indeed its content may contain invalid html that could be stripped by the
sanitizer. The content generated based on the template will be sanitized
when stored in the mail_mail or mail_message body field, thus after
rendering.
The template therefore holds html, but that is not sanitized. But that's
still html, therefore using an html field.

bzr revid: tde@openerp.com-20140227134829-te8mxeakc3s96fun
 2014-02-27 14:48:29 +01:00
Thibault Delavallée 47b1500c4b [CLEAN] email_template: cleaned modified code to lessen the diff 
bzr revid: tde@openerp.com-20140224135008-b43mf3fqw0ib13r6
 2014-02-24 14:50:08 +01:00
Thibault Delavallée 4739eb138b [IMP] mail, email_template: still continuing work to improve performances of mass mailing. 
main differences :
- record_name is not a function field anymore, but a char field + a method in create
if not given (default-like, but dependent of other values). This allows the composer
to give a value for record_name (False for email mass mailing) to avoid browsing
records and having their access rights issues in the way
- author_id, email_from coming from composer instead of called in every mail.message
creation
- moved code dealing with attachments from send_mail to get_mail-values, to that at
the end of this method we know all values of the email

Some tests have been updated / temporarily disabled.

bzr revid: tde@openerp.com-20140224132038-txdi0g30a7fzbnxp
 2014-02-24 14:20:38 +01:00
Thibault Delavallée 4a284821b4 [MERGE] Sync with trunnk 
bzr revid: tde@openerp.com-20140221145716-vkusdgd56rnc85rl
 2014-02-21 15:57:16 +01:00
Simon Lejeune 35b64811e9 [MERGE] trunk 
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
 2014-02-21 10:54:25 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr 
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
 2014-02-20 17:38:15 +01:00
Thibault Delavallée 1ac8e7cdfd [IMP] mail, email_template: mass mailing feature cleaning 
- now differentiates mass mailing and mass post.
- mass mailing is a true mass mailing
- using same_thread log a copy in the document, without using message_post
(using notification field, + model and res_id)
- improved form view of composer, adding a filed explaining a bit the various
recipients
- removed unnecessary fields coming from the template (partner_to, ...) because
they are confusing -> composer should be easier to understand and use
- removed some unnecessary code
- removed double body computation when using templates (one for tmeplate, then
the wizard -> not necessary)

This commit will be followed by other to try to improve the mass mailing
and mass post.

bzr revid: tde@openerp.com-20140220152945-ash0hfkzevzamihq
 2014-02-20 16:29:45 +01:00
Launchpad Translations on behalf of openerp 19ba8c54c9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140214074449-flu4n6hfh9nua9t3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140214074835-2p2r1vb6ucynbspm
 2014-02-14 07:48:35 +00:00
openerp-sle 999050a9df [IMP] Email_template module now handles qweb-pdf report in mail attachment 
bzr revid: openerp-sle@openerp-sle.home-20140212212259-sq7mpkt09a0t6v6d
 2014-02-12 22:22:59 +01:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc 
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
 2014-02-12 18:51:41 +01:00
Olivier Dony 08fc70a221 [FIX] email_template: attachments using many2many_binary widget are invisible unless label is present - pending widget fix as well 
bzr revid: odo@openerp.com-20140210143613-v56rmg1vwwgfxhhq
 2014-02-10 15:36:13 +01:00
Antony Lesuisse 87172d90d2 [MERGE] saas-3 
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
 2014-02-09 15:03:15 +01:00
Denis Ledoux 4ecf5bb09a [FIX] mail: create and edit of template_id in compose message now works, as we pass the template model in context (among others useful default value) 
bzr revid: dle@openerp.com-20140207104637-lkx5am24608n8jka
 2014-02-07 11:46:37 +01:00
Launchpad Translations on behalf of openerp ffabcd257c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
 2014-02-06 06:25:10 +00:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
 2014-02-04 06:48:35 +00:00
Launchpad Translations on behalf of openerp 4208281471 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201060213-5gub5wavdno2vcu4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202053135-qolj2vd2n4tjwbp3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203051828-wflc11kw2q8wc0aq
 2014-02-03 05:18:28 +00:00
Christophe Simonis c202dc1c52 merge upstream 
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
 2014-01-29 20:08:34 +01:00
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah 
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
 2014-01-29 19:47:03 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk 
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
 2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
 2014-01-28 06:41:39 +00:00
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates 
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
 2014-01-27 17:09:46 +01:00
Launchpad Translations on behalf of openerp d9cdc8564c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
 2014-01-27 05:46:06 +00:00
Fabien Pinckaers b15dbfa3a6 [IMP] mini imp 
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
 2014-01-25 13:37:58 +01:00
Denis Ledoux 1fb1a6f2af [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4 
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
 2014-01-24 13:10:27 +01:00
Thibault Delavallée b845b708af [CLEAN] email_template: cleaned code 
bzr revid: tde@openerp.com-20140124114743-m6s8d1byabl78l63
 2014-01-24 12:47:43 +01:00
Launchpad Translations on behalf of openerp c5dd038011 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062506-2xq1lhj82n923dbl
 2014-01-24 06:25:06 +00:00
Turkesh Patel (Open ERP) 43ba81ad1b [IMP] use product.template model for templates 
bzr revid: tpa@tinyerp.com-20140123134233-vp52fv0e047bbfgk
 2014-01-23 19:12:33 +05:30
Martin Trigaux b25d08f917 [FIX] email_template: error message instead of traceback when sending an email from a user without user 
bzr revid: mat@openerp.com-20140122094837-a0bkx2huqvkylniy
 2014-01-22 10:48:37 +01:00
Launchpad Translations on behalf of openerp d5bc07f898 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
 2014-01-22 06:13:35 +00:00
Launchpad Translations on behalf of openerp 698e2de138 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
 2014-01-21 06:20:40 +00:00
Launchpad Translations on behalf of openerp 28d79433c3 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
 2014-01-20 05:59:55 +00:00
Pooja Zankhariya (OpenERP) 722aee5336 [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
 2014-01-17 11:20:56 +05:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. 
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
 2014-01-16 11:39:10 +01:00
Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n 
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
 2014-01-15 22:44:54 +01:00
Pooja Zankhariya (OpenERP) ba458f6abc [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d
 2014-01-15 17:30:52 +05:00
Denis Ledoux 7084d9259f [FIX] email_template: fix test email_template, list of emails space-separated is not correct, should be comma-separated 
bzr revid: dle@openerp.com-20140114180652-xeoil4jgjh7k5i2e
 2014-01-14 19:06:52 +01:00
Denis Ledoux 899166ecac [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1 
bzr revid: dle@openerp.com-20140114173653-xhh85ubx27uu1306
 2014-01-14 18:36:53 +01:00
Olivier Dony a7cb9b762d [FIX] email_template: fix invalid uses of tools.email_split 
This is necessary to have the tests pass after
the corresponding server patch in server 7.0
at revision 5198 revision-id: odo@openerp.com-20140114120344-r58wndgybqusnnq7

lp bug: https://launchpad.net/bugs/1199386 fixed
lp bug: https://launchpad.net/bugs/1165531 fixed

bzr revid: odo@openerp.com-20140114134627-6j83f4s6pvnj4uma
 2014-01-14 14:46:27 +01:00
Thibault Delavallée 778de23d6f [IMP] email_template: body_html is now an html file, not a text file anymore. 
Now that tools.mail.html_sanitize() has been detroyed, there is
no need anymore to keep this field as a text field.

bzr revid: tde@openerp.com-20140113092440-je3vpgohvljukjmn
 2014-01-13 10:24:40 +01:00
Launchpad Translations on behalf of openerp 2a5a05f49d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140114064936-uengc20ppbqnn5ut
 2014-01-14 06:49:36 +00:00
Launchpad Translations on behalf of openerp c2794d0e85 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc
 2014-01-13 05:59:13 +00:00
Xavier Morel 7692df62c6 [FIX] test depends on demo data, demo data changed, test borken. Fix test. Tests depending on demo data suck. 
bzr revid: xmo@openerp.com-20140109091946-s77bgymh3pmzkyh3
 2014-01-09 10:19:46 +01:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
 2014-01-06 14:57:00 +01:00
jke-openerp ecca2f99c3 [Merge] Merge With Trunk 
bzr revid: jke@openerp.com-20140106082030-e0auqh3l9b2cpuyi
 2014-01-06 09:20:30 +01:00
Launchpad Translations on behalf of openerp e0951d6e18 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
 2014-01-02 05:45:30 +00:00
Fabien Pinckaers 9cbe77bc90 [IMP] several cleaning 
bzr revid: fp@tinyerp.com-20140101154754-cp4m9u84okx7m057
 2014-01-01 16:47:54 +01:00
Launchpad Translations on behalf of openerp 67e479e96e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
 2013-12-31 04:47:45 +00:00
Denis Ledoux 1508c5dd00 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb 
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
 2013-12-24 12:24:07 +01:00
Thibault Delavallée 1aa92dbc46 [FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958) 
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
 2013-12-20 17:55:19 +01:00
Thibault Delavallée b92ad39005 [FIX] email_template: support of email_recipients in send_mail. 
email_recipients is a char fields holding a comma separated list of partner_ids
that are the email recipients. This field is correctly handled in the composer
but was not taken into account in the send_mail method email_template.
However due to model limitations, this field can only be taken into account
when sending the email directly using force_send. When the email is
queued, no field is available to hold the value of email_recipients.
This is already fixed in trunk/v8 as a field has been added to handle
this value.

[FIX] mail: when sending email to some recipients_ids, filter to have only
the existing partner_ids. Trusting email template to generate valid
partner_ids is a bit risky.

[TESTS] email_template: added tests for send_mail

bzr revid: tde@openerp.com-20131220144652-h18yam60vpedbh7x
 2013-12-20 15:46:52 +01:00
jke-openerp 6bb986a2e5 [FIX] Fix according to APR's Review 
- Access Right too restrictif for user
- Bug UI between Firefox and Chrome
- Bug UI many2many_tag cursor on bullet
- Temp Fix on email_template to manage partner_to
- Manage attendee from hr_holidays 
- Manage avatar_model in sidebar_items for filter (res.partner was hard coded)
- Remove quick add from HR-holiday, because some field (as day) is calculated on event "onchange"

bzr revid: jke@openerp.com-20131220141855-mbhxtr07fn0sroe0
 2013-12-20 15:18:55 +01:00
jke-openerp 4a1208b39b [IMP] Redo tuto to get api key, because Google have changed console UI during the dev 
bzr revid: jke@openerp.com-20131219174536-msjd005fxhxgl9qq
 2013-12-19 18:45:36 +01:00
jke-openerp a6a5278747 [FIX] Partner_to changed form template to be a python list and not a list of int separed by comma 
bzr revid: jke@openerp.com-20131219152801-e70jmpfw10vf6ruy
 2013-12-19 16:28:01 +01:00
jke-openerp 306dd6e397 [IMP] Add span with class for footer received in mail 
[FIX] convert partner_to  from template_mail (string with comma) to recipent_ids (list of partner_id) in model mail_mail

bzr revid: jke@openerp.com-20131219133144-zbt100e8030wd927
 2013-12-19 14:31:44 +01:00
Thibault Delavallée ba73588c6c [FIX] email_template: fixed default_get, not possible ot render when we do not have any data about the record used for rendering 
bzr revid: tde@openerp.com-20131217165931-muxsi0hwhihcvo1f
 2013-12-17 17:59:31 +01:00
ajay javiya (OpenERP) 8f4617c335 [MERGE]: with main 
bzr revid: aja@tinyerp.com-20131210050701-116a01x8r194arg2
 2013-12-10 10:37:01 +05:30
Launchpad Translations on behalf of openerp a092227c6e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
 2013-12-08 05:46:53 +00:00
Thibault Delavallée 1037874e15 [CLEAN] mail: removed modifications that have nothing to do with website in mail.js + typo introduced in a test file 
bzr revid: tde@openerp.com-20131206101716-08q6f4ufhj50e239
 2013-12-06 11:17:16 +01:00
Christophe Matthieu fd2821086f [MERGE] sync with trunk 
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
 2013-12-02 16:09:25 +01:00
ajay javiya (OpenERP) 3e5ae00690 [ADD]: Quote roller module 
bzr revid: aja@tinyerp.com-20131202123437-zn6u2ckxbid3jknb
 2013-12-02 18:04:37 +05:30
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp 
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
 2013-11-30 14:07:25 +01:00
Thibault Delavallée f2c23488c3 [FIX] email_template: fixing to have the correct report suppose to correctly fix. So, fix the fix to fix it 
bzr revid: tde@openerp.com-20131126120843-gt8vdhl3yn61vd8r
 2013-11-26 13:08:43 +01:00
Thibault Delavallée 6f322004cc [FIX] email_template: when generating reports 
in batch, update the values for all res_ids, not only the
last one of the current template.

bzr revid: tde@openerp.com-20131126110742-aecac7r0zyappo0a
 2013-11-26 12:07:42 +01:00
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3 
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
 2013-11-25 16:00:54 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
 2013-11-21 06:38:38 +00:00
Thibault Delavallée 4fb0880259 [IMP] email_template: already generate tmeplate values in default_get 
bzr revid: tde@openerp.com-20131120135904-r630n937txivqak9
 2013-11-20 14:59:04 +01:00
Launchpad Translations on behalf of openerp 17fe569269 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119052725-2fcjekn5ouumctna
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120052525-2pwf2q3wdcrbqics
 2013-11-20 05:25:25 +00:00
Denis Ledoux f0ee6bac0a [FIX]email_template: render_template_batch return a dict, so we must get the right id of the dict to get the lang 
bzr revid: dle@openerp.com-20131118163114-rpmyjik1dkjuipez
 2013-11-18 17:31:14 +01:00
Denis Ledoux 4dfe327be5 [FIX]email_template: fixed call to render_template_batch using a list of ids instead of only one id. 
bzr revid: dle@openerp.com-20131118150129-log6925i4kc3dkxq
 2013-11-18 16:01:29 +01:00
Launchpad Translations on behalf of openerp 08abc4345a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054140-gta82n1b3iww6qy5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031051733-nnutbi7hidixsxsb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102055746-d0emb2aocq3sq1d1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103052149-y4usleohxatdgczx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105052928-1izkptj5zusflrvb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108054204-hrtuxxze2u1ivvez
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110055420-zl5ang9w8lbcvt9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111051738-smtttsszytn06ld4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054158-7ewd3oxiyxg8s4zw
 2013-11-12 05:41:58 +00:00
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
 2013-11-14 06:30:58 +00:00
Launchpad Translations on behalf of openerp 566af6033f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
 2013-10-14 05:33:13 +00:00
Thibault Delavallée bdd86a831f [IMP] ir_actions in email_template: template_id domain not only on view, directly on field 
bzr revid: tde@openerp.com-20131003140458-ztnd9taih2rcq8ty
 2013-10-03 16:04:58 +02:00
Thibault Delavallée fed1b1e91c [REF] ir_actions in email_template: strange implementation of displaying template values based on copying fields 
replaced by a standard related fields + using an onchange on the template.

bzr revid: tde@openerp.com-20131003133357-hbs35e3h4mleg9v5
 2013-10-03 15:33:57 +02:00
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
 2013-09-20 06:01:45 +00:00
Thibault Delavallée d23f15e1b2 [MERGE] Sunc with trunk 
bzr revid: tde@openerp.com-20130916092213-iuzc7lu5q0rc3hjm
 2013-09-16 11:22:13 +02:00
Launchpad Translations on behalf of openerp bc0d066505 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914054213-dq0kt273ooy6fozn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915055539-hzmy1ws1il6z8fji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915054954-zisp7huxai3ew84l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916054225-m0j262vooofcavqz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917043759-tke0eln0ca01hsm7
 2013-09-17 04:37:59 +00:00
Launchpad Translations on behalf of openerp 07f41591af Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914055308-488d7jp6pk12s4oq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061118-idedxdulpa7nb0s0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916061418-3r990vgrtgj1quyt
 2013-09-16 06:14:18 +00:00
Thibault Delavallée 22822d994b [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130912074055-7wari7rupipuqk17
 2013-09-12 09:40:55 +02:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
 2013-09-12 06:40:18 +00:00
Thibault Delavallée ce8c987089 [IMP] mail, email_template, mass_mailing: improvev mass mailing management in mail.compose.message + form view cleanings + some fixes in mail_mail about set_opened/replied/bounced, now checking that ids effectively exist 
bzr revid: tde@openerp.com-20130910151901-nhuwvtrkbwekyh7x
 2013-09-10 17:19:01 +02:00
Christophe Simonis 3fa90321e1 [MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry 
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
 2013-09-10 14:48:03 +02:00
Thibault Delavallée c063f54691 [IMP] mail: in mass mail mode, default value is now to send emails, not to perform a mass post on documents. 
bzr revid: tde@openerp.com-20130910124754-jssus6l43nil4qad
 2013-09-10 14:47:54 +02:00
Thibault Delavallée 38e75127d9 [MERGE] Syn with trunk 
bzr revid: tde@openerp.com-20130906081534-n273weq3h1fvfh2b
 2013-09-06 10:15:34 +02:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
 2013-09-03 05:48:57 +00:00
Thibault Delavallée 9ef46123a6 [IMP] mail.compose.message, email.template: rendering is now done in batch. 
Also refactored send_mail in mail.compose.message in order to be able to override
mail values without having to intefere with the send_mail behavior.

bzr revid: tde@openerp.com-20130828140929-xe9hbmbo6jxgs9mh
 2013-08-28 16:09:29 +02:00
Thibault Delavallée b35a44f66d [IMP] mail_mail, mail_message: various improvements to try to improve message creation time 
Replaced some read by browse
Moved get_reply_to from mail_mail to mail_message
Hint: specifying email_from, reply_to help to enhance computation time

[REF] mail: cleaned some tests, renamed a file, moved mail_group tests into a dedicated file

bzr revid: tde@openerp.com-20130827133058-ko0g0ib0f0jihmdk
 2013-08-27 15:30:58 +02:00
Olivier Dony 20e5751e62 [IMP] email_template: add `datetime` and `dateutil.relativedelta` in the global rendering context for templates 
The `dateutil` package is not included directly in the globals because
`dateutil.relativedelta.relativedelta` is an old-style class and jinja2
does not appear to support instantiating old-style classes within an
expression, so `relativedelta` support is provided using a "lambda proxy".

bzr revid: odo@openerp.com-20130826124405-bixzwyhl65c7v75b
 2013-08-26 14:44:05 +02:00
Launchpad Translations on behalf of openerp 2cec1eb045 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130822054004-iy1tgkww8vf91e5g
bzr revid: launchpad_translations_on_behalf_of_openerp-20130823055241-t379yr3ksuppirw0
 2013-08-23 05:52:41 +00:00
Olivier Dony c02afb45fa [MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy 
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
 2013-08-20 18:52:58 +02:00
Launchpad Translations on behalf of openerp 0e74fd31a4 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
 2013-08-19 04:57:37 +00:00
Launchpad Translations on behalf of openerp c46331a3ca Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055508-7yza7v2jdny1gear
bzr revid: launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806050509-v64stuiemu934s7t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130809053600-ssuy8yhd6ve9cse6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053806-gx2uwr6zoit4zow2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050026-l3omk3m8v7f34dnu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053803-dm8ugwnibrznai0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050015-lmxdgm6fks2fyzoe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130812050650-ta4kndyaxthut4tv
 2013-08-12 05:06:50 +00:00
Launchpad Translations on behalf of openerp 20a0428e6f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130726054722-d69j4mwclp38job7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130727052743-v62n9j5jvp11j2ji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728063405-ksa7gfbj9k4hajaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055426-094ilqmvjoocrzmm
bzr revid: launchpad_translations_on_behalf_of_openerp-20130727052813-u58hk431f664vao7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728063427-t032j0icp8pkksol
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055503-id0512tblbixh8to
 2013-07-29 05:55:03 +00:00
Thibault Delavallée 3770ec073e [DOC] mail, email_template: added changelog 
bzr revid: tde@openerp.com-20130726115918-5g4sfapjql4hs7zr
 2013-07-26 13:59:18 +02:00
Thibault Delavallée d83c7aeccc [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130725135057-a8m4pxqjbwnxzvs3
bzr revid: tde@openerp.com-20130726102342-1luyh4sh6rbziev4
 2013-07-26 12:23:42 +02:00
Thibault Delavallée d758de88f0 [IMP] email_template: server action: better management of template fields, saved but not editable 
bzr revid: tde@openerp.com-20130726093335-vxniwn121djpaw32
 2013-07-26 11:33:35 +02:00
Thibault Delavallée c4210aeeb0 [FIX] email_template: ir_actions: fixed email server action form view, a copy and paste introduced an error 
bzr revid: tde@openerp.com-20130726091212-kzt029fechedq0yp
 2013-07-26 11:12:12 +02:00
Thibault Delavallée 1dff0b7c4f [DOC] email_template: added changelod 
bzr revid: tde@openerp.com-20130726081825-xmq8agjvph3trb7t
 2013-07-26 10:18:25 +02:00
Thibault Delavallée f1f2b2ba06 [IMP] mail: mail.message now has mail_server_id from template_id. 
bzr revid: tde@openerp.com-20130722131725-i30xd4b03nui3hyw
 2013-07-22 15:17:25 +02:00
Launchpad Translations on behalf of openerp 08bf51a608 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130719063647-ajybj58frejzmzi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130720062338-fgevfrm113ns9ohh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130722055949-auzq29nv6b2f3o10
 2013-07-22 05:59:49 +00:00
Christophe Simonis bf29a2ebc7 [MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc 
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
 2013-07-18 13:59:28 +02:00
Denis Ledoux f8480b69be [FIX]email_template: generate_email_for_composer, clean context before find or create partner, to avoid default values for partner 
bzr revid: dle@openerp.com-20130716095928-z79ipwgjxw5ypg3y
 2013-07-16 11:59:28 +02:00
Thibault Delavallée 8aeba8a3a3 [ADD] email_template: added support for 'email' server action. 
Email server action are now entirely based on templates.
Added tests.

bzr revid: tde@openerp.com-20130715152516-69gokja8u0afgfh8
 2013-07-15 17:25:16 +02:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
 2013-07-15 05:14:00 +00:00
Launchpad Translations on behalf of openerp 89bc6e5e73 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130622062505-fobx7ncp6bkpouyt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623055452-s77jlu7z6kvjbdlz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624052557-hsaix5c3fu6opbva
 2013-06-24 05:25:57 +00:00
Launchpad Translations on behalf of openerp 3e269d1572 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070428-by6oo1fc0hvfoqc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615061319-hikvcj42kmv0fwla
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053220-l2jj1f2bfhr8s95f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062045-ydm23y8oyqt85r6d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065045-8n040l4nl7inbsho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061621-p7u5tapogm5ao1o2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063408-j244y20qpy61d6dn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615062054-6zhgccaoectf2c0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053235-3eimstk0anu72x9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062114-7wts3fyy6vgqzt8v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065127-8w5xbiwnnza5vlo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061719-63jsadfrb1yoqtgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063509-1xk30ymo1f7nn4h0
 2013-06-20 06:35:09 +00:00
Christophe Simonis aa133b4d29 [MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap 
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
 2013-06-14 11:19:24 +02:00
Christophe Simonis 448e19e550 [FIX] email_template: correct creation/deletion of context action 
bzr revid: chs@openerp.com-20130613143931-tpnx0diyvkovr2xe
 2013-06-13 16:39:31 +02:00
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
 2013-06-09 06:17:08 +00:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code 
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
 2013-06-07 21:43:09 +02:00
Thibault Delavallée 62a03693a3 [FIX] mail.compose.message in email_template: var typo 
bzr revid: tde@openerp.com-20130606130851-h5jswklvvz98enue
 2013-06-06 15:08:51 +02:00
Thibault Delavallée 72f6a8c646 [FIX] mail.compose.message: supports user_signature of template. Note that in case of multiple wizards (send on ids that is not a singleton list), user_signature on one template is valid for all wizard. 
bzr revid: tde@openerp.com-20130606123724-f7q3mwm81ek7mr5c
 2013-06-06 14:37:24 +02:00
Thibault Delavallée b3cde8da4a [FIX] email_template: allow to define context action even without having create access on ir.values and ir.action 
Hint: look for backport into 7.0

bzr revid: tde@openerp.com-20130606123415-vuelai2eh1yy3c87
 2013-06-06 14:34:15 +02:00
Launchpad Translations on behalf of openerp 1f96789be6 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130606052150-3gmo30yv2a4jrql4
 2013-06-06 05:21:50 +00:00
Thibault Delavallée 8205a2d113 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130531081018-dzm2w9p08hakm04q
 2013-05-31 10:10:18 +02:00
Launchpad Translations on behalf of openerp d9a24a551f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531053826-kecibs4xe8osg8kr
 2013-05-31 05:38:26 +00:00
Thibault Delavallée c93c8935ad [IMP] mail: now may raise exception instead of just logging it. They are used in auth_signup to avoid having the process considering the invite/reset password email was sent when it was not. 
bzr revid: tde@openerp.com-20130524114857-8wy5uob23i2d6b6p
 2013-05-24 13:48:57 +02:00
Thibault Delavallée 8aa85c2523 [FORWARD] Forward port of addons until revision 8711 
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
 2013-05-22 10:30:12 +02:00
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143. 
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
 2013-05-21 14:23:59 +02:00
Martin Trigaux c8c298c83c [IMP] clean permissions and shebang in files 
bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea
 2013-05-14 12:31:13 +02:00
Launchpad Translations on behalf of openerp a7a4f33d0f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063416-maq2j295cuj0d2j4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060435-zyumznnykvw92bfg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051425-9uhm1n0nmvyus33i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063526-tj5l5h3fger6llmw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051533-veqndxlj87s13tnp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130502060901-j2v1cs2l31in4q6t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130503062950-h0ojr1tlzqx5nu76
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071101-jh8a9d3cb8gcz34e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130505060428-4qacudpyuiez39b3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063544-ggq3rpht7nsoinxs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071108-g8u3u06xpp3g4sks
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063552-lwxw1ldh3mbflzqf
 2013-05-06 06:35:52 +00:00
Launchpad Translations on behalf of openerp 6970e5e041 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130430063704-q6sk7sup4c1ej18w
 2013-04-30 06:37:04 +00:00
Launchpad Translations on behalf of openerp 45e303b528 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130430052924-th3a8rf85bi2xz1t
 2013-04-30 05:29:24 +00:00
Olivier Dony 9c08e12962 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085 
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld

bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
 2013-04-29 17:14:10 +02:00
chirag patel 27686df49d [FIX] Fixed raise warning when email_from value false. 
bzr revid: cpa@tinyerp.com-20130429120409-sm0c01022qm25agv
 2013-04-29 17:34:09 +05:30
Launchpad Translations on behalf of openerp 3536f65967 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063440-bmcyenjvm2fm94ck
bzr revid: launchpad_translations_on_behalf_of_openerp-20130428054142-1k74s6tp0zv4aeu5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060457-72jpzgm0ky022n8u
 2013-04-29 06:04:57 +00:00
Launchpad Translations on behalf of openerp 71b245598e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130426053411-bv2sqofceiphm7vl
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427054423-i8yn2pamtsptx8sr
 2013-04-27 05:44:23 +00:00
Thibault Delavallée 3adb202441 [FIX] mail.compose.message in email_template: fix model used to filter the available templates. 
bzr revid: tde@openerp.com-20130425141743-gcq4wsso8jleosps
 2013-04-25 16:17:43 +02:00
Thibault Delavallée 856083e2b4 [FIX] email_template: fixed wrong res_id given to attachments in send_mail (should be a mail.message res_id, not a mail.mail res_id), to use the low-level attachments unlink. 
bzr revid: tde@openerp.com-20130422102114-a179ylzpgu3g6vcr
 2013-04-22 12:21:14 +02:00
Olivier Dony 96dd64e31f [REVERT] mail: undo model-level change that can cause issue for stable deployments 
Failing to force a manual update of the mail module would cause
all composer wizards to display html contents without the WYSIWYG
editor, making it mostly unusable for regular users. Users are
not expected to always force an update of all modules after
updating to the latest source code.

bzr revid: odo@openerp.com-20130417081410-dwc33ymizlihvbng
 2013-04-17 10:14:10 +02:00
Christophe Simonis 8a7fad6b22 [FIX] email_template/tests/test_mail.py: compose.body is not htmlized anymore 
bzr revid: chs@openerp.com-20130411190401-0ajvlapuyxop0zhn
 2013-04-11 21:04:01 +02:00
Thibault Delavallée f728ec93fd [FIX] email_template: fixed errors due to template_id now being a many2one, not an int anymore. 
bzr revid: tde@openerp.com-20130411134119-q1o71pn34v8u49jy
 2013-04-11 15:41:19 +02:00
Thibault Delavallée 4da68cbc22 [FORWARD] Forward port of addons 7.0 until revision 9008 
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
 2013-04-11 14:44:46 +02:00
Thibault Delavallée fe2ea997a2 [MERGE] Sync with trunk. 
bzr revid: tde@openerp.com-20130411103645-rmr3sa8p9ropx2gc
 2013-04-11 12:36:45 +02:00
Raphael Collet 894eeef8e0 [MERGE] from trunk 
bzr revid: rco@openerp.com-20130411073708-gaxl2332umtedmg6
 2013-04-11 09:37:08 +02:00
Launchpad Translations on behalf of openerp 252bcc802f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060824-pc5f2pj14gj0ak27
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055726-frtzw3gc9ut4wx4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053127-tolr13p1b3bhjny1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054749-t3x0zc7qk3n4man2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060920-k0cnlpk0rxcli841
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055741-loojniiz6du9upat
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053211-yvt1h32v41rs6jje
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054814-fwg742kzhsupr6kc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329051100-3ul1k4qwwm2f49gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060923-wch1f8ndmb15nu6x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055759-aj1nc93t9420lov0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053215-kqqgqefzp95fa1tk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054817-k33rri349nc2ioiz
 2013-04-02 05:48:17 +00:00
Raphael Collet 96ad608854 [IMP] general: use registry[X] instead registry.get(X) when X is dynamic 
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
 2013-03-29 15:37:20 +01:00
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
Launchpad Translations on behalf of openerp 7a8d71be6d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
 2013-03-29 05:09:03 +00:00
Launchpad Translations on behalf of openerp fc04522286 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
 2013-03-28 06:05:00 +00: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 e3ac95411a [MERGE] Sync with 7.0 
bzr revid: tde@openerp.com-20130319100303-ck8q56i70faasod1
 2013-03-19 11:03:03 +01:00
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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 9485c49f4f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316063604-hv8xtn4g8e76no72
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317053030-q0f5iyfhv4qtah18
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318052217-ua2ev323qlvhi8l2
 2013-03-18 05:22:17 +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
Launchpad Translations on behalf of openerp 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
Thibault Delavallée 70ce1e5eb4 [FIX] Fixed forgotten conflict when merging trunk. 
bzr revid: tde@openerp.com-20130314085315-m4didtupt20gmkyv
 2013-03-14 09:53:15 +01:00