odoo-addon-account-move-payroll-import 16.0.1.0.1__py2.py3-none-any.whl → 16.0.1.0.3__py2.py3-none-any.whl

odoo/addons/account_move_payroll_import/models/payroll_import_setup.py

@@ -3,7 +3,7 @@
 from odoo import models, fields, api, _, Command
 from odoo.exceptions import UserError
 
-from ..utils.parse_utils import abs_float
+from ..utils.parse_utils import abs_float, parse_float
 
 
 # This are the only allowed mappings for the moment
@@ -18,6 +18,8 @@ ALLOWED_MAPPINGS = [
     "payroll_import_mapping_ss_bonus",
 ]
 
+VALUE_ERROR_MSG = "Invalid value '%s' in column %s."
+
 
 class PayrollImportSetup(models.Model):
     _name = "payroll.import.setup"
@@ -338,9 +340,51 @@ class PayrollImportSetup(models.Model):
         }
 
     def validate_column_numbers(self, data_length):
+        def validate_indexes(names):
+            repeated_indexes = [
+                k for k, v in names.items() if list(names.values()).count(v) > 1
+            ]
+            if repeated_indexes:
+                raise UserError(
+                    _(
+                        "%s indexes are repeated. Please review your setup."
+                        % (", ".join(repeated_indexes))
+                    )
+                )
+
+            for name, idx in names.items():
+                if idx < 1:
+                    raise UserError(
+                        _(
+                            "Column index for %s must be greater than or equal to 1."
+                            % name
+                        )
+                    )
+                if idx > data_length:
+                    raise UserError(
+                        _(
+                            "Column index for %s must be less or equal than %s."
+                            % (name, data_length)
+                        )
+                    )
+
+        names = {}
         for field in [k for k in self._fields.keys() if k.startswith("column_")]:
-            if getattr(self, field) > data_length:
-                raise UserError(_("Column %s is out of range." % field))
+            index = getattr(self, field)
+            name = self.env["ir.model.fields"].search(
+                [("model", "=", self._name), ("name", "=", field)],
+                limit=1,
+            ).field_description
+            names[name] = index
+
+        for custom_concept in self.custom_concepts_ids:
+            index = custom_concept.col_index
+            name = custom_concept.name
+            names[name] = index
+
+        validate_indexes(names)
+
+        return True
 
     def compute_tc1rlc_ss_cumulative(self, row, cumulative):
         """
@@ -352,16 +396,37 @@ class PayrollImportSetup(models.Model):
                 row[self.column_total_tc1rlc - 1],
                 self.thousands_delimiter,
                 self.decimal_delimiter,
+                context={
+                    "raise_exception": True,
+                    "exception_msg": VALUE_ERROR_MSG % (
+                        row[self.column_total_tc1rlc - 1],
+                        self.column_total_tc1rlc
+                    )
+                }
             )
             - abs_float(
                 row[self.column_ss_employee - 1],
                 self.thousands_delimiter,
                 self.decimal_delimiter,
+                context={
+                    "raise_exception": True,
+                    "exception_msg": VALUE_ERROR_MSG % (
+                        row[self.column_ss_employee - 1],
+                        self.column_ss_employee
+                    )
+                }
             )
             - abs_float(
                 row[self.column_ss_company - 1],
                 self.thousands_delimiter,
                 self.decimal_delimiter,
+                context={
+                    "raise_exception": True,
+                    "exception_msg": VALUE_ERROR_MSG % (
+                        row[self.column_ss_company - 1],
+                        self.column_ss_company
+                    )
+                }
             )
         )
         return cumulative
@@ -394,8 +459,10 @@ class PayrollImportSetup(models.Model):
             return {}
 
         column = getattr(self, line_mapping.column_field, False)
-        value = abs_float(
-            row[column - 1], self.thousands_delimiter, self.decimal_delimiter
+        exception_msg = VALUE_ERROR_MSG % (row[column - 1], column)
+        value = parse_float(
+            row[column - 1], self.thousands_delimiter, self.decimal_delimiter,
+            context={"raise_exception": True, "exception_msg": exception_msg}
         )
 
         if not value:
@@ -447,8 +514,10 @@ class PayrollImportSetup(models.Model):
         cc_vals_list = []
         for custom_concept in self.custom_concepts_ids:
             column = custom_concept.col_index
+            exception_msg = VALUE_ERROR_MSG % (row[column - 1], column)
             value = abs_float(
-                row[column - 1], self.thousands_delimiter, self.decimal_delimiter
+                row[column - 1], self.thousands_delimiter, self.decimal_delimiter,
+                context={"raise_exception": True, "exception_msg": exception_msg}
             )
 
             if not value:
@@ -469,6 +538,14 @@ class PayrollImportSetup(models.Model):
         """
         Create the payroll account move.
         """
+        for vals in lines_vals:
+            # credits might be negative in the file
+            vals["credit"] = abs(vals.get("credit", 0.0))
+
+            # debits must be positive so: switch debit/credit if debit is negative
+            if vals.get("debit", 0.0) < 0.0:
+                vals["credit"] = abs(vals.pop("debit"))
+
         move = self.env["account.move"].with_context(
             is_payroll_import=True
         ).create(

odoo/addons/account_move_payroll_import/utils/file_utils.py

@@ -10,7 +10,8 @@ def get_file_extension(file_name):
     Get the file extension from the file name.
     """
     if file_name:
-        return os.path.splitext(file_name)[-1]
+        ext = os.path.splitext(file_name)[-1]
+        return str(ext).lower() if ext else False
     return False
 
 

odoo/addons/account_move_payroll_import/utils/parse_utils.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
+from odoo.exceptions import UserError
 
 
-def parse_float(value, thousands_sep=",", decimal_sep="."):
+def parse_float(value, thousands_sep=",", decimal_sep=".", context={}):
     """
     Parse a float value.
     :param thousands_sep: the thousands separator.
     :param decimal_sep: the decimal separator.
     :param value: the value to parse.
+    :param context: the context.
     :return: the parsed float value.
     """
     if type(value) in (int, float, bool):
@@ -16,19 +18,29 @@ def parse_float(value, thousands_sep=",", decimal_sep="."):
     if not value:
         return 0.0
 
-    value = value.replace(thousands_sep, "").replace(decimal_sep, ".")
-    return float(value)
+    value = value.replace(thousands_sep, "", 1).replace(decimal_sep, ".", 1)
+    try:
+        return float(value)
+    except ValueError:
+        if context.get("raise_exception", True):
+            msg = context.get("exception_msg", "Invalid float value: %s" % value)
+            raise UserError(msg)
+        return 0.0
 
 
-def abs_float(value, thousands_sep=",", decimal_sep="."):
+def abs_float(value, thousands_sep=",", decimal_sep=".", context={}):
     """
     Parse a float value and return its absolute value.
     :param thousands_sep: the thousands separator.
     :param decimal_sep: the decimal separator.
     :param value: the value to parse.
+    :param context: the context.
     :return: the absolute value of the parsed float value.
     """
     try:
         return abs(parse_float(value, thousands_sep, decimal_sep))
     except ValueError:
-        raise ValueError("Invalid float value: %s" % value)
+        if context.get("raise_exception", True):
+            msg = context.get("exception_msg", "Invalid float value: %s" % value)
+            raise UserError(msg)
+        return 0.0

odoo/addons/account_move_payroll_import/wizards/payroll_import_wizard.py

@@ -290,6 +290,8 @@ class AccountPayrollImportWizard(models.TransientModel):
         rows, cumulative_tc1rlc_ss = [], 0.0
         skip_lines = options.get("header_lines", 1) - 1
         for idx, row in enumerate(getattr(self, f"_read_{extension}")(options)):
+            if idx == 0:
+                import_setup.validate_column_numbers(len(row))
             if idx == import_setup.header_ref_line - 1:
                 self.account_move_ref = row[0].strip() or import_setup.name
 

{odoo_addon_account_move_payroll_import-16.0.1.0.1.dist-info → odoo_addon_account_move_payroll_import-16.0.1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account-move-payroll-import
-Version: 16.0.1.0.1
+Version: 16.0.1.0.3
 Summary: ODOO account move spanish payroll data import for social cooperatives.
 Home-page: https://gitlab.com/somitcoop/erp-research/odoo-accounting
 Author: Som It Cooperatiu SCCL, Som Connexió SCCL

{odoo_addon_account_move_payroll_import-16.0.1.0.1.dist-info → odoo_addon_account_move_payroll_import-16.0.1.0.3.dist-info}/RECORD

@@ -1,28 +1,28 @@
 odoo/addons/account_move_payroll_import/CHANGELOG.md,sha256=COE0An9jnvIrV7eWgGSa6XzTGN8tACjr_LkFmjRbqos,608
 odoo/addons/account_move_payroll_import/README.rst,sha256=fnLmb6E5pLv2d-kzAVwIs2O1QKyApMwCobkT9nUgXbo,3354
 odoo/addons/account_move_payroll_import/__init__.py,sha256=xdfbExIUANT_2sXVtonxwfOse1Cqvz2AVNntyx_lINE,68
-odoo/addons/account_move_payroll_import/__manifest__.py,sha256=8Tl6Ba4ENLvLvnqQc0Z4p4xZm0LvxYVjBFPG6dWfRUc,1379
+odoo/addons/account_move_payroll_import/__manifest__.py,sha256=ZNwrFnlEv-s7-KXZpw3ysYRKTmi3YP1KczQDz5xknWg,1379
 odoo/addons/account_move_payroll_import/data/payroll_import_defaults.xml,sha256=8fnC8Z2ov3ulvcwcaazG5i3DGBzaK5Q0JFhF4dRzn9s,4570
-odoo/addons/account_move_payroll_import/i18n/ca_ES.po,sha256=8ucDStleOanDEsdBK1IFKGsbwWjrQ6_-YUCICN3TGaI,38186
-odoo/addons/account_move_payroll_import/i18n/es.po,sha256=grQjubV3lz29tHlLtRyUjSF6NrmHyDRRUGo1V7poTpw,38369
+odoo/addons/account_move_payroll_import/i18n/ca_ES.po,sha256=shnWYO_4x0t4HRM7ajXBT06tIOuEmFch6zXc7wfKybQ,41693
+odoo/addons/account_move_payroll_import/i18n/es.po,sha256=MJslDNYJsRPQRk11u3SB-uH6diHLHQoqa-rqTEqt-cw,41915
 odoo/addons/account_move_payroll_import/models/__init__.py,sha256=MvOdNmgSVk-29bpZZRt415YrRUGryuSE7gpIzoRqw5c,161
 odoo/addons/account_move_payroll_import/models/account_move.py,sha256=8T-DNpKHc_e4r18NSx8Bh2xFQB4DlLI69ImxmghXJU8,6031
 odoo/addons/account_move_payroll_import/models/payroll_custom_concept.py,sha256=m8Wl_xFsWCwOqLJWwBFTmtA669rqIg0mIvGNqDtBnfw,2003
 odoo/addons/account_move_payroll_import/models/payroll_import_mapping.py,sha256=ARiif1H0CMs17n-0SW563Jv9jA1ta3nhCtq9l4vVbHA,943
-odoo/addons/account_move_payroll_import/models/payroll_import_setup.py,sha256=WHT3A4jy6Ba-8i_A6Voddpxa8Dk4BXJJdaYJpBZFDAI,17577
+odoo/addons/account_move_payroll_import/models/payroll_import_setup.py,sha256=9LJnoFphJD7-YWUQ9ZiVvS7uZWlNRiIjOk-WRmBKNv0,20488
 odoo/addons/account_move_payroll_import/security/ir.model.access.csv,sha256=YI4EAYd35NkiQvd1URS3Ex_zV3GVuI1-T-thl9mlCrU,536
 odoo/addons/account_move_payroll_import/static/src/css/styles.css,sha256=JK4NBJ_TIy-sWYIGa5nRlZh-KH1OKr1eBzCYx7pJjyI,522
 odoo/addons/account_move_payroll_import/static/src/js/payroll_import_button.js,sha256=cK9eHxA9jCSGr0HuZFV5Gvy8WWXe8iwNSDV4bYpJEFc,844
 odoo/addons/account_move_payroll_import/static/src/xml/payroll_import_templates.xml,sha256=HKgIpLA1aN9JruR-W3yKb5MEFezCGurxJAG1sOhDlQ0,731
 odoo/addons/account_move_payroll_import/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-odoo/addons/account_move_payroll_import/utils/file_utils.py,sha256=ngbyD5Z9kdJ4nSiuI2jxuuTUTuy9ZrLrXEVjrXVyJpI,566
-odoo/addons/account_move_payroll_import/utils/parse_utils.py,sha256=G5Crc1A0NzMtD6zSZOl2PVrgMMOfTOZNR2y0Mh9u3FM,1020
+odoo/addons/account_move_payroll_import/utils/file_utils.py,sha256=kgf_NfE-HwJlIv6M8aVJFWl7ZHMRGJuCg6cqITXQvOg,615
+odoo/addons/account_move_payroll_import/utils/parse_utils.py,sha256=z0C9Q14W24tBRfb-j28w1kVnVc7WPXVGHZ8b58g4ziA,1496
 odoo/addons/account_move_payroll_import/views/assets_template.xml,sha256=SMV2_61cbZG_IjIlsBEiYVLVAb4VmoBRYSsiljou1jU,544
 odoo/addons/account_move_payroll_import/views/payroll_import_views.xml,sha256=r4PrdTU7MY_KZMJFIcOgms9IaCPv2sirJagnlVWUotI,10386
 odoo/addons/account_move_payroll_import/wizards/__init__.py,sha256=ZJP90LnlsKPOz5hOqllzpC8O0__7WcIiH6FauPHav_w,60
-odoo/addons/account_move_payroll_import/wizards/payroll_import_wizard.py,sha256=gdOBxLPhEmZ2GnUi2rTz5JBfCWk1gy53cFM3Mx8kGCg,12340
+odoo/addons/account_move_payroll_import/wizards/payroll_import_wizard.py,sha256=bJjuYMjc_kSspxWld8xw6nMvE-JgwDRurYBjEzZ9zoE,12428
 odoo/addons/account_move_payroll_import/wizards/payroll_import_wizard.xml,sha256=p7ewpc4WKDMdJ3a5DGYLtyX8bYDZWHqUrZ42XKzW868,1926
-odoo_addon_account_move_payroll_import-16.0.1.0.1.dist-info/METADATA,sha256=uqfPwlUPPXRpa289NBaW--5RmVg0MdDZ9DlPwY9Wqss,3905
-odoo_addon_account_move_payroll_import-16.0.1.0.1.dist-info/WHEEL,sha256=QyeGbh-t8WT0nt0_LNSP02jN-g4ymd1egk1U3osCGMU,110
-odoo_addon_account_move_payroll_import-16.0.1.0.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_move_payroll_import-16.0.1.0.1.dist-info/RECORD,,
+odoo_addon_account_move_payroll_import-16.0.1.0.3.dist-info/METADATA,sha256=Kh-cYP-FgxqMszhcSUW9Fme8LfBBvivoSGMDicE05fQ,3905
+odoo_addon_account_move_payroll_import-16.0.1.0.3.dist-info/WHEEL,sha256=QyeGbh-t8WT0nt0_LNSP02jN-g4ymd1egk1U3osCGMU,110
+odoo_addon_account_move_payroll_import-16.0.1.0.3.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_move_payroll_import-16.0.1.0.3.dist-info/RECORD,,