git.inspyration.org Git - odoo/odoo.git/commit - openerp/addons/base/ir/ir

author	Xavier Morel <xmo@openerp.com>
	Thu, 12 Dec 2013 13:44:22 +0000 (14:44 +0100)
committer	Xavier Morel <xmo@openerp.com>
	Thu, 12 Dec 2013 13:44:22 +0000 (14:44 +0100)
commit	05469933279ce17a546bfefea40f3427a5a8cb18
tree	fd759377dbd219096a2b66f4e0f294cf868922f4	tree \| snapshot
parent	ebc6ff525623f2844eeae6c0afeec5e169685572	commit \| diff
parent	00b012c01b8d4dd65c991e59aea46d25078afab9	commit \| diff

[FIX] merge from trunk and fix handling of view inheritance

main problem, view inheritance model field would use model from the
root view (after following inherit_id links) rather than the base view
(the requested one) -> with divergent models, it was possible for the
requested view itself to never be returned.

bzr revid: xmo@openerp.com-20131212134422-uxg6h21w1jhth9ow

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

openerp/addons/base/base_data.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_http.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_company.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/test_views.py	diff1 \|	diff2 \|	blob \| history
openerp/http.py	diff1 \|	diff2 \|	blob \| history