lp:~therp-nl/openobject-addons/7.0-ocb-fix_conflict_rev_9651

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9731. By Holger Brunn (Therp) on 2013-11-29

[FIX] cope with non-standard parameters of _get_warehouse continued

9730. By Holger Brunn (Therp) on 2013-11-29

[FIX] cope with non-standard parameters of _get_warehouse

9729. By Holger Brunn (Therp) on 2013-11-29

[MRG] merge conflicting code from
http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9628
and
http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9651

9728. By Quentin (OpenERP) <email address hidden> on 2013-11-27

[FIX] sale, purchase: don't copy the customer/supplier reference when copying a SO/PO

9727. By Quentin (OpenERP) <email address hidden> on 2013-11-26

[FIX] purchase: at the validation of the PO, force the company in the context as the company on the PO in order to read property fields correctly. This patch is necessary to allow a user to confirm a PO belonging to another company (if he has the rights to do so).

9726. By Launchpad Translations on behalf of openerp on 2013-11-27

Launchpad automatic translations update.

9725. By Denis Ledoux (OpenERP) on 2013-11-26

[FIX]hr_timesheet_sheet: add right-padding to timesheet weekly input in order to avoid the value to be partially cut (in ie 9/10, for instance)

9724. By Launchpad Translations on behalf of openerp on 2013-11-26

Launchpad automatic translations update.

9723. By Thibault Delavallée (OpenERP) on 2013-11-25

[FIX] mail: in some cases tracking is called
without the context (some workflows for example). In that case use the
current user lang when generating the automatic message. This is done
by adding it in the context if not present.

9722. By Thibault Delavallée (OpenERP) on 2013-11-25

[FIX] mail: fixed reply button in mail_mail form view, should reply
to a mail.message, not a mail.mail.