Merge branch 'release/14.0.1.1.5' into '14.0'

Release v14.0.1.1.6

See merge request !134

account_banking_mandate_cooperator/__manifest__.py → cooperator_account_banking_mandate/__manifest__.py

 # -*- coding: utf-8 -*-
 {
-    "name": "Account Banking Mandate Cooperator",
+    "name": "Cooperator Account Banking Mandate",
     "version": "14.0.1.0.1",
     "license": "AGPL-3",
     "summary": """

account_payment_cooperator/__manifest__.py → cooperator_account_payment/__manifest__.py

 # -*- coding: utf-8 -*-
 {
-    "name": "Account Payment Cooperator",
+    "name": "Cooperator Account Payment",
     "version": "14.0.1.0.1",
     "license": "AGPL-3",
     "summary": """

energy_communities/__manifest__.py

 {
     'name': "Energy Community",
-    'version': '14.0.1.1.4',
+    'version': '14.0.1.1.6',
     'depends': [
         'account',
+        'cooperator_account_banking_mandate',
+        'account_lock_date_update',
+        'account_multicompany_easy_creation',
+        'cooperator_account_payment',
         'account_payment_order',
-        'cooperator',
+        'account_reconciliation_widget',
+        'auth_api_key',
+        'auth_oauth',
+        'auth_oidc',
+        'base_rest',
         'base_technical_features',
         'base_user_role',
         'base_user_role_company',
-        'l10n_es_aeat',
-        'l10n_es_cooperator',
-        'auth_oauth',
-        'auth_oidc',
+        'community_maps',
         'contacts',
-        'base_rest',
-        'auth_api_key',
+        'cooperator',
         'crm',
-        'account_multicompany_easy_creation',
+        'crm_metadata',
+        'crm_metadata_rest_api',
+        'crm_rest_api',
+        'l10n_es_aeat',
+        'l10n_es_aeat_sii_oca',
+        'l10n_es_cooperator',
+        'mail_multicompany',
+        'mass_mailing',
+        'metadata',
         'partner_multi_company',
         'purchase',
-        'mass_mailing',
-        'mail_multicompany',
-        'account_payment_cooperator',
-        'account_banking_mandate_cooperator',
-        'account_reconciliation_widget',
+        'queue_job',
+        'sale_crm',
+        'sale_management',
     ],
     'author': "Coopdevs Treball SCCL & Som Energia SCCL",
     'website': 'https://somenergia.coop',
@@ -38,13 +48,16 @@
     'data': [
         'security/ir_rule_data.xml',
         'security/res_users_role_data.xml',
+        'security/ir.model.access.csv',
         'data/utm_data.xml',
         'data/crm_lead_tag.xml',
         'data/product_data.xml',
         'data/auth_oauth_provider_data.xml',
         'data/ir_cron.xml',
         'views/crm_lead_views.xml',
+        'views/landing_page_view.xml',
         'views/res_company_views.xml',
+        'views/res_config_settings.xml',
         'views/res_partner_views.xml',
         'views/website_subscription_template.xml',
         'views/ce_views.xml',
@@ -64,5 +77,3 @@
     'auto_install': False,
     'post_init_hook': 'post_init_hook',
 }
-
-

energy_communities/controllers/website_subscription_main.py

@@ -111,14 +111,24 @@ class WebsiteSubscriptionCCEE(emyc_wsc.WebsiteSubscription):
         values["company_types"] = fields_desc["company_type"]["selection"]
         values["genders"] = fields_desc["gender"]["selection"]
         values["company"] = company
+        values["share_payment_sepa_direct_debit"] = False
 
         if not values.get("share_product_id"):
             for product in products:
-                if product.default_share_product is True:
+                if (product.default_share_product is True
+                    and product.id != company.voluntary_share_id.id):
                     values["share_product_id"] = product.id
+                    values["share_payment_sepa_direct_debit"] = (product.payment_mode_id
+                                                                 .payment_method_id.code
+                                                                 =='sepa_direct_debit'
+                                                                 or False)
                     break
             if not values.get("share_product_id", False) and products:
                 values["share_product_id"] = products[0].id
+                values["share_payment_sepa_direct_debit"] = (product[0].payment_mode_id
+                                                                 .payment_method_id.code
+                                                                 =='sepa_direct_debit'
+                                                                 or False)
         if not values.get("country_id"):
             if company.default_country_id:
                 values["country_id"] = company.default_country_id.id

energy_communities/data/mail_template_update_data.xml

@@ -43,7 +43,11 @@
         <p> - Gender: ${dict(object.fields_get(allfields=['gender'])['gender']['selection'])[object.gender]}</p>
         <p> - Birthdate: ${object.birthdate}</p>
         <p> - Language: ${dict(object.fields_get(allfields=['lang'])['lang']['selection'])[object.lang]}</p>
-        <p> - Initial share amount: ${object.subscription_amount}</p>  
+        <p> - Initial share amount: ${object.subscription_amount}</p> 
+    % if object.payment_mode_id.payment_method_id.code == 'sepa_direct_debit': 
+        <p> - Bank account: ${object.iban}</p>
+        <p> - I authorize bank receipts to be sent to this account: ${object.mandate_approved and 'SI' or 'NO'}</p> 
+    % endif
     </div>
     <br />
     <p>We keep in touch for any questions.</p>
@@ -73,9 +77,7 @@
         <record id="cooperator.email_template_release_capital" model="mail.template">
             <field name="name">Request email to Release Capital for CE</field>
             <field name="email_from">${(object.company_id.coop_email_contact or object.company_id.email)|safe}</field>
-            <field name="subject">[Somcomunitats.coop] Request to become member of Energy Community
-                ${object.company_id.name}
-            </field>
+            <field name="subject">[Somcomunitats.coop] Request to become member of Energy Community ${object.company_id.name}</field>
             <field name="partner_to">${object.partner_id.id}</field>
             <field name="email_cc">info+altausuari@somcomunitats.coop</field>
             <!--<field name="email_bcc">${object.company_id.email}</field>-->
@@ -98,6 +100,15 @@
 
     <p>Hello ${object.subscription_request.firstname},</p>
     </br>
+    % if object.payment_mode_id.payment_method_id.code == 'sepa_direct_debit': 
+    <p>Your request to become member of Energy Community ${object.company_id.name} is already underway!</p>
+    </br>
+    <p>We will shortly issue a bank receipt to your bank account (${object.subscription_request.iban}) for the collection of the initial mandatory contribution (${object.amount_total}€)</p>
+    </br>
+    <p>Once we have been able to process this payment, you will receive a final welcome email where we will provide you with your membership number that will link you to the Energy Community ${object.company_id.name}</p>
+    </br>
+    % endif
+    % if object.payment_mode_id.payment_method_id.code != 'sepa_direct_debit': 
     <p>Your request to become member of Energy Community ${object.company_id.name} is already underway! In order to complete it you must make a bank deposit of the amount indicated below:</p>
     </br>
     <p>- Initial registration fee amount: ${object.amount_total} € </p>
@@ -107,6 +118,7 @@
     </br>
     <p>Once the payment is made, please send us the document proof of it by email to ${(object.company_id.coop_email_contact or object.company_id.email)|safe} </p>
     </br>
+    % endif
     <p>Many thanks and see you soon!</p>
     </br>
     <p>${object.company_id.name}.</p>
@@ -268,6 +280,10 @@
         <p> - Birthdate: ${object.birthdate}</p>
         <p> - Language: ${dict(object.fields_get(allfields=['lang'])['lang']['selection'])[object.lang]}</p>
         <p> - Initial share amount: ${object.subscription_amount}</p>
+    % if object.payment_mode_id.payment_method_id.code == 'sepa_direct_debit': 
+        <p> - Bank account: ${object.iban}</p>
+        <p> - I authorize bank receipts to be sent to this account: ${object.mandate_approved and 'SI' or 'NO'}</p> 
+    % endif
     </div>
     <br />
     <p>We keep in touch for any questions.</p>

energy_communities/i18n_extra/ca_ES.po

@@ -2,13 +2,14 @@
 # This file contains the translation of the following modules:
 # 	* cooperator
 # 	* cooperator_website
+# 	* l10n_es_cooperator
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-07 09:47+0000\n"
-"PO-Revision-Date: 2023-02-11 20:42+0100\n"
+"POT-Creation-Date: 2023-05-30 20:48+0000\n"
+"PO-Revision-Date: 2023-05-31 14:38+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ca_ES\n"
@@ -76,7 +77,7 @@ msgstr ""
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; "
 "\">\n"
 "\n"
-"    <p>Hola ${object.firstname},</p>\n"
+"    <p>Hola ${object.name},</p>\n"
 "\n"
 "    <p>Processarem aviat la teva soŀlicitud. Si és correcta tota la "
 "informació que ens has proporcionat, rebràs un altre correu amb la "
@@ -184,6 +185,22 @@ msgid ""
 "\n"
 "    <p>Hello ${object.subscription_request.firstname},</p>\n"
 "    </br>\n"
+"    % if object.payment_mode_id.payment_method_id.code == "
+"'sepa_direct_debit': \n"
+"    <p>Your request to become member of Energy Community ${object."
+"company_id.name} is already underway!</p>\n"
+"    </br>\n"
+"    <p>We will shortly issue a bank receipt to your bank account (${object."
+"subscription_request.iban}) for the collection of the initial mandatory "
+"contribution (${object.amount_total}€)</p>\n"
+"    </br>\n"
+"    <p>Once we have been able to process this payment, you will receive a "
+"final welcome email where we will provide you with your membership number "
+"that will link you to the Energy Community ${object.company_id.name}</p>\n"
+"    </br>\n"
+"    % endif\n"
+"    % if object.payment_mode_id.payment_method_id.code != "
+"'sepa_direct_debit': \n"
 "    <p>Your request to become member of Energy Community ${object."
 "company_id.name} is already underway! In order to complete it you must make "
 "a bank deposit of the amount indicated below:</p>\n"
@@ -198,6 +215,7 @@ msgid ""
 "email to ${(object.company_id.coop_email_contact or object.company_id."
 "email)|safe} </p>\n"
 "    </br>\n"
+"    % endif\n"
 "    <p>Many thanks and see you soon!</p>\n"
 "    </br>\n"
 "    <p>${object.company_id.name}.</p>\n"
@@ -239,6 +257,22 @@ msgstr ""
 "\n"
 "    <p>Hola ${object.subscription_request.firstname},</p>\n"
 "    </br>\n"
+"% if object.payment_mode_id.payment_method_id.code == "
+"'sepa_direct_debit': \n"
+"    <p>La teva petició d'alta com a persona sòcia a la Comunitat Energètica "
+"${object.company_id.name} està en tràmit! </p>\n"
+"    </br>\n"
+"    <p>En breu girarem un rebut bancari al teu compte (${object."
+"subscription_request.iban}) pel cobrament de l'aportació obligatòria "
+"inicial (${object.amount_total}€)</p>\n"
+"    </br>\n"
+"    <p>Un cop hàgim pogut tramitar aquest cobrament rebràs un correu final "
+"de benvinguda on et donarem el teu número de sòcia que et vinculará amb la "
+"Comunitat Energètica ${object.company_id.name}</p>\n"
+"    </br>\n"
+"    % endif\n"
+"    % if object.payment_mode_id.payment_method_id.code != "
+"'sepa_direct_debit': \n"
 "    <p>La teva petició d'alta com a persona sòcia a la Comunitat Energètica "
 "${object.company_id.name} està en tràmit! Per a completar el procés cal fer "
 "l'ingrés bancari de l'import indicat a continuació:</p>\n"
@@ -247,12 +281,13 @@ msgstr ""
 "    <p>- Número de compte: ${(object.company_id.bank_ids and object."
 "company_id.bank_ids[0].acc_number) or 'ESXX XXXX XXXX XX XXXXXXXXXX'}</p>\n"
 "    <p>- Beneficiari: ${object.company_id.name}</p>\n"
-"    <p>- Concepte: Your first and last names</p>\n"
+"    <p>- Concepte: <i>--indica el teu nom i cognoms--</i></p>\n"
 "    </br>\n"
 "    <p>Una vegada fet l'ingrés, ens pots enviar el justificant de pagament "
 "responent aquest mateix correu electrònic o escrivint a ${(object."
 "company_id.coop_email_contact or object.company_id.email)|safe} </p>\n"
 "    </br>\n"
+"    % endif\n"
 "    <p>Moltes gràcies i fins ben aviat!</p>\n"
 "    </br>\n"
 "    <p>${object.company_id.name}.</p>\n"
@@ -576,10 +611,18 @@ msgid ""
 "        <p> - Country: ${object.country_id.name}</p>        \n"
 "        <p> - Email: ${object.email}</p>\n"
 "        <p> - Phone: ${(object.phone or '')}</p>\n"
-"        <p> - Gender: ${dict(object.fields_get(allfields=['gender'])['gender']['selection'])[object.gender]}</p>        \n"
+"        <p> - Gender: ${dict(object.fields_get(allfields=['gender'])"
+"['gender']['selection'])[object.gender]}</p>\n"
 "        <p> - Birthdate: ${object.birthdate}</p>\n"
-"        <p> - Language: ${dict(object.fields_get(allfields=['lang'])['lang']['selection'])[object.lang]}</p>  \n"
-"        <p> - Initial share amount: ${object.subscription_amount}</p>  \n"
+"        <p> - Language: ${dict(object.fields_get(allfields=['lang'])['lang']"
+"['selection'])[object.lang]}</p>\n"
+"        <p> - Initial share amount: ${object.subscription_amount}</p> \n"
+"    % if object.payment_mode_id.payment_method_id.code == "
+"'sepa_direct_debit': \n"
+"        <p> - Bank account: ${object.iban}</p>\n"
+"        <p> - I authorize bank receipts to be sent to this account: "
+"${object.mandate_approved and 'SI' or 'NO'}</p> \n"
+"    % endif\n"
 "    </div>\n"
 "    <br />\n"
 "    <p>We keep in touch for any questions.</p>\n"
@@ -614,11 +657,20 @@ msgstr ""
 "        <p> - Pais: ${object.country_id.name}</p>        \n"
 "        <p> - Correu electrònic: ${object.email}</p>\n"
 "        <p> - Telèfon: ${(object.phone or '')}</p>\n"
-"        <p> - Gènere: ${dict(object.fields_get(allfields=['gender'])['gender']['selection'])[object.gender]}</p>        \n"
+"        <p> - Gènere: ${dict(object.fields_get(allfields=['gender'])"
+"['gender']['selection'])[object.gender]}</p>        \n"
 "        <p> - Data creació: ${object.birthdate}</p>\n"
-"        <p> - Idioma: ${dict(object.fields_get(allfields=['lang'])['lang']['selection'])[object.lang]}</p>  \n"
+"        <p> - Idioma: ${dict(object.fields_get(allfields=['lang'])['lang']"
+"['selection'])[object.lang]}</p>  \n"
 "        <p> - Import aportació inicial: ${object.subscription_amount}</"
 "p>  \n"
+"    % if object.payment_mode_id.payment_method_id.code == "
+"'sepa_direct_debit': \n"
+"        <p> - Compte bancari: ${object.iban}</p>\n"
+"        <p> - Autoritzo giros bancaris a aquest compte: ${object."
+"mandate_approved and 'SI' or 'NO'}</p> \n"
+"    % endif\n"
+"\n"
 "    </div>\n"
 "    <br />\n"
 "    <p>Seguim en contacte per qualsevol dubte.</p>\n"
@@ -2391,7 +2443,7 @@ msgstr "Vers aportació amb nom de tipus"
 #. module: cooperator
 #: model:mail.template,subject:cooperator.email_template_share_transfer
 msgid "Share transfer"
-msgstr "Transferència aportació"
+msgstr "Transferència"
 
 #. module: cooperator
 #: model:ir.actions.act_window,name:cooperator.product_template_action
@@ -2939,8 +2991,8 @@ msgstr "[Somcomunitats.coop] Sol·licitud d'adhesió a Comunitat Energètica"
 #. module: cooperator
 #: model:mail.template,subject:cooperator.email_template_release_capital
 msgid ""
-"[Somcomunitats.coop] Request to become member of Energy Community ${object."
-"company_id.name}"
+"[Somcomunitats.coop] Request to become member of Energy Community "
+"${object.company_id.name}"
 msgstr ""
 "[Somcomunitats.coop] Sol·licitud d'adhesió a la Comunitat Energètica "
 "${object.company_id.name}"
@@ -3287,4 +3339,9 @@ msgstr "isabel.camps.rovira@la_meva_cooperativa.coop"
 #. module: cooperator_website
 #: model_terms:ir.ui.view,arch_db:cooperator_website.address_template
 msgid "rue Van Hove 199"
-msgstr "Carrer Major 12"
\ No newline at end of file
+msgstr "Carrer Major 12"
+
+#. module: l10n_es_cooperator
+#: model_terms:ir.ui.view,arch_db:l10n_es_cooperator.iban_template_es
+msgid "VAT"
+msgstr "NIF/CIF"
\ No newline at end of file