odoo-addon-account-move-payroll-import 16.0.1.0.0__tar.gz → 16.0.1.0.1__tar.gz

{odoo-addon-account_move_payroll_import-16.0.1.0.0 → odoo-addon-account_move_payroll_import-16.0.1.0.1}/PKG-INFO

@@ -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.1
 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 → odoo-addon-account_move_payroll_import-16.0.1.0.1}/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.0",
+    "version": "16.0.1.0.1",
     "depends": ["account", "hr", "web", "l10n_es"],
     "author": """
         Som It Cooperatiu SCCL,

{odoo-addon-account_move_payroll_import-16.0.1.0.0 → odoo-addon-account_move_payroll_import-16.0.1.0.1}/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-addon-account_move_payroll_import-16.0.1.0.0 → odoo-addon-account_move_payroll_import-16.0.1.0.1}/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"),

{odoo-addon-account_move_payroll_import-16.0.1.0.0 → odoo-addon-account_move_payroll_import-16.0.1.0.1}/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(

{odoo-addon-account_move_payroll_import-16.0.1.0.0 → odoo-addon-account_move_payroll_import-16.0.1.0.1}/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.0
+Version: 16.0.1.0.1
 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