From 283b840874b9122dbdc99b9bbc43583181d3508a Mon Sep 17 00:00:00 2001 From: Daniil Digtyar Vasilieva <daniildigtyar@gmail.com> Date: Fri, 7 Jul 2023 12:28:50 +0200 Subject: [PATCH] [IMP] energy_selfconsumption_cooperator: rename cooperator_id to partner_id --- .../models/supply_point.py | 10 +++++----- .../views/res_partner_views.xml | 2 +- .../views/supply_point_views.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/energy_selfconsumption_cooperator/models/supply_point.py b/energy_selfconsumption_cooperator/models/supply_point.py index ae4e0896b..f3d18656e 100644 --- a/energy_selfconsumption_cooperator/models/supply_point.py +++ b/energy_selfconsumption_cooperator/models/supply_point.py @@ -4,13 +4,13 @@ from odoo import fields, models, api class SupplyPoint(models.Model): _inherit = "energy_selfconsumption.supply_point" - cooperator_id = fields.Many2one( - "res.partner", + partner_id = fields.Many2one( string="Cooperator", - required=True, domain=[("member", "=", True)], + required=True, + help="Cooperator subscribed to the self-consumption project" ) - @api.onchange('cooperator_id') + @api.onchange('partner_id') def _onchange_cooperator_id(self): - self.owner_id = self.cooperator_id + self.owner_id = self.partner_id diff --git a/energy_selfconsumption_cooperator/views/res_partner_views.xml b/energy_selfconsumption_cooperator/views/res_partner_views.xml index df068906d..9c006a7ae 100644 --- a/energy_selfconsumption_cooperator/views/res_partner_views.xml +++ b/energy_selfconsumption_cooperator/views/res_partner_views.xml @@ -27,7 +27,7 @@ <field name="inherit_id" ref="energy_selfconsumption.view_partner_form_inherit" /> <field name="arch" type="xml"> <xpath expr="//button[@name='get_supply_points']" position="attributes"> - <attribute name="context">{'default_cooperator_id': id}</attribute> + <attribute name="context">{'default_partner_id': id}</attribute> </xpath> </field> </record> diff --git a/energy_selfconsumption_cooperator/views/supply_point_views.xml b/energy_selfconsumption_cooperator/views/supply_point_views.xml index bee254779..c8110b17d 100644 --- a/energy_selfconsumption_cooperator/views/supply_point_views.xml +++ b/energy_selfconsumption_cooperator/views/supply_point_views.xml @@ -10,8 +10,8 @@ /> <field name="arch" type="xml"> <xpath expr="//field[@name='owner_id']" position="replace"> - <field name="cooperator_id" options="{'no_create': True}"/> - <field name="owner_id" domain="['|', ('member', '=' , False), ('id', '=', cooperator_id)]"/> + <field name="partner_id" options="{'no_create': True}"/> + <field name="owner_id" domain="['|', ('member', '=' , False), ('id', '=', partner_id)]"/> </xpath> </field> </record> -- GitLab