lp:~alanbell/openobject-addons/openobject-addons

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2014-03-26

Diff: 21 lines (+2/-2)

1 file modified

account/account_invoice.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9253. By Alan Bell on 2014-03-26

fix lp:1108801 don't merge different taxes

9252. By Thibault Delavallée (OpenERP) on 2014-03-26

[MERGE] [CLEAN] website_mail: clean merging of trunk-archive (revid <email address hidden>) introducing Mailing List Archives. Featuring :
- uses already-existing template for subscription instead of copy-and-pasting the subscription button code;
- fixes several issues in the layout to ease the reading;
- fixes the broken pager;
- adds the Archives nav that was planned but not really usable

9251. By Christophe Matthieu (OpenERP) on 2014-03-25

[FIX] website: fix and activate frontend test

9250. By Fabien Meghazi (OpenERP) on 2014-03-25

[FIX] Fix url slug check bug in multilang=True

9249. By sle-openerp on 2014-03-24

[MERGE][REF] Report module: Moved methods generating pdf/html from Controller to Model in order to be able to print without request (report controllers still exist but are now just interfaces to these methods) ; adapted account_vat report this way

9248. By Denis Ledoux (OpenERP) on 2014-03-24

[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9347 revid:<email address hidden>

9247. By Christophe Matthieu (OpenERP) on 2014-03-24

[FIX] website: snippet editor: forward port of branch saas-3

9246. By Denis Ledoux (OpenERP) on 2014-03-24

[REF] *: share field is now a computed field, if the user is in the employee group or not

9245. By Christophe Matthieu (OpenERP) on 2014-03-24

[IMP] website: Building block / Snippet Editor
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.

9244. By Christophe Simonis (OpenERP) on 2014-03-24

[MERGE] forward port of branch saas-3 up to revid 9345 <email address hidden>