[IMP] energy_selfconsumption: added view to contract_generation_wizard_views.xml

energy_selfconsumption/models/selfconsumption.py

@@ -68,7 +68,7 @@ class Selfconsumption(models.Model):
         required=True,
         default=lambda self: self.env.company.partner_id,
     )
-    power = fields.Float(string="Rated Power (kWn)")
+    power = fields.Float(string="Generation Power (kW)")
     distribution_table_ids = fields.One2many(
         "energy_selfconsumption.distribution_table",
         "selfconsumption_project_id",

energy_selfconsumption/wizards/contract_generation_wizard.py

@@ -29,7 +29,6 @@ class ContractGenerationWizard(models.TransientModel):
         string="Recurrence",
         help="Specify Interval for automatic invoice generation.",
     )
-<<<<<<< HEAD
     selfconsumption_id = fields.Many2one(
         "energy_selfconsumption.selfconsumption", readonly=True
     )
@@ -142,5 +141,3 @@ class ContractGenerationWizard(models.TransientModel):
         self.selfconsumption_id.write({"state": "active"})
         self.selfconsumption_id.distribution_table_state("process", "active")
         return True
-=======
->>>>>>> aa4e275 ([IMP] energy_selfconsumption: base wizard for generation of contracts)