Raphael Collet 25af735dd6 Fix inheritance of views with elements and text (#14944) ...

This avoids screwing up the text coming from the inherited views.

2017-01-05 17:26:46 +01:00

..

i18n

…

ir

Fix inheritance of views with elements and text (#14944)

2017-01-05 17:26:46 +01:00

module

…

report

…

res

[MERGE] forward port branch 10.0 up to 799e7f7740

2017-01-04 19:43:24 +01:00

rng

…

security

…

static

…

tests

Fix inheritance of views with elements and text (#14944)

2017-01-05 17:26:46 +01:00

__init__.py

…

__manifest__.py

…

base_data.xml

…

base_demo.xml

…

base_menu.xml

…

base.sql

…