pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 12.0 up to e11bacfe51

Browse Source
This commit is contained in:
Christophe Simonis
2019-05-09 21:07:44 +02:00
parent 92cb648882 e11bacfe51
commit cc3a2c1bf3
64 changed files with 606 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/reference/guidelines.rst
+4 -4
View File
@@ -1102,10 +1102,10 @@ description. Try to follow the preferred structure for your commit messages
End the message with references, such as task or bug numbers, PR numbers, and
OPW tickets, following the suggested format:
Related to task #taskId
Fixes #12345 (link and close issue on Github)
Closes #7865 (link and close PR on Github)
OPW-112233
task-123 (related to task)
Fixes #123 (close related issue on Github)
Closes #123 (close related PR on Github)
opw-123 (related to ticket)
Tag and module name
-------------------
doc/reference/qweb.rst
+1 -1
View File
@@ -99,7 +99,7 @@ Extra conditional branching directives ``t-elif`` and ``t-else`` are also
available::
<div>
<p t-if="user.birthday == today()">Happy bithday!</p>
<p t-if="user.birthday == today()">Happy birthday!</p>
<p t-elif="user.login == 'root'">Welcome master!</p>
<p t-else="">Welcome!</p>
</div>