odoo-addon-account-move-payroll-import 16.0.1.0.2__tar.gz → 16.0.1.0.3__tar.gz

{odoo-addon-account_move_payroll_import-16.0.1.0.2 → odoo-addon-account_move_payroll_import-16.0.1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_move_payroll_import
-Version: 16.0.1.0.2
+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.2 → odoo-addon-account_move_payroll_import-16.0.1.0.3}/odoo/addons/account_move_payroll_import/__manifest__.py

@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": "SomItCoop ODOO accounting spanish payroll import",
-    "version": "16.0.1.0.2",
+    "version": "16.0.1.0.3",
     "depends": ["account", "hr", "web", "l10n_es"],
     "author": """
         Som It Cooperatiu SCCL,

{odoo-addon-account_move_payroll_import-16.0.1.0.2 → odoo-addon-account_move_payroll_import-16.0.1.0.3}/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"
@@ -394,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
@@ -436,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:
@@ -489,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:
@@ -511,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-addon-account_move_payroll_import-16.0.1.0.3/odoo/addons/account_move_payroll_import/utils/parse_utils.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+from odoo.exceptions import UserError
+
+
+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):
+        return float(value)
+
+    value = str(value).strip()
+    if not value:
+        return 0.0
+
+    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=".", 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:
+        if context.get("raise_exception", True):
+            msg = context.get("exception_msg", "Invalid float value: %s" % value)
+            raise UserError(msg)
+        return 0.0

{odoo-addon-account_move_payroll_import-16.0.1.0.2 → odoo-addon-account_move_payroll_import-16.0.1.0.3}/odoo_addon_account_move_payroll_import.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account-move-payroll-import
-Version: 16.0.1.0.2
+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.2/odoo/addons/account_move_payroll_import/utils/parse_utils.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-def parse_float(value, thousands_sep=",", decimal_sep="."):
-    """
-    Parse a float value.
-    :param thousands_sep: the thousands separator.
-    :param decimal_sep: the decimal separator.
-    :param value: the value to parse.
-    :return: the parsed float value.
-    """
-    if type(value) in (int, float, bool):
-        return float(value)
-
-    value = str(value).strip()
-    if not value:
-        return 0.0
-
-    value = value.replace(thousands_sep, "").replace(decimal_sep, ".")
-    return float(value)
-
-
-def abs_float(value, thousands_sep=",", decimal_sep="."):
-    """
-    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.
-    :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)