← Back to branch summary

~openerp-dev/openobject-server/trunk-bug-712254-ysa

~openerp-dev/openobject-server/trunk-bug-712254-ysa

Viewing all changes in revision 3477.

Committer: Olivier Dony
Date: 2011-06-24 13:35:29 UTC
mfrom: (3362.1.27 server-trunk)
Revision ID: odo@openerp.com-20110624133529-z4y01gy2fm0x0oj1

[MERGE] feature branch with improvements for sharing resources

Contains a few fixes for ir.rule management, tools for combining
domains, related tests, and a few minor fixes.

files modified:
openerp/addons/base/ir/ir.xml

openerp/addons/base/ir/ir_model.py

openerp/addons/base/ir/ir_rule.py

openerp/addons/base/ir/ir_ui_view.py

openerp/addons/base/res/res_user.py

openerp/addons/base/security/ir.model.access.csv

openerp/addons/base/test/test_ir_rule.yml

openerp/addons/base/test/test_osv_expression.yml

openerp/import_xml.rng

openerp/netsvc.py

openerp/osv/expression.py

openerp/osv/fields.py

openerp/osv/orm.py

openerp/tools/convert.py

openerp/tools/yaml_import.py

openerp/tools/yaml_tag.py

Show diffs side-by-side

added added

removed removed

openerp/addons/base/ir/ir.xml

openerp/addons/base/ir/ir_model.py

openerp/addons/base/ir/ir_rule.py

openerp/addons/base/ir/ir_ui_view.py

openerp/addons/base/res/res_user.py

openerp/addons/base/security/ir.model.access.csv

openerp/addons/base/test/test_ir_rule.yml

openerp/addons/base/test/test_osv_expression.yml

openerp/import_xml.rng

openerp/netsvc.py

openerp/osv/expression.py

openerp/osv/fields.py

openerp/osv/orm.py

openerp/tools/convert.py

openerp/tools/yaml_import.py

openerp/tools/yaml_tag.py

Older »