From 7089c7b323d38996b1edcc3df48b53ea3061434e Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Tue, 5 Apr 2022 12:51:09 +0200
Subject: [PATCH] [fix] change env.user.company_id to env.company
---
models/scop_bordereau_cg.py | 2 +-
wizard/export_journal_wizard.py | 4 +--
wizard/scop_bordereau_payment_mode_wizard.py | 4 +--
wizard/scop_bordereau_refund_wizard.py | 36 ++++++++++----------
wizard/scop_cotisation_cg_regul.py | 26 +++++++-------
5 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/models/scop_bordereau_cg.py b/models/scop_bordereau_cg.py
index 24773fb..72ea1ee 100644
--- a/models/scop_bordereau_cg.py
+++ b/models/scop_bordereau_cg.py
@@ -288,7 +288,7 @@ class Bordereau(models.Model):
r.amount_total_cotiz = sum(r.invoice_ids.mapped("amount_residual_signed"))
def _compute_recipient(self):
- tag_cotiz_id = self.env.user.company_id.tag_cotiz_id
+ tag_cotiz_id = self.env.company.tag_cotiz_id
for bordereau in self:
child_ids = bordereau.partner_id.child_ids.filtered(
lambda child: (tag_cotiz_id in child.category_id) and child.email
diff --git a/wizard/export_journal_wizard.py b/wizard/export_journal_wizard.py
index 62c1c4e..f6290a9 100644
--- a/wizard/export_journal_wizard.py
+++ b/wizard/export_journal_wizard.py
@@ -12,12 +12,12 @@ class ExportJournalWizard(models.TransientModel):
@api.model
def _get_default_company(self):
- return self.env.user.company_id
+ return self.env.company
@api.model
def _get_default_export(self):
export = self.env["export.journal.type"].search(
- [("company_id", "=", self.env.user.company_id.id)], limit=1
+ [("company_id", "=", self.env.company.id)], limit=1
)
return export
diff --git a/wizard/scop_bordereau_payment_mode_wizard.py b/wizard/scop_bordereau_payment_mode_wizard.py
index 7f8ee13..bdf2de3 100644
--- a/wizard/scop_bordereau_payment_mode_wizard.py
+++ b/wizard/scop_bordereau_payment_mode_wizard.py
@@ -52,9 +52,9 @@ class ScopBordereauChangePaymentMode(models.TransientModel):
"payment_mode_id": self.payment_mode_id.id,
}
)
- contrib_cg_journal = self.env.user.company_id.contribution_journal_id
+ contrib_cg_journal = self.env.company.contribution_journal_id
contrib_ur_fede_journal = (
- self.env.user.company_id.contribution_ur_or_fede_journal_id
+ self.env.company.contribution_ur_or_fede_journal_id
)
move_line_ids = self.env["account.move.line"].search(
[
diff --git a/wizard/scop_bordereau_refund_wizard.py b/wizard/scop_bordereau_refund_wizard.py
index 0d6a8af..077f0d2 100644
--- a/wizard/scop_bordereau_refund_wizard.py
+++ b/wizard/scop_bordereau_refund_wizard.py
@@ -80,20 +80,20 @@ class ScopBordereauRefundWizard(models.TransientModel):
ur_hdf = self.env.ref("cgscop_partner.riga_14232").id
if bordereau_id.partner_id.ur_id.id == ur_hdf:
- product_ur = self.env.user.company_id.contribution_hdf_id
+ product_ur = self.env.company.contribution_hdf_id
else: # ur = ur_med
- product_ur = self.env.user.company_id.contribution_med_id
+ product_ur = self.env.company.contribution_med_id
cotiz_type = {
self.env.ref(
"cgscop_partner.riga_14397"
- ).id: self.env.user.company_id.contribution_cg_id,
+ ).id: self.env.company.contribution_cg_id,
self.env.ref(
"cgscop_partner.riga_14398"
- ).id: self.env.user.company_id.contribution_fede_com_id,
+ ).id: self.env.company.contribution_fede_com_id,
self.env.ref(
"cgscop_partner.cotiz_fede_cae"
- ).id: self.env.user.company_id.contribution_fede_cae_id,
+ ).id: self.env.company.contribution_fede_cae_id,
self.env.ref("cgscop_partner.riga_14399").id: product_ur,
}
@@ -144,31 +144,31 @@ class ScopBordereauRefundWizard(models.TransientModel):
# CREATE REFUND
if partner_id.ur_id.id == ur_hdf:
- product_ur = self.env.user.company_id.contribution_hdf_id
- account_ur = self.env.user.company_id.receivable_account_ur_hdf_id
+ product_ur = self.env.company.contribution_hdf_id
+ account_ur = self.env.company.receivable_account_ur_hdf_id
else: # ur = ur_med
- product_ur = self.env.user.company_id.contribution_med_id
- account_ur = self.env.user.company_id.receivable_account_ur_med_id
+ product_ur = self.env.company.contribution_med_id
+ account_ur = self.env.company.receivable_account_ur_med_id
cotiz_type = {
self.env.ref("cgscop_partner.riga_14397").id: [
- self.env.user.company_id.contribution_cg_id,
- self.env.user.company_id.contribution_journal_id,
+ self.env.company.contribution_cg_id,
+ self.env.company.contribution_journal_id,
partner_id.property_account_receivable_id,
],
self.env.ref("cgscop_partner.riga_14398").id: [
- self.env.user.company_id.contribution_fede_com_id,
- self.env.user.company_id.contribution_ur_or_fede_journal_id,
- self.env.user.company_id.receivable_account_fede_com_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.ref("cgscop_partner.cotiz_fede_cae").id: [
- self.env.user.company_id.contribution_fede_cae_id,
- self.env.user.company_id.contribution_ur_or_fede_journal_id,
- self.env.user.company_id.receivable_account_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.ref("cgscop_partner.riga_14399").id: [
product_ur,
- self.env.user.company_id.contribution_ur_or_fede_journal_id,
+ self.env.company.contribution_ur_or_fede_journal_id,
account_ur,
],
}
diff --git a/wizard/scop_cotisation_cg_regul.py b/wizard/scop_cotisation_cg_regul.py
index 5b6f564..6381696 100644
--- a/wizard/scop_cotisation_cg_regul.py
+++ b/wizard/scop_cotisation_cg_regul.py
@@ -171,36 +171,36 @@ class ScopCotisationRegul(models.TransientModel):
ur_hdf = self.env.ref("cgscop_partner.riga_14232").id
if partner_id.ur_id.id == ur_hdf:
amount_ur = self.amount_ur_hdf
- product_ur = self.env.user.company_id.contribution_hdf_id
- account_ur = self.env.user.company_id.receivable_account_ur_hdf_id
+ product_ur = self.env.company.contribution_hdf_id
+ account_ur = self.env.company.receivable_account_ur_hdf_id
else: # ur = ur_med
amount_ur = self.amount_ur_med
- product_ur = self.env.user.company_id.contribution_med_id
- account_ur = self.env.user.company_id.receivable_account_ur_med_id
+ product_ur = self.env.company.contribution_med_id
+ account_ur = self.env.company.receivable_account_ur_med_id
cotiz_type = {
self.env.ref("cgscop_partner.riga_14397").id: [
self.amount_cg,
- self.env.user.company_id.contribution_cg_id,
- self.env.user.company_id.contribution_journal_id,
+ self.env.company.contribution_cg_id,
+ self.env.company.contribution_journal_id,
partner_id.property_account_receivable_id.id,
],
self.env.ref("cgscop_partner.riga_14398").id: [
self.amount_fede_com,
- self.env.user.company_id.contribution_fede_com_id,
- self.env.user.company_id.contribution_ur_or_fede_journal_id,
- self.env.user.company_id.receivable_account_fede_com_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.ref("cgscop_partner.cotiz_fede_cae").id: [
self.amount_fede_cae,
- self.env.user.company_id.contribution_fede_cae_id,
- self.env.user.company_id.contribution_ur_or_fede_journal_id,
- self.env.user.company_id.receivable_account_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.ref("cgscop_partner.riga_14399").id: [
amount_ur,
product_ur,
- self.env.user.company_id.contribution_ur_or_fede_journal_id,
+ self.env.company.contribution_ur_or_fede_journal_id,
account_ur,
],
}
--
GitLab