diff --git a/account_statement_import_paypal/__manifest__.py b/account_statement_import_paypal/__manifest__.py index fcb02832..4322ee12 100644 --- a/account_statement_import_paypal/__manifest__.py +++ b/account_statement_import_paypal/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Import Paypal Bank Statements", 'summary': 'Import Paypal CSV files as Bank Statements in Odoo', - "version": "12.0.1.0.1", + "version": "12.0.1.1.0", "category": "Accounting", "website": "https://github.com/OCA/bank-statement-import", "author": " Akretion, Odoo Community Association (OCA)", diff --git a/account_statement_import_paypal/i18n/account_bank_statement_import_paypal.pot b/account_statement_import_paypal/i18n/account_bank_statement_import_paypal.pot index a2488da4..b61b35a0 100644 --- a/account_statement_import_paypal/i18n/account_bank_statement_import_paypal.pot +++ b/account_statement_import_paypal/i18n/account_bank_statement_import_paypal.pot @@ -98,7 +98,7 @@ msgid "Date Format" msgstr "" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:93 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:97 #, python-format msgid "Date format of map file and Paypal date does not match." msgstr "" @@ -156,7 +156,7 @@ msgid "Header Name" msgstr "" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:76 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:80 #, python-format msgid "Headers of file to import and Paypal map lines does not match." msgstr "" @@ -236,13 +236,13 @@ msgid "Origin Transaction ID" msgstr "" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:229 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:233 #, python-format msgid "PAYPAL-COSTS" msgstr "" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:194 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:198 #, python-format msgid "PayPal Import %s > %s" msgstr "" @@ -262,7 +262,7 @@ msgid "Paypal Mapping" msgstr "" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:228 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:232 #, python-format msgid "Paypal commissions" msgstr "" @@ -313,7 +313,7 @@ msgid "Transaction ID" msgstr "" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:103 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:107 #, python-format msgid "Value '%s' for the field '%s' on line %d, cannot be converted to float" msgstr "" @@ -324,7 +324,7 @@ msgid "Wizard Paypal Map Create" msgstr "" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:140 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:144 #, python-format msgid "You must run this wizard from the journal" msgstr "" @@ -336,7 +336,7 @@ msgid "comma (,)" msgstr "" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:125 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:129 #, python-format msgid "currency %s on line %d cannot be found in odoo" msgstr "" diff --git a/account_statement_import_paypal/i18n/es.po b/account_statement_import_paypal/i18n/es.po index 80fc0027..f55eceeb 100644 --- a/account_statement_import_paypal/i18n/es.po +++ b/account_statement_import_paypal/i18n/es.po @@ -106,7 +106,7 @@ msgid "Date Format" msgstr "Formato de fecha" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:93 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:97 #, python-format msgid "Date format of map file and Paypal date does not match." msgstr "" @@ -166,7 +166,7 @@ msgid "Header Name" msgstr "Nombre de la cabecera" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:76 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:80 #, python-format msgid "Headers of file to import and Paypal map lines does not match." msgstr "" @@ -248,13 +248,13 @@ msgid "Origin Transaction ID" msgstr "Id. de transacción" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:229 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:233 #, python-format msgid "PAYPAL-COSTS" msgstr "COSTES-PAYPAL" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:194 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:198 #, python-format msgid "PayPal Import %s > %s" msgstr "Importación de Paypal %s > %s" @@ -274,7 +274,7 @@ msgid "Paypal Mapping" msgstr "Plantilla de Paypal" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:228 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:232 #, python-format msgid "Paypal commissions" msgstr "Tarifa de Paypal" @@ -329,7 +329,7 @@ msgid "Transaction ID" msgstr "Id. de transacción" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:103 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:107 #, python-format msgid "Value '%s' for the field '%s' on line %d, cannot be converted to float" msgstr "" @@ -343,7 +343,7 @@ msgid "Wizard Paypal Map Create" msgstr "wizard.paypal.map.create" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:140 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:144 #, python-format msgid "You must run this wizard from the journal" msgstr "Debe ejecutar este asistente des del diario" @@ -355,7 +355,7 @@ msgid "comma (,)" msgstr "coma (,)" #. module: account_bank_statement_import_paypal -#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:125 +#: code:addons/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py:129 #, python-format msgid "currency %s on line %d cannot be found in odoo" msgstr "la monea %s de la línea %d no se puede encontrar en odoo" diff --git a/account_statement_import_paypal/tests/paypal_en.csv b/account_statement_import_paypal/tests/paypal_en.csv index 1bef2f8a..234a3273 100644 --- a/account_statement_import_paypal/tests/paypal_en.csv +++ b/account_statement_import_paypal/tests/paypal_en.csv @@ -1,3 +1,3 @@ "Date","Time","Time Zone","Description","Currency","Gross","Fee ","Net","Balance","Transaction ID","From Email Address","Name","Bank Name","Bank Account","Shipping and Handling Amount","Sales Tax","Invoice ID","Reference Txn ID" "12/15/2018","20:07:53","CET","Your best supplier","USD","-33.50","-2.3","-31.2","-31.2","53820712527632627","","John Doe","Bank of America","123456789","0","0","INV25","23" -"12/15/2018","22:07:53","CET","Your payment","USD","1,525.00","0","1,525.00","1,493.80","34731322767782103","","Agrolait","","","0","0","INV/2019/0003","24" +"12/15/2018","22:07:53","CET","Your payment","USD","1,525.00","0","1,525.00","1,493.80","34731322767782103","","Azure Interior","","","0","0","INV/2019/0003","24" diff --git a/account_statement_import_paypal/tests/test_paypal_statement_import.py b/account_statement_import_paypal/tests/test_paypal_statement_import.py index befc77e8..632aec92 100644 --- a/account_statement_import_paypal/tests/test_paypal_statement_import.py +++ b/account_statement_import_paypal/tests/test_paypal_statement_import.py @@ -14,10 +14,14 @@ class TestPaypalFile(common.SavepointCase): cls.map = cls.env['account.bank.statement.import.paypal.map'].create({ 'name': 'Paypal Map Test', }) + usd = cls.env.ref('base.USD') cls.journal = cls.env['account.journal'].create({ 'name': 'Paypal Bank', 'type': 'bank', 'code': 'PYPAL', + 'currency_id': ( + usd.id if cls.env.user.company_id.currency_id != usd else False + ), }) def _do_import(self, file_name):