[MERGE] forward port of branch saas-3 up to revid 5116 chs@openerp.com-20140415133650-y46i0o3qkb2atbvi

bzr revid: chs@openerp.com-20140415140548-rlg9uypv78pywqhc

[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

[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

bzr revid: dle@openerp.com-20140415130732-bud8xb3pzgxw2imr

[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

bzr revid: jke@openerp.com-20140415101406-54cdr44xayvyq8xo

bzr revid: jke@openerp.com-20140415100834-2pstpw357y9klc89

[MERGE][FIX] account: while refuding the invoice with payment term journal items are created wrongly with write-off account

bzr revid: dle@openerp.com-20140415100702-s13cuejf89gtlnhc

invoiced bool of purchase order line is set to true on invoice validation, not on invoice creation

bzr revid: dle@openerp.com-20140415081211-jz6if0vzgq3inzzw

bzr revid: launchpad_translations_on_behalf_of_openerp-20140415075130-aqn4mzx05l3txtkb
bzr revid: launchpad_translations_on_behalf_of_openerp-20140415075337-ulie3qkes53t8ivf

[IMP] Add param calendar.block_mail in ir.config.parameters to allow to bypass the sent of mails to attendees.

bzr revid: jke@openerp.com-20140414202936-kh1izog183nwenb7

bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao

bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug

bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0

[FIX] Watch if jQuery is overwritted by another version in some script. If an override is detected, we check that all old function is always present else we add the missing. 
The problem was that some websites uses externals libraries which use a jQuery more recent that our version. Jquery by default  checks his own version  and overwrite itself if the current version is lower.
Once user had their jquery overwritted, function dropdown was missing and it was impossible to the end user to get menu working again... and so impossible to remove the view with the front end.

bzr revid: jke@openerp.com-20140414151423-zhi3tjj52rihltzy

[FIX] Add prototype watch in js object. That will allow to listen change on some library for example. It's used to know if jquery is overrided by an external script.

bzr revid: jke@openerp.com-20140414145802-osjcjj01f8ehwsqc

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9980 revid:dle@openerp.com-20140414121930-xbawuj93ddifhf4m

bzr revid: dle@openerp.com-20140414131146-1jz0isk58wgdsx2p

Therefore, for example, searching invoices for journals doesnt containing 'sales' actually returned invoices with journal containing 'sales'.

bzr revid: dle@openerp.com-20140414121930-xbawuj93ddifhf4m

bzr revid: jke@openerp.com-20140414094803-bfyvu3wizy09n53c

[FIX] mass_mailing: mail_thread model redefined as a osv.Model, while the original mail thread is an AbstractModel. Mass mailing mail thread must be an Abstract Model as well

bzr revid: dle@openerp.com-20140414090825-o456mdd9q38m47mw

[MERGE] [FIX] FormView: avoid multiple creations of the same line in o2m fields when the save action fails (e.g. forgot one required field)

This is done by removing the added action 'prepend_on_create' that can be present as many time as we pressed the save button

lp bug: https://launchpad.net/bugs/1265705 fixed

bzr revid: mat@openerp.com-20140414081003-290q4v21q01m4rsi

bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei

[FIX] web: do not try to close a destroyed dialog. trigger "closing" signal on close by top-right "X" button

bzr revid: chs@openerp.com-20140411162426-60bfybim5aqojsxx

[MERGE] Forward-port of 7.0 bugfixes up to rev 9976 rev-id: odo@openerp.com-20140411142429-y0rpkzqbrsabxqsg

bzr revid: odo@openerp.com-20140411142800-t8sbcmfkj3qgmrh3

[FIX] mail.thread: avoid overwriting thread_id/model with foreign values when reply-to hostname does not match + fix tests

This improve previous commit by making sure we
never consider the thread_id/model values in the
In-Reply-To/References header if the host name
did not match.
Also fixes the tests that were using the
6.1 compatibility mode to post in a mail group
thread instead of specifying the right
message-id.

bzr revid: odo@openerp.com-20140411142429-y0rpkzqbrsabxqsg

[FIX] Empty all current line(s) when you change template. Before, the display do it, but when you save, you have back the old lines.

bzr revid: jke@openerp.com-20140411142022-rceic1ma2axakzpe

[FIX] website_sale_quote - Make the sale quote template translatable when you edit a template. Force use of the language of partner in quotation, when you use a template.

bzr revid: jke@openerp.com-20140411141932-fk41zgsuw9e68t3a

(and maybe others)

Courtesy of Holger Brunn (Therp)

bzr revid: dle@openerp.com-20140411134203-lxt4mnquiiclv6w3

When emails transit from an OpenERP system to another
there is a chance of wrongly considering the foreign
model,id pair as local, possibly attaching a reply
to a wrong parent message.
This naive heuristic ignore the foreign identifiers
unless the hostname of the message-id mentioned in
the In-Reply-To header matches the local one.
This may fail after a change of local hostname but
is still better than the alternative.
In OpenERP v8 we should stop including the model,res_id
in outgoing Message-Id headers and only rely on the
stored, opaque, unique Message-Ids, preventing
any future mismatch.

bzr revid: odo@openerp.com-20140411101349-h3jmkdzvbr7lut26

bzr revid: launchpad_translations_on_behalf_of_openerp-20140411055930-7coykr7rveqsucp3

bzr revid: chs@openerp.com-20140410152039-hyf0yaizw8p4weg0

bzr revid: qdp-launchpad@openerp.com-20140414153613-geu20zacxnf0swol

bzr revid: rco@openerp.com-20140414144754-08fgs7xnzax5uzht

bzr revid: rim@openerp.com-20140414144407-cz3fmydj8vpzl7n6

bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0

[FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden-xs works, we don't lost 50% of width

bzr revid: jke@openerp.com-20140414142631-k78shkqjqdtcnp83

bzr revid: csn@openerp.com-20140414140652-g06gl0mguyhta5px

bzr revid: fp@tinyerp.com-20140414134026-ruv2o1vnpxtshnoo

bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4

[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open contract edit window anymore

bzr revid: rim@openerp.com-20140414125558-zcwstm1ooa3qecpx