Merge branch 'bugfix/add_supply_point_address' into 'dev'

[FIX] Energy_selfconsumption: Added street field to view and added web_m2x_options module to modify "many2one" fields giving new control options.

See merge request !194

energy_selfconsumption/__manifest__.py

@@ -15,6 +15,7 @@
         "mail",
         "energy_project",
         "partner_firstname",
+        "web_m2x_options",
     ],
     "data": [
         "security/ir.model.access.csv",

energy_selfconsumption/models/supply_point.py

-from odoo import _, fields, models
+from odoo import _, api, fields, models
 
 
 class SupplyPoint(models.Model):
@@ -14,7 +14,7 @@ class SupplyPoint(models.Model):
         )
     }
 
-    name = fields.Char(required=True)
+    name = fields.Char(compute="_compute_supply_point_name", store=True)
     code = fields.Char(string="CUPS", required=True)
     owner_id = fields.Many2one(
         "res.partner",
@@ -53,3 +53,11 @@ class SupplyPoint(models.Model):
         "supply_point_id",
         readonly=True,
     )
+
+    @api.depends("partner_id", "street")
+    def _compute_supply_point_name(self):
+        for record in self:
+            if record.partner_id and record.street:
+                record.name = f"{record.partner_id.name} - {record.street}"
+            else:
+                record.name = _("New Supply Point")

energy_selfconsumption/views/distribution_table_views.xml

@@ -78,7 +78,7 @@
                   />
                                     <field
                     name="supply_point_id"
-                    options="{'no_create': True}"
+                    options="{'no_create': True, 'search_more': True}"
                     domain="[('id', 'in', supply_point_filtered_ids)]"
                   />
                                     <field name="owner_id" />

energy_selfconsumption/views/supply_point_views.xml

@@ -11,7 +11,7 @@
                         <div class="oe_title">
                             <label for="name" />
                             <h1>
-                                <field name="name" placeholder="Title" />
+                                <field name="name" placeholder="Title" readonly="1" />
                             </h1>
                         </div>
                         <group>
@@ -103,7 +103,7 @@
             <field name="model">energy_selfconsumption.supply_point</field>
             <field name="arch" type="xml">
                 <tree string="Supply Points">
-                    <field name="name" />
+                    <field name="street" />
                     <field name="code" />
                     <field name="partner_id" />
                     <field name="owner_id" />

energy_selfconsumption/wizards/selfconsumption_import_wizard.py

@@ -236,7 +236,7 @@ class SelfconsumptionImportWizard(models.TransientModel):
         return self.env["energy_selfconsumption.supply_point"].create(
             {
                 "code": line_dict["code"],
-                "name": line_dict["code"],
+                "name": line_dict["street"],
                 "street": line_dict["street"],
                 "street2": line_dict["street2"],
                 "city": line_dict["city"],

setup/energy_selfconsumption/setup.py

@@ -5,6 +5,7 @@ setuptools.setup(
     odoo_addon={
         "depends_override": {
             "energy_project": "odoo14-addon-energy-project==14.0.1.1.3",
+            "web_m2x_options": "odoo14-addon-web-m2x-options==14.0.1.1.1",
         }
     }
 )