bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz

[MERGE] forward port of branch saas-3 up to revid 5093 chs@openerp.com-20140318114540-l50kmo4azb57g31x

bzr revid: chs@openerp.com-20140318124112-cj65l3wysk2rhwlw

[MERGE] forward port of branch saas-3 up to revid 3975 chs@openerp.com-20140318115516-sn3laxqseam1oz3f

bzr revid: chs@openerp.com-20140318124050-ul3reev0vvmgqxz8

[MERGE] forward port of branch saas-2 up to revid 3904 chs@openerp.com-20140318112743-tqv492026y2pnbff

bzr revid: chs@openerp.com-20140318115516-sn3laxqseam1oz3f

[MERGE] forward port of branch saas-2 up to revid 5021 chs@openerp.com-20140318105837-53vsx5g7fm517cuc

bzr revid: chs@openerp.com-20140318114540-l50kmo4azb57g31x

bzr revid: chs@openerp.com-20140402083506-w4cywcf0kxxx9xmk
bzr revid: chs@openerp.com-20140312174526-a5rhh83g0fw8djuc
bzr revid: chs@openerp.com-20140318105837-53vsx5g7fm517cuc
bzr revid: dle@openerp.com-20140326092548-bu4bqinhvco8j5wj
bzr revid: chs@openerp.com-20140402092735-3a23yjl169vvt0iv
bzr revid: chs@openerp.com-20140402112825-ky8rcb3p467ikitc
bzr revid: chs@openerp.com-20140403084808-slnj7uis17kwi9js

bzr revid: chs@openerp.com-20140403084524-9rb174osjrbmhgwc

bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6

bzr revid: odo@openerp.com-20140402122023-detokob7c6a06rux

[FIX] expression: translated search as params are flatten, we need to expand "%s" placeholders when using the `in` operator

bzr revid: chs@openerp.com-20140402112730-eoqxt0pu7lvcq5yg

bzr revid: odo@openerp.com-20140402110700-h3ryoroibj1m92ig

bzr revid: mat@openerp.com-20140402091755-u3wua9456yiwmqbh

bzr revid: odo@openerp.com-20140402090537-aozassn5in2qgd92

[FIX] hr_payroll: when computing pyslip lines, avoid previous rules to corrupt result_rate info in localdict and other contracts

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

bzr revid: mat@openerp.com-20140402085043-n8jl2hlwh5zi6dic

[FIX] account_voucher: it is authorized to enter invoice with negative amount, therefore the check amount constraint must take that into account

bzr revid: dle@openerp.com-20140402083713-tayk4r76bmrp9luf

bzr revid: mat@openerp.com-20140402082954-05zzk1k3ued4go5a

[FIX] sale: remove unnecessary write call changing state when creating invoice in 'Order Lines to Invoice' menu (opw 600073).

If sale order was with invoice based on delivery order mode, a done sale order would be put back to progress state.

bzr revid: mat@openerp.com-20140402082004-rc6pcg3igrw9achj

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

[MERGE] forward port of branch 7.0 up to revid 9943 launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis

bzr revid: chs@openerp.com-20140401184913-5hi2h11lnmadbozr

bzr revid: chs@openerp.com-20140401184204-e8tr0fnc5x053w6l

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

bzr revid: chs@openerp.com-20140331123012-dq3hsw2bc368zvgq

bzr revid: mat@openerp.com-20140331104448-4omzqnist6wlmakd

[FIX] task: added domain in project_id field on task view to restrict user for selecting closed project

bzr revid: ado@tinyerp.com-20140331054938-sq6xbwtmtnlx01y5

bzr revid: pna@tinyerp.com-20140331050122-kqfw152vcippdl52

bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064447-upr58gkij5ne9rm3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073044-67cql7rohzkmuub9

[MERGE] [FIX] procurement: cancelling purchase order should trigger action_assign on the stock move to correctly handle linked picking

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

bzr revid: mat@openerp.com-20140328130305-ozcdq0jft24p5n1i

[FIX] task: added domain in project_id field on task view to restrict user for selecting closed project

bzr revid: ado@tinyerp.com-20140328125215-2xypsdnn84nln171

[MERGE] [FIX] project: function field 'doc_count' is of type integer, not int, courtesy of Yanina Aular (Vauxoo)

bzr revid: mat@openerp.com-20140328114737-bk29fqfdyabx4r65

[FIX] task: added domain in project_id field on task view to restrict user for selecting closed project

bzr revid: ado@tinyerp.com-20140328113218-v9gxvylwdtefuj80

bzr revid: dle@openerp.com-20140328110052-m4t49u6ayd5l0m0g

bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064440-1ja0p23itklkg7yk

[MERGE][IMP] account: Set the order of the sequence by date while posting journal entries from wizard Periodical Processing> Draft Entries> Post Journal Entries

bzr revid: dle@openerp.com-20140327140304-9oyq6ebl48aasia8

[IMP] cookies: when retrieving session cookie, catch eventual parsing errors and remove cookie if incorrect (opw 605648)

In case of unparsable cookie (modified, corrupted,...), openerp would not load and crash with white screen until expiration.
With the fix goes back to login screen.

bzr revid: mat@openerp.com-20140327120826-2p6ebnojtmdl1wpm

bzr revid: mat@openerp.com-20140327113401-s3ee7fnexhre9mwb

[FIX] fields: when executing (4, *) operations on o2m fields, check the existence based on the sql model of the table.

If the o2m field linked to the o2m is stored on a different table (eg: model with _inherit), previous request would crash as the field do not exists in the '_table' sql table

bzr revid: mat@openerp.com-20140327111241-klftr0s8v8i68nxp

bzr revid: launchpad_translations_on_behalf_of_openerp-20140327081257-qru0hbrfsyepb2s2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327081313-vs355ra8b74c35d8

bzr revid: yanina.aular@vauxoo.com-20140326223329-o0dlgynicv0vq0t1

partial backport of trunk revision 8862
courtesy of Leonardo Pistone (camptocamp)

bzr revid: mat@openerp.com-20140326161008-uv8bo4eas2csbx1e

[REVERT] 4164 revid:dle@openerp.com-20140326113036-g9yv3jj6yetwxvg8: this fix actually works in saas-3, but not in 7.0, as search_read method is not part of the orm

bzr revid: dle@openerp.com-20140326123513-jkful2m1n2zjgdmv

[MERGE] [FIX] point_of_sale: replace search_read call by search + read (search_read not present in 7.0)

bzr revid: mat@openerp.com-20140326123101-50ln79wag3g52pe6