Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • coopdevs/comunitats-energetiques/odoo-ce
1 result
Show changes
Commits on Source (19)
Hide whitespace changes
Inline Side-by-side
Showing
with 202 additions and 25 deletions
energy_communities/demo/res_company_demo.xml
View file @ 233d96bd
......@@ -4,14 +4,23 @@
<record id="base.main_company" model="res.company">
<field name="name">Som Comunitats</field>
<field name="hierarchy_level">instance</field>
<field name="email">somcomunitats@fake.com</field>
<field name="coop_email_contact">somcomunitats@coop.coop</field>
</record>
<record id="coordinator_company" model="res.company">
<field name="name">OECoop</field>
<field name="hierarchy_level">coordinator</field>
<field name="parent_id" ref="base.main_company" />
<field name="email">oecoop@fake.com</field>
<field name="coop_email_contact">oecoop@coop.coop</field>
</record>
<function name="try_loading" model="account.chart.template">
<value eval="[ref('l10n_es.account_chart_template_pymes')]" />
<value eval="obj(ref('coordinator_company'))" model="res.company" />
</function>
<record
id="energy_community_company_1_wizard"
model="account.multicompany.easy.creation.wiz"
......@@ -43,6 +52,20 @@
/>
<function name="write" model="res.company">
<value
model="account.multicompany.easy.creation.wiz"
eval="[obj(ref('energy_community_company_1_wizard')).new_company_id.id]"
/>
<value
eval="{'coop_email_contact':'sants@coop.coop',
'email':'sants@fake.com',
'default_lang_id': ref('base.lang_ca_ES')}"
/>
</function>
<record
id="energy_community_company_2_wizard"
model="account.multicompany.easy.creation.wiz"
......@@ -72,6 +95,18 @@
eval="[[ref('energy_community_company_2_wizard')]]"
/>
<function name="write" model="res.company">
<value
model="account.multicompany.easy.creation.wiz"
eval="[obj(ref('energy_community_company_2_wizard')).new_company_id.id]"
/>
<value
eval="{'coop_email_contact':'villanoveta@coop.coop',
'email':'villanoveta@fake.com',
'default_lang_id': ref('base.lang_es')}"
/>
</function>
<record
id="energy_community_company_3_wizard"
......@@ -101,5 +136,17 @@
model="account.multicompany.easy.creation.wiz"
eval="[[ref('energy_community_company_3_wizard')]]"
/>
<function name="write" model="res.company">
<value
model="account.multicompany.easy.creation.wiz"
eval="[obj(ref('energy_community_company_3_wizard')).new_company_id.id]"
/>
<value
eval="{'coop_email_contact':'salt@coop.coop',
'email':'salt@fake.com',
'default_lang_id': ref('base.lang_eu_ES')}"
/>
</function>
</data>
</odoo>
energy_communities/demo/res_user_demo.xml
View file @ 233d96bd
......@@ -2,7 +2,7 @@
<odoo>
<data>
<record id="res_partner_user_ce_1_demo" model="res.partner">
<field name="name">Usuari Comunitat Energetica 1</field>
<field name="name">Usuari Comunitat Energètica 1</field>
<field name="is_company" eval="False" />
<field name="email">user@coop.coop</field>
<field name="street">Carrer Major, 23</field>
......@@ -42,7 +42,7 @@
</record>
<record id="res_partner_admin_ce_1_demo" model="res.partner">
<field name="name">Administrador Comunitat Energetica 1</field>
<field name="name">Administrador Comunitat Energètica 1</field>
<field name="is_company" eval="False" />
<field name="email">admin@coop.coop</field>
<field name="street">Carrer Major, 23</field>
......@@ -81,30 +81,30 @@
/>
</record>
<record id="res_partner_manager_ce_1_demo" model="res.partner">
<field name="name">Gerent Comunitat Energetica 1</field>
<record id="res_partner_user_ce_2_demo" model="res.partner">
<field name="name">Usuari Comunitat Energètica 2</field>
<field name="is_company" eval="False" />
<field name="email">manager@coop.coop</field>
<field name="email">user2@coop.coop</field>
<field name="street">Carrer Major, 23</field>
<field name="city">Barcelona</field>
<field name="zip">08001</field>
<field name="country_id" ref="base.es" />
</record>
<record id="res_users_manager_ce_1_demo" model="res.users">
<field name="partner_id" ref="res_partner_manager_ce_1_demo" />
<field name="login">gerent-ce-1</field>
<field name="password">gerent-ce-1</field>
<record id="res_users_user_ce_2_demo" model="res.users">
<field name="partner_id" ref="res_partner_user_ce_2_demo" />
<field name="login">usuari-ce-2</field>
<field name="password">usuari-ce-2</field>
<field
name="company_id"
model="account.multicompany.easy.creation.wiz"
eval="obj(ref('energy_community_company_1_wizard')).new_company_id.id"
eval="obj(ref('energy_community_company_2_wizard')).new_company_id.id"
/>
<field
name="company_ids"
model="account.multicompany.easy.creation.wiz"
eval="[
(4, obj(ref('energy_community_company_1_wizard')).new_company_id.id),
(4, obj(ref('energy_community_company_2_wizard')).new_company_id.id),
]"
/>
<field
......@@ -115,8 +115,128 @@
'role_id': ref('role_internal_user')
}),
(0, 0, {
'role_id': ref('role_ce_manager'),
'company_id':obj(ref('energy_community_company_1_wizard')).new_company_id.id,
'role_id': ref('role_ce_member'),
'company_id':obj(ref('energy_community_company_2_wizard')).new_company_id.id,
})]"
/>
</record>
<record id="res_partner_admin_ce_2_demo" model="res.partner">
<field name="name">Administrador Comunitat Energètica 2</field>
<field name="is_company" eval="False" />
<field name="email">admin2@coop.coop</field>
<field name="street">Carrer Major, 23</field>
<field name="city">Barcelona</field>
<field name="zip">08001</field>
<field name="country_id" ref="base.es" />
</record>
<record id="res_users_admin_ce_2_demo" model="res.users">
<field name="partner_id" ref="res_partner_admin_ce_2_demo" />
<field name="login">admin-ce-2</field>
<field name="password">admin-ce-2</field>
<field
name="company_id"
model="account.multicompany.easy.creation.wiz"
eval="obj(ref('energy_community_company_2_wizard')).new_company_id.id"
/>
<field
name="company_ids"
model="account.multicompany.easy.creation.wiz"
eval="[
(4, obj(ref('energy_community_company_2_wizard')).new_company_id.id),
]"
/>
<field
name="role_line_ids"
model="account.multicompany.easy.creation.wiz"
eval="[
(0, 0, {
'role_id': ref('role_internal_user')
}),
(0, 0, {
'role_id': ref('role_ce_admin'),
'company_id':obj(ref('energy_community_company_2_wizard')).new_company_id.id,
})]"
/>
</record>
<record id="res_partner_user_ce_3_demo" model="res.partner">
<field name="name">Usuari Comunitat Energètica 3</field>
<field name="is_company" eval="False" />
<field name="email">user3@coop.coop</field>
<field name="street">Carrer Major, 23</field>
<field name="city">Barcelona</field>
<field name="zip">08001</field>
<field name="country_id" ref="base.es" />
</record>
<record id="res_users_user_ce_3_demo" model="res.users">
<field name="partner_id" ref="res_partner_user_ce_3_demo" />
<field name="login">usuari-ce-3</field>
<field name="password">usuari-ce-3</field>
<field
name="company_id"
model="account.multicompany.easy.creation.wiz"
eval="obj(ref('energy_community_company_3_wizard')).new_company_id.id"
/>
<field
name="company_ids"
model="account.multicompany.easy.creation.wiz"
eval="[
(4, obj(ref('energy_community_company_3_wizard')).new_company_id.id),
]"
/>
<field
name="role_line_ids"
model="account.multicompany.easy.creation.wiz"
eval="[
(0, 0, {
'role_id': ref('role_internal_user')
}),
(0, 0, {
'role_id': ref('role_ce_member'),
'company_id':obj(ref('energy_community_company_3_wizard')).new_company_id.id,
})]"
/>
</record>
<record id="res_partner_admin_ce_3_demo" model="res.partner">
<field name="name">Administrador Comunitat Energètica 3</field>
<field name="is_company" eval="False" />
<field name="email">admin3@coop.coop</field>
<field name="street">Carrer Major, 23</field>
<field name="city">Barcelona</field>
<field name="zip">08001</field>
<field name="country_id" ref="base.es" />
</record>
<record id="res_users_admin_ce_3_demo" model="res.users">
<field name="partner_id" ref="res_partner_admin_ce_3_demo" />
<field name="login">admin-ce-3</field>
<field name="password">admin-ce-3</field>
<field
name="company_id"
model="account.multicompany.easy.creation.wiz"
eval="obj(ref('energy_community_company_3_wizard')).new_company_id.id"
/>
<field
name="company_ids"
model="account.multicompany.easy.creation.wiz"
eval="[
(4, obj(ref('energy_community_company_3_wizard')).new_company_id.id),
]"
/>
<field
name="role_line_ids"
model="account.multicompany.easy.creation.wiz"
eval="[
(0, 0, {
'role_id': ref('role_internal_user')
}),
(0, 0, {
'role_id': ref('role_ce_admin'),
'company_id':obj(ref('energy_community_company_3_wizard')).new_company_id.id,
})]"
/>
</record>
......@@ -158,15 +278,15 @@
'company_id':ref('coordinator_company'),
}),
(0, 0, {
'role_id': ref('role_coord_admin'),
'role_id': ref('role_ce_manager'),
'company_id':obj(ref('energy_community_company_1_wizard')).new_company_id.id,
}),
(0, 0, {
'role_id': ref('role_coord_admin'),
'role_id': ref('role_ce_manager'),
'company_id':obj(ref('energy_community_company_2_wizard')).new_company_id.id,
}),
(0, 0, {
'role_id': ref('role_coord_admin'),
'role_id': ref('role_ce_manager'),
'company_id':obj(ref('energy_community_company_3_wizard')).new_company_id.id,
}),
]"
......@@ -210,15 +330,15 @@
'company_id':ref('coordinator_company'),
}),
(0, 0, {
'role_id': ref('role_coord_worker'),
'role_id': ref('role_ce_manager'),
'company_id':obj(ref('energy_community_company_1_wizard')).new_company_id.id,
}),
(0, 0, {
'role_id': ref('role_coord_worker'),
'role_id': ref('role_ce_manager'),
'company_id':obj(ref('energy_community_company_2_wizard')).new_company_id.id,
}),
(0, 0, {
'role_id': ref('role_coord_worker'),
'role_id': ref('role_ce_manager'),
'company_id':obj(ref('energy_community_company_3_wizard')).new_company_id.id,
}),
]"
......
energy_selfconsumption/__manifest__.py
View file @ 233d96bd
......@@ -15,6 +15,7 @@
"mail",
"energy_project",
"partner_firstname",
"web_m2x_options",
],
"data": [
"security/ir.model.access.csv",
......
energy_selfconsumption/models/supply_point.py
View file @ 233d96bd
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
View file @ 233d96bd
......@@ -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
View file @ 233d96bd
......@@ -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
View file @ 233d96bd
......@@ -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
View file @ 233d96bd
......@@ -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",
}
}
)