diff options
| author | fw-bot <otis@odoo.com> | 2020-03-20 11:33:17 +0000 |
|---|---|---|
| committer | jvm-odoo <jvm@odoo.com> | 2020-03-23 13:17:51 +0000 |
| commit | 94fee8a8dd5d362594e3c3107e7475177ffed547 (patch) | |
| tree | 101fda3776426e295756b00af627db0b35fca5ae /addons/web/static/src/js/fields/basic_fields.js | |
| parent | 1e35fffc89741f7b9ef7b380ee77f4963f7084a9 (diff) | |
Cherry pick of b0c5370fd25191b4e537805b006fba02fffe2b23 failed
stdout:
stderr:
closes odoo/odoo#48197
Error: could not apply b0c5370fd25... Revert "[FIX] web, purchase, sale: fix no currency in calendar view"
Hint: after resolving the conflicts, mark the corrected paths
Hint: with 'git add <paths>' or 'git rm <paths>'
Hint: and commit the result with 'git commit'
X-original-commit: e8d6f1eae0f4f9c0f4df78553b7d51a03087940f
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Signed-off-by: Jason Van Malder (jvm) <jvm@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/fields/basic_fields.js')
0 files changed, 0 insertions, 0 deletions