From 6a89a649046886c4aceb40a9ee7f333199186cc0 Mon Sep 17 00:00:00 2001 From: Katulos <123748719+Katulos@users.noreply.github.com> Date: Fri, 17 May 2024 14:04:44 +0300 Subject: [PATCH 1/7] Update requirements.txt --- .docker_files/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.docker_files/requirements.txt b/.docker_files/requirements.txt index b3a00f9..82c5734 100644 --- a/.docker_files/requirements.txt +++ b/.docker_files/requirements.txt @@ -1,4 +1,5 @@ git+https://github.com/numigi/aeroolib@master +git+https://github.com/aeroo/currency2text@master babel==2.5.3 Genshi==0.7.5 freezegun==0.3.10 From 416fcf7eb0d8fa6333fc9c3c12f3af38227d346b Mon Sep 17 00:00:00 2001 From: Katulos <123748719+Katulos@users.noreply.github.com> Date: Fri, 17 May 2024 14:05:53 +0300 Subject: [PATCH 2/7] Update __manifest__.py Add currency2text depends --- report_aeroo/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report_aeroo/__manifest__.py b/report_aeroo/__manifest__.py index 3358af9..9d9f14a 100644 --- a/report_aeroo/__manifest__.py +++ b/report_aeroo/__manifest__.py @@ -13,7 +13,7 @@ 'website': 'https://bit.ly/numigi-com', 'depends': ['mail'], 'external_dependencies': { - 'python': ['aeroolib', 'babel', 'genshi'], + 'python': ['aeroolib', 'babel', 'currency2text', 'genshi'], }, 'data': [ "security/security.xml", From 5d919947081ec1f4de7a8c77225ab2c26beecf6c Mon Sep 17 00:00:00 2001 From: Katulos <123748719+Katulos@users.noreply.github.com> Date: Fri, 17 May 2024 14:11:12 +0300 Subject: [PATCH 3/7] Update ir_actions_report.py Add from currency2text --- report_aeroo/models/ir_actions_report.py | 1 + 1 file changed, 1 insertion(+) diff --git a/report_aeroo/models/ir_actions_report.py b/report_aeroo/models/ir_actions_report.py index 0b531e9..3269358 100644 --- a/report_aeroo/models/ir_actions_report.py +++ b/report_aeroo/models/ir_actions_report.py @@ -10,6 +10,7 @@ import sys import traceback from aeroolib.plugins.opendocument import Template, OOSerializer +from currency2text import supported_language from datetime import datetime from dateutil.relativedelta import relativedelta from functools import wraps From a2855866a67a79811e40502240c3ecd0b956abe7 Mon Sep 17 00:00:00 2001 From: Katulos <123748719+Katulos@users.noreply.github.com> Date: Fri, 17 May 2024 14:18:22 +0300 Subject: [PATCH 4/7] Update extra_functions.py Add from currency2text support --- report_aeroo/extra_functions.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/report_aeroo/extra_functions.py b/report_aeroo/extra_functions.py index 5bccf79..fd1bb01 100755 --- a/report_aeroo/extra_functions.py +++ b/report_aeroo/extra_functions.py @@ -10,6 +10,7 @@ import logging import time from babel.core import localedata +from currency2text import supported_language from datetime import datetime, date, timedelta from html2text import html2text from io import BytesIO @@ -70,7 +71,12 @@ def decorator(func): return func return decorator - +@aeroo_util("currency_to_text") +def currency_to_text(report, sum, currency, language = None): + lang = report._context.get("lang") or "en_US" + s_lang = supported_language.get(language or lang) + return str(s_lang.currency_to_text(sum, currency), "UTF-8") + @aeroo_util("format_hours") def format_hours(report, value): From f15d6e92ed405f8ea4f71d09c1dec415c4090c35 Mon Sep 17 00:00:00 2001 From: Katulos <123748719+Katulos@users.noreply.github.com> Date: Fri, 17 May 2024 14:19:32 +0300 Subject: [PATCH 5/7] Update extra_functions.py --- report_aeroo/extra_functions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/report_aeroo/extra_functions.py b/report_aeroo/extra_functions.py index fd1bb01..82ea1c7 100755 --- a/report_aeroo/extra_functions.py +++ b/report_aeroo/extra_functions.py @@ -71,6 +71,8 @@ def decorator(func): return func return decorator + + @aeroo_util("currency_to_text") def currency_to_text(report, sum, currency, language = None): lang = report._context.get("lang") or "en_US" From 22140416c1eb2ae0a88f3a61d7aa250cd0f0799a Mon Sep 17 00:00:00 2001 From: Katulos <123748719+Katulos@users.noreply.github.com> Date: Fri, 17 May 2024 14:19:50 +0300 Subject: [PATCH 6/7] Update ir_actions_report.py --- report_aeroo/models/ir_actions_report.py | 1 - 1 file changed, 1 deletion(-) diff --git a/report_aeroo/models/ir_actions_report.py b/report_aeroo/models/ir_actions_report.py index 3269358..0b531e9 100644 --- a/report_aeroo/models/ir_actions_report.py +++ b/report_aeroo/models/ir_actions_report.py @@ -10,7 +10,6 @@ import sys import traceback from aeroolib.plugins.opendocument import Template, OOSerializer -from currency2text import supported_language from datetime import datetime from dateutil.relativedelta import relativedelta from functools import wraps From d30883ce1e634dca97c2228a90926a67c4b6d4c2 Mon Sep 17 00:00:00 2001 From: Katulos <123748719+Katulos@users.noreply.github.com> Date: Sat, 18 May 2024 16:25:51 +0300 Subject: [PATCH 7/7] Update extra_functions.py --- report_aeroo/extra_functions.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/report_aeroo/extra_functions.py b/report_aeroo/extra_functions.py index 82ea1c7..1e4d769 100755 --- a/report_aeroo/extra_functions.py +++ b/report_aeroo/extra_functions.py @@ -74,9 +74,19 @@ def decorator(func): @aeroo_util("currency_to_text") -def currency_to_text(report, sum, currency, language = None): +def currency_to_text(report, sum, currency = None, language = None): lang = report._context.get("lang") or "en_US" s_lang = supported_language.get(language or lang) + context = report._context + currency = currency or context.get("currency") + if currency is None: + raise ValidationError( + _( + "The function `currency_to_text` can not be evaluated without a currency. " + "You must either define a currency in the field `Currency Evaluation` of the " + "Aeroo report or call the function with a currency explicitely." + ) + ) return str(s_lang.currency_to_text(sum, currency), "UTF-8")