[13.0] [IMP] account_payment_group: Re-adapt the payment template in …

…v13.
ingadhoc · Mar 17, 2021 · 1bf3fd7 · 1bf3fd7
1 parent ca8698f
commit 1bf3fd7
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 143 deletions.
diff --git a/account_payment_group/__manifest__.py b/account_payment_group/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Account Payment with Multiple methods",
-    "version": "13.0.1.4.0",
+    "version": "13.0.1.5.0",
     "category": "Accounting",
     "website": "www.adhoc.com.ar",
     "author": "ADHOC SA, AITIC S.A.S",

diff --git a/account_payment_group/data/mail_template_data.xml b/account_payment_group/data/mail_template_data.xml
@@ -7,62 +7,27 @@
 
         <!--Email template -->
         <record id="email_template_edi_payment_group" model="mail.template">
-            <field name="name">Customer Payment - Send by Email</field>
+            <field name="name">Customer/Supplier Payment - Send by Email</field>
             <field name="email_from">${(object.company_id.email or '')|safe}</field>
-            <field name="subject">${object.company_id.name|safe} Receipt ${object.display_name or 'n/a'}</field>
+            <field name="subject">${object.company_id.name|safe} ${object.partner_type == 'supplier' and 'Payment Order' or 'Receipt'} ${object.display_name or 'n/a'}</field>
             <field name="partner_to">${object.partner_id.id}</field>
             <field name="model_id" ref="account_payment_group.model_account_payment_group"/>
             <field name="auto_delete" eval="True"/>
-            <field name="report_name">Receipt_${(object.display_name or '').replace('/','_')}</field>
+            <field name="report_name">${(object.partner_type == 'supplier' and 'Payment_order_' or 'Receipt_' + object.display_name or '').replace('/','_')}</field>
             <field name="report_template" ref="account_payment_group.action_report_payment_group"/>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
-    <p>Hello ${object.partner_id.name},</p>
-    <p>Here is your receipt from ${object.company_id.name}: </p>
-
-    <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
-       &nbsp;&nbsp;<strong>REFERENCES</strong><br />
-       &nbsp;&nbsp;Receipt number: <strong>${object.display_name}</strong><br />
-       &nbsp;&nbsp;Receipt reference: <strong>${object.communication or 'n/a'}</strong><br />
-       &nbsp;&nbsp;Receipt total: <strong>${object.payments_amount}</strong><br />
-    </p>
-
+    Hello ${object.partner_id.name},<br/>
+    Here is your ${object.partner_type == 'supplier' and 'Payment order' or 'Receipt'}  <strong>${object.display_name}</strong> from ${object.company_id.name}
+    % if object.communication:
+    (with reference: ${object.communication})
+    % endif
+    amounting in: $<strong>${object.payments_amount}</strong>
     <p>If you have any question, do not hesitate to contact us.</p>
+    % if object.partner_type != 'supplier':
     <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>
-    <br/>
-    <br/>
-    <div style="width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;">
-        <h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;">
-            <strong style="text-transform:uppercase;">${object.company_id.name}</strong></h3>
-    </div>
-    <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">
-        <span style="color: #222; margin-bottom: 5px; display: block; ">
-        % if object.company_id.street:
-            ${object.company_id.street}<br/>
-        % endif
-        % if object.company_id.street2:
-            ${object.company_id.street2}<br/>
-        % endif
-        % if object.company_id.city or object.company_id.zip:
-            ${object.company_id.zip} ${object.company_id.city}<br/>
-        % endif
-        % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
-        % endif
-        </span>
-        % if object.company_id.phone:
-            <div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; ">
-                Phone:&nbsp; ${object.company_id.phone}
-            </div>
-        % endif
-        % if object.company_id.website:
-            <div>
-                Web :&nbsp;<a href="${object.company_id.website}">${object.company_id.website}</a>
-            </div>
-        %endif
-        <p></p>
-    </div>
+    % endif
 </div>
             ]]></field>
         </record>

diff --git a/account_payment_group/i18n/es.po b/account_payment_group/i18n/es.po
@@ -26,108 +26,40 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
-"    <p>Hello ${object.partner_id.name},</p>\n"
-"    <p>Here is your receipt from ${object.company_id.name}: </p>\n"
-"\n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Receipt number: <strong>${object.display_name}</strong><br />\n"
-"       &nbsp;&nbsp;Receipt reference: <strong>${object.communication or 'n/a'}</strong><br />\n"
-"       &nbsp;&nbsp;Receipt total: <strong>${object.payments_amount}</strong><br />\n"
-"    </p>\n"
-"\n"
+"    Hello ${object.partner_id.name},<br>\n"
+"    Here is your ${object.partner_type == 'supplier' and 'Payment order' or 'Receipt'}  <strong>${object.display_name}</strong> from ${object.company_id.name}\n"
+"    % if object.communication:\n"
+"    (with reference: ${object.communication})\n"
+"    % endif\n"
+"     amounting in: $<strong>${object.payments_amount}</strong>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    % if object.partner_type != 'supplier':\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-"            <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
+"    % endif\n"
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
-"    Hola ${object.partner_id.name},</p>\n"
-"    <p>Acá está su recibo por ${object.company_id.name}: </p>\n"
-"\n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;REFERENCIAS\n"
-"       &nbsp;&nbsp;Receipt number: <strong>${object.display_name}</strong><br />\n"
-"       &nbsp;&nbsp;Receipt reference: <strong>${object.communication or 'n/a'}</strong><br />\n"
-"       &nbsp;&nbsp;Receipt total: <strong>${object.payments_amount}</strong><br />\n"
-"    </p>\n"
-"\n"
-"    <p>Si tiene alguna pregunta, no dude en contactarnos.</p>\n"
-"    <p>Gracias por elegir ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-"            <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
+"<div style=\"font-size:13px;font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"    Hola ${object.partner_id.name},<br>\n"
+"    Acá está su ${object.partner_type == 'supplier' and 'Pago' or 'Recibo'}  <strong style=\"font-weight:bolder;\">${object.display_name}</strong> de ${object.company_id.name}\n"
+"    % if object.communication:\n"
+"    (con  la referencia: ${object.communication})\n"
+"    % endif\n"
+"    con la suma de: $<strong style=\"font-weight:bolder;\">${object.payments_amount}</strong>\n"
+"    <p style=\"margin:0px;font-size:13px;font-family:&quot;Lucida Grande&quot;, Helvetica, Verdana, Arial, sans-serif;\">Si tiene alguna pregunta, no dude en contactarnos.</p>\n"
+"    % if object.partner_type != 'supplier':\n"
+"    <p style=\"margin:0px;font-size:13px;font-family:&quot;Lucida Grande&quot;, Helvetica, Verdana, Arial, sans-serif;\">Gracias por elegir ${object.company_id.name or 'us'}!</p>\n"
+"    % endif\n"
+"</div>"
 
 #. module: account_payment_group
 #: model:mail.template,subject:account_payment_group.email_template_edi_payment_group
-msgid "${object.company_id.name|safe} Receipt ${object.display_name or 'n/a'}"
-msgstr "${object.company_id.name|safe} Recibo ${object.display_name or 'n/a'}"
+msgid ""
+"${object.company_id.name|safe} ${object.partner_type == 'supplier' and "
+"'Payment Order' or 'Receipt'} ${object.display_name or 'n/a'}"
+msgstr ""
+"${object.company_id.name|safe} ${object.partner_type == 'supplier' and "
+"'Pago' or 'Recibo'} ${object.display_name or 'n/a'}"
 
 #. module: account_payment_group
 #: model:ir.actions.report,print_report_name:account_payment_group.action_report_payment_group
@@ -864,8 +796,12 @@ msgstr "Recibo / Orden de Pago"
 
 #. module: account_payment_group
 #: model:mail.template,report_name:account_payment_group.email_template_edi_payment_group
-msgid "Receipt_${(object.display_name or '').replace('/','_')}"
-msgstr "Receipt_${(object.display_name or '').replace('/','_')}"
+msgid ""
+"${(object.partner_type == 'supplier' and 'Payment_order_' or 'Receipt_' + "
+"object.display_name or '').replace('/','_')}"
+msgstr ""
+"${(object.partner_type == 'supplier' and 'Pago_' or 'Recibo_' + "
+"object.display_name or '').replace('/','_')}"
 
 #. module: account_payment_group
 #: model:ir.model.fields.selection,name:account_payment_group.selection__account_payment__payment_type_copy__inbound

diff --git a/account_payment_group/migrations/13.0.1.5.0/mig_data.xml b/account_payment_group/migrations/13.0.1.5.0/mig_data.xml
@@ -0,0 +1,23 @@
+<odoo>
+    <record id="email_template_edi_payment_group" model="mail.template">
+            <field name="name">Customer/Supplier Payment - Send by Email</field>
+            <field name="subject">${object.company_id.name|safe} ${object.partner_type == 'supplier' and 'Payment Order' or 'Receipt'} ${object.display_name or 'n/a'}</field>
+            <field name="model_id" ref="account_payment_group.model_account_payment_group"/>
+            <field name="report_name">${(object.partner_type == 'supplier' and 'Payment_order_' or 'Receipt_' + object.display_name or '').replace('/','_')}</field>
+            <field name="report_template" ref="account_payment_group.action_report_payment_group"/>
+            <field name="body_html"><![CDATA[
+<div style="font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
+    Hello ${object.partner_id.name},<br/>
+    Here is your ${object.partner_type == 'supplier' and 'Payment order' or 'Receipt'}  <strong>${object.display_name}</strong> from ${object.company_id.name}
+    % if object.communication:
+    (with reference: ${object.communication})
+    % endif
+    amounting in: $<strong>${object.payments_amount}</strong>
+    <p>If you have any question, do not hesitate to contact us.</p>
+    % if object.partner_type != 'supplier':
+    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>
+    % endif
+</div>
+            ]]></field>
+        </record>
+</odoo>
diff --git a/account_payment_group/migrations/13.0.1.5.0/post-migration.py b/account_payment_group/migrations/13.0.1.5.0/post-migration.py
@@ -0,0 +1,8 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.load_data(
+        env.cr, 'account_payment_group',
+        'migrations/13.0.1.5.0/mig_data.xml')