Skip to content
Snippets Groups Projects
Commit 1f046d8e authored by OCA Git Bot's avatar OCA Git Bot
Browse files

Merge remote-tracking branch 'odoo/14.0' into 14.0

parents efde7068 4ed4952e
No related branches found
No related tags found
No related merge requests found
France, 2021-07-01
DEC agrees to the terms of the Odoo Corporate Contributor License Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this declaration.
Signed,
DEC github@decgroupe.com https://github.com/decgroupe
List of contributors:
Yann Papouin ypa@decgroupe.com https://github.com/ypapouin
{
"options": {
"autoRename": false,
"autoRenameStrict": false,
"blacklist": {
"rtlcss": {
"config": true,
"options": true
}
},
"clean": true,
"greedy": false,
"processUrls": false,
"stringMap": [],
"useCalc": false,
"aliases": {},
"processEnv": false
},
"plugins": [],
"map": false
}
...@@ -573,8 +573,8 @@ class AssetsBundle(object): ...@@ -573,8 +573,8 @@ class AssetsBundle(object):
rtlcss = misc.find_in_path('rtlcss.cmd') rtlcss = misc.find_in_path('rtlcss.cmd')
except IOError: except IOError:
rtlcss = 'rtlcss' rtlcss = 'rtlcss'
cmd = [rtlcss, '-']
cmd = [rtlcss, '-c', get_resource_path("base", "data/rtlcss.json"), '-']
try: try:
rtlcss = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) rtlcss = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment