lp:~openerp-commiter/openobject-server/trunk-fix-uninstallation-sus
- Get this branch:
- bzr branch lp:~openerp-commiter/openobject-server/trunk-fix-uninstallation-sus
Branch merges
- qdp (OpenERP): Disapprove
-
Diff: 11303 lines (+9706/-216)14 files modifiedbin/addons/base/i18n/fa_AF.po (+9248/-0)
bin/addons/base/i18n/hu.po (+4/-4)
debian/po/he.po (+0/-39)
debian/po/pt_BR.po (+4/-4)
openerp/addons/__init__.py (+4/-2)
openerp/addons/base/__openerp__.py (+1/-0)
openerp/addons/base/i18n/nl.po (+5/-5)
openerp/addons/base/i18n/pt_BR.po (+226/-131)
openerp/addons/base/i18n/vi.po (+5/-5)
openerp/addons/base/ir/ir_rule.py (+34/-16)
openerp/addons/base/ir/workflow/print_instance.py (+22/-8)
openerp/addons/base/res/res_company.py (+5/-1)
openerp/addons/base/res/res_security.xml (+1/-1)
openerp/addons/base/test/test_ir_rule.yml (+147/-0)
Branch information
Recent revisions
- 3358. By Olivier Dony (Odoo)
-
[IMP] orm.fields_
view_get: allow passing a view_id from a different model for creative inheritance There are cases where several objects would like to use a single view, but
by default they cannot because a view belongs to only one model.
With this change, it becomes possible to do inheritance "by copy", reusing
a view from another model without having to redefine it, just by specifying
its view_id in the relevant actions. If the original view needs to be modified,
it is also possible to explicitly inherit the parent view from the other
model, and the effect will be what is expected: the child view can be
specified in an action, and will be the result of the inheritance applied
on the parent view; but on the other hande the parent view itself is
unaffected when used in the context of its own model. - 3357. By Olivier Dony (Odoo)
-
[MERGE] merged latest fixes from 6.0 branch up to rev 3348
Rev 3348 is <email address hidden>.
- 3355. By Olivier Dony (Odoo)
-
[FIX] tools.config: expansion of user and path should work with multiple addons path too
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openobject-server