[IMP] account_move_base_import: black, isort, prettier

This commit is contained in:
Florian da Costa
2021-01-03 16:08:01 +01:00
parent ad04b89ab5
commit c1c08605d8
8 changed files with 35 additions and 22 deletions

View File

@@ -9,7 +9,7 @@
"author": "Akretion,Camptocamp,Odoo Community Association (OCA)", "author": "Akretion,Camptocamp,Odoo Community Association (OCA)",
"category": "Finance", "category": "Finance",
"depends": ["account"], "depends": ["account"],
"website": "http://www.camptocamp.com", "website": "https://github.com/OCA/account-reconcile",
"data": [ "data": [
"security/ir.model.access.csv", "security/ir.model.access.csv",
"data/completion_rule_data.xml", "data/completion_rule_data.xml",

View File

@@ -285,7 +285,10 @@ class AccountJournal(models.Model):
res = self.env["account.move"] res = self.env["account.move"]
for result_row_list in parser.parse(file_stream): for result_row_list in parser.parse(file_stream):
move = self._move_import( move = self._move_import(
parser, file_stream, result_row_list=result_row_list, ftype=ftype, parser,
file_stream,
result_row_list=result_row_list,
ftype=ftype,
) )
res |= move res |= move
return res return res
@@ -357,7 +360,8 @@ class AccountJournal(models.Model):
except Exception: except Exception:
error_type, error_value, trbk = sys.exc_info() error_type, error_value, trbk = sys.exc_info()
st = "Error: {}\nDescription: {}\nTraceback:".format( st = "Error: {}\nDescription: {}\nTraceback:".format(
error_type.__name__, error_value, error_type.__name__,
error_value,
) )
st += "".join(traceback.format_tb(trbk, 30)) st += "".join(traceback.format_tb(trbk, 30))
raise ValidationError( raise ValidationError(

View File

@@ -14,7 +14,7 @@ _logger = logging.getLogger(__name__)
class ErrorTooManyPartner(Exception): class ErrorTooManyPartner(Exception):
""" New Exception definition that is raised when more than one partner is """New Exception definition that is raised when more than one partner is
matched by the completion rule. matched by the completion rule.
""" """
@@ -165,7 +165,7 @@ class AccountMoveCompletionRule(models.Model):
'account_id': value, 'account_id': value,
...} ...}
""" """
res = {} res = {}
partner_obj = self.env["res.partner"] partner_obj = self.env["res.partner"]
or_regex = ".*;? *%s *;?.*" % line.name or_regex = ".*;? *%s *;?.*" % line.name
@@ -197,7 +197,7 @@ class AccountMoveCompletionRule(models.Model):
'account_id': value, 'account_id': value,
...} ...}
""" """
res = {} res = {}
# The regexp_replace() escapes the name to avoid false positive # The regexp_replace() escapes the name to avoid false positive
# example: 'John J. Doe (No 1)' is escaped to 'John J\. Doe \(No 1\)' # example: 'John J. Doe (No 1)' is escaped to 'John J\. Doe \(No 1\)'
@@ -371,7 +371,8 @@ class AccountMove(models.Model):
msg_lines.append(repr(exc)) msg_lines.append(repr(exc))
error_type, error_value, trbk = sys.exc_info() error_type, error_value, trbk = sys.exc_info()
st = "Error: {}\nDescription: {}\nTraceback:".format( st = "Error: {}\nDescription: {}\nTraceback:".format(
error_type.__name__, error_value, error_type.__name__,
error_value,
) )
st += "".join(traceback.format_tb(trbk, 30)) st += "".join(traceback.format_tb(trbk, 30))
_logger.error(st) _logger.error(st)
@@ -382,7 +383,8 @@ class AccountMove(models.Model):
msg_lines.append(repr(exc)) msg_lines.append(repr(exc))
error_type, error_value, trbk = sys.exc_info() error_type, error_value, trbk = sys.exc_info()
st = "Error: {}\nDescription: {}\nTraceback:".format( st = "Error: {}\nDescription: {}\nTraceback:".format(
error_type.__name__, error_value, error_type.__name__,
error_value,
) )
st += "".join(traceback.format_tb(trbk, 30)) st += "".join(traceback.format_tb(trbk, 30))
_logger.error(st) _logger.error(st)

View File

@@ -22,7 +22,7 @@ except (ImportError, IOError) as err:
def float_or_zero(val): def float_or_zero(val):
""" Conversion function used to manage """Conversion function used to manage
empty string into float usecase""" empty string into float usecase"""
return float(val) if val else 0.0 return float(val) if val else 0.0
@@ -43,14 +43,14 @@ class FileParser(AccountMoveImportParser):
**kwargs **kwargs
): ):
""" """
:param char: parse_name: The name of the parser :param char: parse_name: The name of the parser
:param char: ftype: extension of the file (could be csv, xls or :param char: ftype: extension of the file (could be csv, xls or
xlsx) xlsx)
:param dict: extra_fields: extra fields to put into the conversion :param dict: extra_fields: extra fields to put into the conversion
dict. In the format {fieldname: fieldtype} dict. In the format {fieldname: fieldtype}
:param list: header : specify header fields if the csv file has no :param list: header : specify header fields if the csv file has no
header header
""" """
super().__init__(journal, **kwargs) super().__init__(journal, **kwargs)
if ftype in ("csv", "xls", "xlsx"): if ftype in ("csv", "xls", "xlsx"):
self.ftype = ftype[0:3] self.ftype = ftype[0:3]

View File

@@ -43,7 +43,7 @@ class TestCodaImport(common.TransactionCase):
) )
def _import_file(self, file_name): def _import_file(self, file_name):
""" import a file using the wizard """import a file using the wizard
return the create account.bank.statement object return the create account.bank.statement object
""" """
with open(file_name, "rb") as f: with open(file_name, "rb") as f:
@@ -59,8 +59,7 @@ class TestCodaImport(common.TransactionCase):
return self.account_move_obj.browse(res["res_id"]) return self.account_move_obj.browse(res["res_id"])
def test_simple_xls(self): def test_simple_xls(self):
"""Test import from xls """Test import from xls"""
"""
file_name = get_resource_path( file_name = get_resource_path(
"account_move_base_import", "tests", "data", "statement.xls" "account_move_base_import", "tests", "data", "statement.xls"
) )
@@ -68,8 +67,7 @@ class TestCodaImport(common.TransactionCase):
self._validate_imported_move(move) self._validate_imported_move(move)
def test_simple_csv(self): def test_simple_csv(self):
"""Test import from csv """Test import from csv"""
"""
file_name = get_resource_path( file_name = get_resource_path(
"account_move_base_import", "tests", "data", "statement.csv" "account_move_base_import", "tests", "data", "statement.csv"
) )

2
requirements.txt Normal file
View File

@@ -0,0 +1,2 @@
# generated from manifests external_dependencies
xlrd

View File

@@ -0,0 +1 @@
../../../../account_move_base_import

View File

@@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)