odoo-addon-account-move-payroll-import 16.0.1.0.0__py2.py3-none-any.whl → 16.0.1.0.2__py2.py3-none-any.whl

odoo/addons/account_move_payroll_import/models/payroll_custom_concept.py

@@ -10,16 +10,20 @@ class PayrollCustomConcept(models.Model):
 
     @api.model
     def create(self, vals):
-        default_account_ext_id = "l10n_es.%s_%s" % (
-            self.env.company.id, vals.get("default_account_xml_id", False)
-        )
-        if default_account_ext_id:
-            account = self.env.ref(default_account_ext_id, False)
-            vals.update({"account_id": account.id if account else False})
+        if not vals.get("account_id", False) and vals.get("default_account_xml_id", False):
+            default_account_ext_id = "l10n_es.%s_%s" % (
+                self.env.company.id, vals.get("default_account_xml_id", False)
+            )
+            if default_account_ext_id:
+                account = self.env.ref(default_account_ext_id, False)
+                vals.update({"account_id": account.id if account else False})
 
         return super(PayrollCustomConcept, self).create(vals)
 
     def _default_account(self):
+        if not self.default_account_xml_id:
+            return False
+
         default_account_ext_id = "l10n_es.%s_%s" % (
             self.env.company.id, self.default_account_xml_id
         )

odoo/addons/account_move_payroll_import/models/payroll_import_setup.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from odoo import models, fields, _, Command
+from odoo import models, fields, api, _, Command
 from odoo.exceptions import UserError
 
 from ..utils.parse_utils import abs_float
@@ -78,6 +78,21 @@ class PayrollImportSetup(models.Model):
             ),
         ]
 
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            for custom_concept in vals.get("custom_concepts_ids", []):
+                custom_concept = custom_concept[2] if len(custom_concept) >= 3 else {}
+
+                if not custom_concept.get("account_id", False):
+                    raise UserError(
+                        _(
+                            "Please select an account for the custom concept '%s'."
+                            % custom_concept.get("name")
+                        )
+                    )
+        return super(PayrollImportSetup, self).create(vals_list)
+
     name = fields.Char(
         string="Name",
         default=_("Payroll Import A3 2024"),
@@ -323,9 +338,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):
         """

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/wizards/payroll_import_wizard.py

@@ -39,7 +39,10 @@ class AccountPayrollImportWizard(models.TransientModel):
     def _default_payroll_import_setup(self):
         payroll_import_setup = self.env["payroll.import.setup"].search([], limit=1)
         if not payroll_import_setup:
-            payroll_import_setup = self.env["payroll.import.setup"].create({})
+            try:
+                payroll_import_setup = self.env["payroll.import.setup"].create({})
+            except Exception:
+                return False
 
         return payroll_import_setup
 
@@ -71,6 +74,15 @@ class AccountPayrollImportWizard(models.TransientModel):
         if not self.payroll_import_setup_id.journal_id:
             raise UserError(_("Please select a journal in the import configuration."))
 
+        for custom_concept in self.payroll_import_setup_id.custom_concepts_ids:
+            if not custom_concept.account_id:
+                raise UserError(
+                    _(
+                        "Please select an account for the custom concept: %s."
+                        % custom_concept.name
+                    )
+                )
+
         extension = is_valid_extension(self.file_name)
         if not extension:
             raise UserError(
@@ -278,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.0.dist-info → odoo_addon_account_move_payroll_import-16.0.1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account-move-payroll-import
-Version: 16.0.1.0.0
+Version: 16.0.1.0.2
 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.0.dist-info → odoo_addon_account_move_payroll_import-16.0.1.0.2.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=6ABK7Sbxchr-Df-d49ElodKYxFx5eCXvp-OHfM9cMyA,1379
+odoo/addons/account_move_payroll_import/__manifest__.py,sha256=kX0bjjK13GFQaPtzrlk9ibJSc5gzHuOIX8F9Lps5cP4,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=xTSojF_wYgpIg-jFwCsZVlsllP7Cratmy7Mh6Gr20g4,1817
+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=odQtiA_58mrQhDG54poEg15ME72bfMCGa4WPIwD5Lkg,16938
+odoo/addons/account_move_payroll_import/models/payroll_import_setup.py,sha256=_kSbc1HtLHE03-tNZpoSyKJTLYankJcO-DLAh36bYQM,18967
 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/file_utils.py,sha256=kgf_NfE-HwJlIv6M8aVJFWl7ZHMRGJuCg6cqITXQvOg,615
 odoo/addons/account_move_payroll_import/utils/parse_utils.py,sha256=G5Crc1A0NzMtD6zSZOl2PVrgMMOfTOZNR2y0Mh9u3FM,1020
 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=MO7ZpnjpEt2_o5LpYbJnDzEXvmzb065hwNlpsYNG_-g,11912
+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.0.dist-info/METADATA,sha256=c0fowwohoRC-q-__tYBwpM2dUB1HZnniqWJOi8bFx6I,3905
-odoo_addon_account_move_payroll_import-16.0.1.0.0.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-odoo_addon_account_move_payroll_import-16.0.1.0.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_move_payroll_import-16.0.1.0.0.dist-info/RECORD,,
+odoo_addon_account_move_payroll_import-16.0.1.0.2.dist-info/METADATA,sha256=_psgw__Go9wG65j8ogrE-EjGE5yY552mcmdL39K5Kjs,3905
+odoo_addon_account_move_payroll_import-16.0.1.0.2.dist-info/WHEEL,sha256=QyeGbh-t8WT0nt0_LNSP02jN-g4ymd1egk1U3osCGMU,110
+odoo_addon_account_move_payroll_import-16.0.1.0.2.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_move_payroll_import-16.0.1.0.2.dist-info/RECORD,,

{odoo_addon_account_move_payroll_import-16.0.1.0.0.dist-info → odoo_addon_account_move_payroll_import-16.0.1.0.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.45.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any