[fix] wizard journal UR & Fédé

wizard/scop_bordereau_payment_mode_wizard.py

@@ -52,16 +52,17 @@ class ScopBordereauChangePaymentMode(models.TransientModel):
                 "payment_mode_id": self.payment_mode_id.id,
             }
         )
-        contrib_cg_journal = self.env.company.contribution_journal_id
-        contrib_ur_fede_journal = self.env.company.contribution_ur_or_fede_journal_id
+        journal_ids = [
+            self.env.user.company_id.contribution_journal_id.id,
+            self.env.user.company_id.journal_fede_com_id.id,
+            self.env.user.company_id.journal_fede_cae_id.id,
+            self.env.user.company_id.journal_ur_hdf_id.id,
+            self.env.user.company_id.journal_ur_med_id.id,
+        ]
         move_line_ids = self.env["account.move.line"].search(
             [
                 ("partner_id", "=", self.bordereau_id.partner_id.id),
-                (
-                    "journal_id",
-                    "in",
-                    (contrib_cg_journal.id, contrib_ur_fede_journal.id),
-                ),
+                ("journal_id", "in", journal_ids),
                 ("full_reconcile_id", "=", False),
                 ("balance", "!=", 0),
                 ("account_id.reconcile", "=", True),

wizard/scop_bordereau_refund_wizard.py

@@ -145,10 +145,10 @@ class ScopBordereauRefundWizard(models.TransientModel):
         # CREATE REFUND
         if partner_id.ur_id.id == ur_hdf:
             product_ur = self.env.company.contribution_hdf_id
-            account_ur = self.env.company.receivable_account_ur_hdf_id
+            journal_ur = self.env.user.company_id.journal_ur_hdf_id
         else:  # ur = ur_med
             product_ur = self.env.company.contribution_med_id
-            account_ur = self.env.company.receivable_account_ur_med_id
+            journal_ur = self.env.user.company_id.journal_ur_med_id
 
         cotiz_type = {
             self.env.ref("cgscop_partner.riga_14397").id: [
@@ -158,18 +158,19 @@ class ScopBordereauRefundWizard(models.TransientModel):
             ],
             self.env.ref("cgscop_partner.riga_14398").id: [
                 self.env.company.contribution_fede_com_id,
-                self.env.company.contribution_ur_or_fede_journal_id,
-                self.env.company.receivable_account_fede_com_id,
+                self.env.user.company_id.journal_fede_com_id,
+                partner_id.property_account_receivable_id
             ],
             self.env.ref("cgscop_partner.cotiz_fede_cae").id: [
                 self.env.company.contribution_fede_cae_id,
-                self.env.company.contribution_ur_or_fede_journal_id,
-                self.env.company.receivable_account_fede_cae_id,
+                self.env.user.company_id.journal_fede_cae_id,
+                partner_id.property_account_receivable_id
             ],
             self.env.ref("cgscop_partner.riga_14399").id: [
                 product_ur,
                 self.env.company.contribution_ur_or_fede_journal_id,
-                account_ur,
+                journal_ur,
+                partner_id.property_account_receivable_id
             ],
         }
         product = cotiz_type.get(int(self.type_cotiz))[0]
@@ -179,7 +180,6 @@ class ScopBordereauRefundWizard(models.TransientModel):
                 {
                     "partner_id": partner_id.id,
                     "journal_id": cotiz_type.get(int(self.type_cotiz))[1].id,
-                    "account_id": cotiz_type.get(int(self.type_cotiz))[2].id,
                     "type": "out_refund",
                     "date_invoice": self.date_refund,
                     "date": self.date_refund,

wizard/scop_cotisation_cg_regul.py

@@ -172,11 +172,11 @@ class ScopCotisationRegul(models.TransientModel):
         if partner_id.ur_id.id == ur_hdf:
             amount_ur = self.amount_ur_hdf
             product_ur = self.env.company.contribution_hdf_id
-            account_ur = self.env.company.receivable_account_ur_hdf_id
+            journal_ur = self.env.user.company_id.journal_ur_hdf_id
         else:  # ur = ur_med
             amount_ur = self.amount_ur_med
             product_ur = self.env.company.contribution_med_id
-            account_ur = self.env.company.receivable_account_ur_med_id
+            journal_ur = self.env.user.company_id.journal_ur_med_id
 
         cotiz_type = {
             self.env.ref("cgscop_partner.riga_14397").id: [
@@ -188,20 +188,20 @@ class ScopCotisationRegul(models.TransientModel):
             self.env.ref("cgscop_partner.riga_14398").id: [
                 self.amount_fede_com,
                 self.env.company.contribution_fede_com_id,
-                self.env.company.contribution_ur_or_fede_journal_id,
-                self.env.company.receivable_account_fede_com_id,
+                self.env.user.company_id.journal_fede_com_id,
+                partner_id.property_account_receivable_id.id
             ],
             self.env.ref("cgscop_partner.cotiz_fede_cae").id: [
                 self.amount_fede_cae,
                 self.env.company.contribution_fede_cae_id,
-                self.env.company.contribution_ur_or_fede_journal_id,
-                self.env.company.receivable_account_fede_cae_id,
+                self.env.user.company_id.journal_fede_cae_id,
+                partner_id.property_account_receivable_id.id
             ],
             self.env.ref("cgscop_partner.riga_14399").id: [
                 amount_ur,
                 product_ur,
-                self.env.company.contribution_ur_or_fede_journal_id,
-                account_ur,
+                journal_ur,
+                partner_id.property_account_receivable_id.id
             ],
         }
 
@@ -241,7 +241,6 @@ class ScopCotisationRegul(models.TransientModel):
                         {
                             "partner_id": partner_id.id,
                             "journal_id": cotiz_type.get(type_cotiz)[2].id,
-                            "account_id": partner_id.property_account_receivable_id.id,
                             "type": type_invoice,
                             "date_invoice": self.date_regul,
                             "date": self.date_regul,