Created by Lionel Sausin - Numérigraphe on 2014-05-14 and last modified on 2014-05-14

Resolve an import conflict with the standard python module "resource".
Green on runbot.

Get this branch:
bzr branch lp:~numerigraphe-team/openobject-addons/7.0-opw-605039-ls
Members of Numérigraphe can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

10047. By Numérigraphe on 2014-05-14

[MERGE] resource: change the way to import resource name to avoid name clashes - merged from lp:~openerp-dev/openobject-addons/7.0-opw-605039-ado and changed the 'from resource' fix

10046. By Launchpad Translations on behalf of openerp on 2014-05-14

Launchpad automatic translations update.

10045. By Martin Trigaux (OpenERP) on 2014-05-13

[FIX] sale_stock: when checkign the available quantity, do not include uom as it is already present in the context and will be included in the computation of product_obj.virtual_available (opw 607150)

fixing error message that does not match chosen units when not enough stock

10044. By Launchpad Translations on behalf of openerp on 2014-05-13

Launchpad automatic translations update.

10043. By Launchpad Translations on behalf of openerp on 2014-05-10

Launchpad automatic translations update.

10042. By Martin Trigaux (OpenERP) on 2014-05-09

[FIX] analytic: should not set mutable objects in method declaration (python gotcha)

10041. By Martin Trigaux (OpenERP) on 2014-05-08

[FIX] product: when duplicating a product, keep the language in the context

At the time of the context_wo_lang patch (7.0 revision 6577), the orm did not keep the language in copy_data, this patch intended to be more consistent.
Since server revision 5146 7.0, the new behaviour is to use the translated version in copy_data. Removign this change will be more consistent with the orm.

The expected behaviour is now the following:
In user lang: translated product name + translated '(copy)'
In other lang: same as original product

10040. By Martin Trigaux (OpenERP) on 2014-05-08

[FIX] hr_holidays: better display of leave counter (opw 605016)

The number of leave requests left is based on the employee_id key in the context, when displaying the status of an hr.holidays we don't have the information in the name_get of the hr.holidays.status.
The fallback on the number of employees is done with the uid but we can not rely on it as well as the name_get on m2o field is done with superuser_id.

10039. By Martin Trigaux (OpenERP) on 2014-05-08

[MERGE] [FIX] document_page: allow other users than administrator to create menu to a static page

Due to a global rule on ir.values (which is created when creating a ir.ui.menu), we need to execute the action as super user.

10038. By Launchpad Translations on behalf of openerp on 2014-05-08

Launchpad automatic translations update.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.