[MERGE] forward port branch 12.0 up to 6a0675d36d

2019-01-14 10:34:50 +01:00
parent 976429c8c6 6a0675d36d
commit 3cbc9dd6c0
99 changed files with 1161 additions and 223 deletions
@@ -281,6 +281,7 @@ Inherited XML
 ~~~~~~~~~~~~~

 The naming pattern of inherited view is
+
 #. Extension mode: Use the same xml id than the original view you are extending, and suffix it by :samp:`{_inherit}` . For instance, the view :samp:`project.project_view_form` can be extended by :samp:`project_forecast.project_view_form_inherit`.
 #. Primary mode: Keep the original xml id.