lp:~numerigraphe-team/openobject-addons/7.0-opw-605039-ls
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
Branch merges
Related bugs
Bug #1256199: [7.0] Ubuntu 13.10 Conflict with python package "resource" | Undecided | Confirmed |
Related blueprints
Branch information
Recent revisions
- 10047. By Numérigraphe
-
[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
- 10045. By Martin Trigaux (OpenERP)
-
[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
- 10042. By Martin Trigaux (OpenERP)
-
[FIX] analytic: should not set mutable objects in method declaration (python gotcha)
- 10041. By Martin Trigaux (OpenERP)
-
[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)
-
[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)
-
[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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openobject-addons