Skip to content
Snippets Groups Projects
Commit c4392b31 authored by Daniil Digtyar Vasilieva's avatar Daniil Digtyar Vasilieva :call_me:
Browse files

[REF] energy_selfconsumption: use all relation from contract level instead of line

This ensures that we use the configuration on the contract level in all the calculations.
parent 194079a4
No related branches found
No related tags found
2 merge requests!253[REL] Release 06/11/23,!211[IMP] energy_selfconsumption: invoicing acquired power
Pipeline #64141 passed
......@@ -4,6 +4,5 @@ from . import partner
from . import distribution_table
from . import supply_point_assignation
from . import project
from . import contract_line
from . import contract
from . import product
......@@ -4,9 +4,13 @@ from odoo import fields, models
class Contract(models.Model):
_inherit = "contract.contract"
supply_point_assignation_id = fields.Many2one(
"energy_selfconsumption.supply_point_assignation",
string="Selfconsumption project",
)
project_id = fields.Many2one(
"energy_project.project",
ondelete="restrict",
string="Energy Project",
check_company=True,
related="supply_point_assignation_id.distribution_table_id.selfconsumption_project_id.project_id",
)
from odoo import api, fields, models
class ContractLine(models.Model):
_inherit = "contract.line"
supply_point_assignation_id = fields.Many2one(
"energy_selfconsumption.supply_point_assignation",
string="Selfconsumption project",
)
......@@ -43,7 +43,7 @@ class ContractGenerationWizard(models.TransientModel):
supply_point_assignation.supply_point_id.partner_id.name,
),
"partner_id": supply_point_assignation.supply_point_id.partner_id.id,
"project_id": self.selfconsumption_id.id,
"supply_point_assignation_id": supply_point_assignation.id,
"company_id": self.env.company.id,
"date_start": fields.date.today(),
"contract_template_id": self.selfconsumption_id.product_id.contract_template_id.id,
......@@ -58,7 +58,6 @@ class ContractGenerationWizard(models.TransientModel):
code=supply_point_assignation.supply_point_id.code,
owner_id=supply_point_assignation.supply_point_id.owner_id.display_name,
),
"supply_point_assignation_id": supply_point_assignation.id,
}
)
# Update selfconsumption and distribution_table state
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment