diff --git a/energy_communities/wizards/multicompany_easy_creation.py b/energy_communities/wizards/multicompany_easy_creation.py index cf9e019e8d9856d46d4b5a4a2c2b061e4f07236c..58262113dc548fbb56d8dda269c48f6f64d32cf8 100644 --- a/energy_communities/wizards/multicompany_easy_creation.py +++ b/energy_communities/wizards/multicompany_easy_creation.py @@ -9,7 +9,6 @@ from ..models.res_company import ( _HIERARCHY_LEVEL_BASE_VALUES, _LEGAL_FORM_VALUES, ) -from ..utils import get_successful_popup_message _logger = logging.getLogger(__name__) @@ -176,10 +175,17 @@ class AccountMulticompanyEasyCreationWiz(models.TransientModel): self.with_delay().thread_action_accept() else: self.thread_action_accept() - return get_successful_popup_message( - _("Company creation successful"), - _("Community creation process has been started."), - ) + return { + "type": "ir.actions.client", + "tag": "display_notification", + "params": { + "type": "success", + "title": _("Company creation successful"), + "message": _("Community creation process has been started."), + "sticky": False, + "next": {"type": "ir.actions.act_window_close"}, + }, + } def create_company(self): allow_new_members = False diff --git a/energy_communities_cooperator/models/crm_lead.py b/energy_communities_cooperator/models/crm_lead.py index f0f0017f1d091346f6e3fbe26d9ca8efcc2ff8f7..78cf6827b9dce0947eca44e196c7e8132f683727 100644 --- a/energy_communities_cooperator/models/crm_lead.py +++ b/energy_communities_cooperator/models/crm_lead.py @@ -5,6 +5,15 @@ class CrmLead(models.Model): _name = "crm.lead" _inherit = "crm.lead" + def _get_metadata_values(self): + metadata = super()._get_metadata_values() + capital_share_meta_entry = self.metadata_line_ids.filtered( + lambda meta: meta.key == "ce_member_mandatory_contribution" + ) + if capital_share_meta_entry: + metadata["capital_share"] = capital_share_meta_entry.value + return metadata + def _get_default_community_wizard(self): creation_dict = super()._get_default_community_wizard() diff --git a/energy_communities_crm/views/crm_lead_views.xml b/energy_communities_crm/views/crm_lead_views.xml index 188dae3d8c408e8e6019e5013397ee61e22a9a49..8f9311b37d5eca3e367c0311e9785ebaa0b1466d 100644 --- a/energy_communities_crm/views/crm_lead_views.xml +++ b/energy_communities_crm/views/crm_lead_views.xml @@ -30,12 +30,12 @@ string="Other COORD" domain="[('source_id','=', %(energy_communities.ce_source_coord_web_other)d)]" /> - <filter + <filter name="ce_source_existing_coord_contact" string="Contact COORD" domain="[('source_id','=', %(energy_communities.ce_source_existing_coord_contact)d)]" /> - <filter + <filter name="ce_source_existing_coord_info" string="Info COORD" domain="[('source_id','=', %(energy_communities.ce_source_existing_coord_info)d)]" @@ -50,7 +50,7 @@ string="Newsletter SomComunitats" domain="[('source_id','=', %(energy_communities.ce_source_general_info)d)]" /> - <filter + <filter name="ce_source_general_contact" string="Contact SomComunitats" domain="[('source_id','=', %(energy_communities.ce_source_general_contact)d)]" diff --git a/energy_communities_crm/views/website_community_data_template.xml b/energy_communities_crm/views/website_community_data_template.xml index 5a51f7d6638c39986842da4b03b120fd8554274c..1c52af05797410d3bbd6a65152e626688ca0c64c 100644 --- a/energy_communities_crm/views/website_community_data_template.xml +++ b/energy_communities_crm/views/website_community_data_template.xml @@ -249,7 +249,6 @@ <t t-set="value" t-value="ce_member_mandatory_contribution" /> <t t-set="key" t-value="ce_member_mandatory_contribution_key" /> <t t-set="label" t-value="ce_member_mandatory_contribution_label" /> - <t t-set="required" t-value="True" /> </t> </div> <div class="col-md-12"> @@ -258,7 +257,6 @@ <t t-set="key" t-value="ce_registration_tool_key" /> <t t-set="label" t-value="ce_registration_tool_label" /> <t t-set="rows" t-value="5" /> - <t t-set="required" t-value="True" /> <t t-set="description" >Non-computer support, Excels, computer program (which one?)</t> @@ -270,7 +268,6 @@ <t t-set="key" t-value="ce_account_management_key" /> <t t-set="label" t-value="ce_account_management_label" /> <t t-set="options" t-value="community_management_options" /> - <t t-set="required" t-value="True" /> <t t-set="trigger">ce_management_can_enter_platform</t> </t> </div> @@ -280,7 +277,6 @@ <t t-set="key" t-value="ce_tax_management_key" /> <t t-set="label" t-value="ce_tax_management_label" /> <t t-set="options" t-value="community_management_options" /> - <t t-set="required" t-value="True" /> <t t-set="trigger">ce_management_can_enter_platform</t> </t> </div> @@ -303,7 +299,6 @@ <t t-set="key" t-value="ce_manager_key" /> <t t-set="label" t-value="ce_manager_label" /> <t t-set="options" t-value="community_manager_options" /> - <t t-set="required" t-value="True" /> <t t-set="trigger" >ce_manager_headline,ce_manager_firstname,ce_manager_surname,ce_manager_email,ce_manager_phone</t> @@ -365,7 +360,6 @@ <t t-set="key" t-value="ce_payment_method_key" /> <t t-set="label" t-value="ce_payment_method_label" /> <t t-set="options" t-value="community_payment_method_options" /> - <t t-set="required" t-value="True" /> </t> </div> <div class="col-md-12"> @@ -388,7 +382,6 @@ <t t-set="key" t-value="ce_extra_charges_key" /> <t t-set="label" t-value="ce_extra_charges_label" /> <t t-set="rows" t-value="5" /> - <t t-set="required" t-value="True" /> </t> </div> <div class="col-md-12"> @@ -397,7 +390,6 @@ <t t-set="key" t-value="ce_voluntary_contributions_key" /> <t t-set="label" t-value="ce_voluntary_contributions_label" /> <t t-set="rows" t-value="5" /> - <t t-set="required" t-value="True" /> </t> </div> <div class="col-md-12">