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

Branch merges

Merged into lp:ocb-addons

Pedro Manuel Baeza: Approve (code review) on 2013-12-09

Alexandre Fayolle - camptocamp: Approve (code review, no test) on 2013-11-29

Stefan Rijnhart (Opener): Approve on 2013-11-29

Diff: 198 lines (+102/-33)

3 files modified

procurement/schedulers.py (+0/-1)
purchase/purchase.py (+40/-9)
purchase_requisition/purchase_requisition.py (+62/-23)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9816. By Dhruvit Darji(OpenERP Trainee) on 2014-01-06

[FIX] action should return True

9815. By Etienne Hirt on 2014-01-06

[FIX] int(base_calendar_id) can return an exception instead of false

9814. By Launchpad Translations on behalf of openerp on 2014-01-05

Launchpad automatic translations update.

9813. By Launchpad Translations on behalf of openerp on 2014-01-04

Launchpad automatic translations update.

9812. By Launchpad Translations on behalf of openerp on 2014-01-03

Launchpad automatic translations update.

9811. By Denis Ledoux (OpenERP) on 2014-01-02

[FIX] mail: mails with attachments containing special chars (such as é) were not delivered properly

get_filename method from email lib returns sometimes decoded value, sometimes still encoded.
for instance, get_filename cannot decode iso encoded filename

Recently, decode method has been applied on filename string, to handle iso encoded file.
Sadly, one cannot decode already decoded values.
Therefore, decoding already decoded windows or utf-8 encoded filename with special chars failed.

9810. By Launchpad Translations on behalf of openerp on 2014-01-02

Launchpad automatic translations update.

9809. By Launchpad Translations on behalf of openerp on 2014-01-01

Launchpad automatic translations update.

9808. By Launchpad Translations on behalf of openerp on 2013-12-31

Launchpad automatic translations update.

9807. By Launchpad Translations on behalf of openerp on 2013-12-30

Launchpad automatic translations update.