Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[14.0] cooperator: Multi-company e-mail templates #73

Merged
merged 19 commits into from
Jul 25, 2023
Merged

[14.0] cooperator: Multi-company e-mail templates #73

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
02dfd01
[IMP] cooperator: Scaffolding for multi-company e-mail templates
carmenbianca Jun 6, 2023
1fa6208
[IMP] cooperator: Set cooperator_capital_release_mail_template on com…
carmenbianca Jun 6, 2023
35f27cf
[IMP] cooperator: Set cooperator_waiting_list_mail_template on company
carmenbianca Jun 6, 2023
043d643
[IMP] cooperator: Set cooperator_confirmation_company_mail_template o…
carmenbianca Jun 6, 2023
8df99ef
[IMP] cooperator: Set cooperator_certificate_mail_template on company
carmenbianca Jun 7, 2023
579b744
[IMP] cooperator: Set cooperator_certifice_increase_mail_template on …
carmenbianca Jun 7, 2023
0c81316
[IMP] cooperator: Set cooperator_share_transfer_mail_template on company
carmenbianca Jun 7, 2023
97bc40b
[IMP] cooperator: Set cooperator_share_update_mail_template on company
carmenbianca Jun 7, 2023
3a7279e
[IMP] cooperator: Migration script to populate company fields
carmenbianca Jun 7, 2023
bf5aa27
[REF] cooperator: Send confirmation e-mail as a separate step from su…
carmenbianca Jun 7, 2023
8b38774
[FIX] cooperator: Make template fields invisible during company creation
carmenbianca Jun 9, 2023
528df97
Revert "[REF] cooperator: Send confirmation e-mail as a separate step…
carmenbianca Jun 12, 2023
5812383
[FIX] cooperator: Correctly set templates on company after templates …
carmenbianca Jun 12, 2023
07efcf3
[FIX] cooperator: override → overwrite
carmenbianca Jun 12, 2023
dbfff89
[FIX] cooperator: Fix English letter closing
carmenbianca Jun 12, 2023
788fb91
[REF] cooperator: Change philosophy; use default mail template unless…
carmenbianca Jun 13, 2023
5fa59b3
fixup! [IMP] cooperator: Set cooperator_share_update_mail_template on…
carmenbianca Jun 13, 2023
765aec3
[IMP] cooperator: Make domains stricter
carmenbianca Jun 13, 2023
12024fb
[IMP] cooperator: Add newsfragment
carmenbianca Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cooperator/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"name": "Cooperators",
"summary": "Manage your cooperators",
"version": "14.0.1.6.0",
"version": "14.0.1.7.0",
"depends": [
"base",
"web",
Expand Down
22 changes: 15 additions & 7 deletions cooperator/data/mail_template_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<p>Do not forget to add the structured communication to the payment.</p>

<p>Sustainably your,</p>
<p>Sustainably yours,</p>
<p>${object.company_id.name}.</p>

% if object.company_id.street:
Expand Down Expand Up @@ -94,7 +94,7 @@
<p>If you have any question, do not hesitate to contact us.</p>
<br/>

<p>Sustainably your,</p>
<p>Sustainably yours,</p>
<p>${object.company_id.name}.</p>

% if object.company_id.street:
Expand Down Expand Up @@ -216,7 +216,7 @@
<p>If you have any question, do not hesitate to contact us.</p>
<br/>

<p>Sustainably your,</p>
<p>Sustainably yours,</p>
<p>${object.company_id.name}.</p>

% if object.company_id.street:
Expand Down Expand Up @@ -279,7 +279,7 @@
<p>Find in attachment your ${object.env.company.name} certificate.</p>
<p>Thank you for choosing ${object.env.company.name or 'us'}!</p>
<br/>
<p>Sustainably your,</p>
<p>Sustainably yours,</p>
<p>${object.env.company.name}.</p>

% if object.env.company.street:
Expand Down Expand Up @@ -344,7 +344,7 @@
<p>Find in attachment your ${object.env.company.name} certificate.</p>
<p>Thank you for trusting ${object.env.company.name or 'us'}!</p>
<br/>
<p>Sustainably your,</p>
<p>Sustainably yours,</p>
<p>${object.env.company.name}.</p>

% if object.env.company.street:
Expand Down Expand Up @@ -407,7 +407,7 @@
<p>Find in attachment your ${object.env.company.name} certificate.</p>
<p>Thank you for choosing ${object.env.company.name or 'us'}!</p>
<br/>
<p>Sustainably your,</p>
<p>Sustainably yours,</p>
<p>${object.env.company.name}.</p>

% if object.env.company.street:
Expand Down Expand Up @@ -470,7 +470,7 @@
<p>Find in attachment your ${object.env.company.name} certificate.</p>
<p>Thank you for choosing ${object.env.company.name or 'us'}!</p>
<br/>
<p>Sustainably your,</p>
<p>Sustainably yours,</p>
<p>${object.env.company.name}.</p>

% if object.env.company.street:
Expand Down Expand Up @@ -501,5 +501,13 @@
</div>
]]></field>
</record>

<!--
After the above templates are created, immediately set them on the
existing companies.
-->
<function model="res.company" name="_setup_default_cooperator_mail_templates">
<value model="res.company" search="[]" />
</function>
</data>
</odoo>
28 changes: 14 additions & 14 deletions cooperator/i18n/ca_ES.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ msgid ""
" <p>If you have any question, do not hesitate to contact us.</p>\n"
" <br/>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -189,7 +189,7 @@ msgid ""
" <p>If you have any question, do not hesitate to contact us.</p>\n"
" <br/>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -239,7 +239,7 @@ msgid ""
" <p>Do not forget to add the structured communication to the payment.</"
"p>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -289,7 +289,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for trusting ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -339,7 +339,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -390,7 +390,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -440,7 +440,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -2776,7 +2776,7 @@ msgstr ""
#~ "p>\n"
#~ " <p>Thank you for trusting ${object.company_id.name or 'us'}!</p>\n"
#~ " <br/>\n"
#~ " <p>Sustainably your,</p>\n"
#~ " <p>Sustainably yours,</p>\n"
#~ " <p>${object.company_id.name}.</p>\n"
#~ "\n"
#~ " % if object.company_id.street:\n"
Expand Down Expand Up @@ -2874,7 +2874,7 @@ msgstr ""
#~ "p>\n"
#~ " <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
#~ " <br/>\n"
#~ " <p>Sustainably your,</p>\n"
#~ " <p>Sustainably yours,</p>\n"
#~ " <p>${object.company_id.name}.</p>\n"
#~ "\n"
#~ " % if object.company_id.street:\n"
Expand Down Expand Up @@ -2972,7 +2972,7 @@ msgstr ""
#~ "p>\n"
#~ " <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
#~ " <br/>\n"
#~ " <p>Sustainably your,</p>\n"
#~ " <p>Sustainably yours,</p>\n"
#~ " <p>${object.company_id.name}.</p>\n"
#~ "\n"
#~ " % if object.company_id.street:\n"
Expand Down Expand Up @@ -3071,7 +3071,7 @@ msgstr ""
#~ "p>\n"
#~ " <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
#~ " <br/>\n"
#~ " <p>Sustainably your,</p>\n"
#~ " <p>Sustainably yours,</p>\n"
#~ " <p>${object.company_id.name}.</p>\n"
#~ "\n"
#~ " % if object.company_id.street:\n"
Expand Down Expand Up @@ -3172,7 +3172,7 @@ msgstr ""
#~ " <p>If you have any question, do not hesitate to contact us.</p>\n"
#~ " <br/>\n"
#~ "\n"
#~ " <p>Sustainably your,</p>\n"
#~ " <p>Sustainably yours,</p>\n"
#~ " <p>${object.company_id.name}.</p>\n"
#~ "\n"
#~ " % if object.company_id.street:\n"
Expand Down Expand Up @@ -3273,7 +3273,7 @@ msgstr ""
#~ " <p>If you have any question, do not hesitate to contact us.</p>\n"
#~ " <br/>\n"
#~ "\n"
#~ " <p>Sustainably your,</p>\n"
#~ " <p>Sustainably yours,</p>\n"
#~ " <p>${object.company_id.name}.</p>\n"
#~ "\n"
#~ " % if object.company_id.street:\n"
Expand Down Expand Up @@ -3370,7 +3370,7 @@ msgstr ""
#~ " <p>Do not forget to add the structured communication to the payment.</"
#~ "p>\n"
#~ "\n"
#~ " <p>Sustainably your,</p>\n"
#~ " <p>Sustainably yours,</p>\n"
#~ " <p>${object.company_id.name}.</p>\n"
#~ "\n"
#~ " % if object.company_id.street:\n"
Expand Down
14 changes: 7 additions & 7 deletions cooperator/i18n/cooperator.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ msgid ""
" <p>If you have any question, do not hesitate to contact us.</p>\n"
" <br/>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -123,7 +123,7 @@ msgid ""
" <p>If you have any question, do not hesitate to contact us.</p>\n"
" <br/>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -167,7 +167,7 @@ msgid ""
"\n"
" <p>Do not forget to add the structured communication to the payment.</p>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -213,7 +213,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for trusting ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -259,7 +259,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -305,7 +305,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -351,7 +351,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down
14 changes: 7 additions & 7 deletions cooperator/i18n/es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ msgid ""
" <p>If you have any question, do not hesitate to contact us.</p>\n"
" <br/>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -141,7 +141,7 @@ msgid ""
" <p>If you have any question, do not hesitate to contact us.</p>\n"
" <br/>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -191,7 +191,7 @@ msgid ""
" <p>Do not forget to add the structured communication to the payment.</"
"p>\n"
"\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.company_id.name}.</p>\n"
"\n"
" % if object.company_id.street:\n"
Expand Down Expand Up @@ -241,7 +241,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for trusting ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -291,7 +291,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -342,7 +342,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down Expand Up @@ -392,7 +392,7 @@ msgid ""
" <p>Find in attachment your ${object.env.company.name} certificate.</p>\n"
" <p>Thank you for choosing ${object.env.company.name or 'us'}!</p>\n"
" <br/>\n"
" <p>Sustainably your,</p>\n"
" <p>Sustainably yours,</p>\n"
" <p>${object.env.company.name}.</p>\n"
"\n"
" % if object.env.company.street:\n"
Expand Down
Loading