pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] edi: minor improvements to mail/edi preview templates

Browse Source 
bzr revid: odo@openerp.com-20111109173817-9kw9x53lb8rged3u
This commit is contained in:
Olivier Dony
2011-11-09 18:38:17 +01:00
parent 3dfaee2bdd
commit e83457423d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/edi/invoice_action_data.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<data>
<!-- EDI Export + Send email Action -->
<record id="ir_actions_server_edi_invoice" model="ir.actions.server">
<field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)</field>
<field name="code">if (object.type in ('out_invoice', 'out_refund')) and not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)</field>
<field eval="6" name="sequence"/>
<field name="state">code</field>
<field name="type">ir.actions.server</field>
addons/edi/static/src/xml/edi_sale_purchase.xml
+1 -1
View File
@@ -116,7 +116,7 @@
</div>
</t>
<t t-name="Edi.sale.order.sidebar">
<t t-if="!doc.order_policy || doc.order_policy == 'prepaid'">
<t t-if="doc.order_policy &amp;&amp; (doc.order_policy == 'prepaid' || doc.order_policy == 'manual')">
<t t-if="doc.company_address.paypal_account || doc.company_address.bank_ids">
<p class="oe_edi_sidebar_title">Pay Online</p>
<t t-if="doc.company_address.paypal_account">
addons/purchase/edi/purchase_order_action_data.xml
+2 -2
View File
@@ -46,7 +46,7 @@
<p>Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},</p>
<p>An order from ${object.company_id.name} for ${object.partner_id.name} has just been validated: </p>
<p>Here is a purchase order confirmation from ${object.company_id.name}: </p>
<p style="border-left: 1px solid #8e0000; margin-left: 30px;">
&nbsp;&nbsp;<strong>REFERENCES</strong><br />
@@ -109,7 +109,7 @@
<field name="body_text"><![CDATA[
Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},
An order from ${object.company_id.name} for ${object.partner_id.name} has just been validated:
Here is a purchase order confirmation from ${object.company_id.name}:
| Order number: *${object.name}*
| Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
| Order date: ${object.date_order}
addons/sale/edi/sale_order_action_data.xml
+4 -4
View File
@@ -48,7 +48,7 @@
<p>Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name or ''},</p>
<p>Your order for ${object.partner_id.name} has just been validated: </p>
<p>Here is your order confirmation for ${object.partner_id.name}: </p>
<p style="border-left: 1px solid #8e0000; margin-left: 30px;">
&nbsp;&nbsp;<strong>REFERENCES</strong><br />
@@ -70,7 +70,7 @@
<a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;"
href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
% if object.order_policy == 'prepaid' and object.company_id.paypal_account:
% if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account:
<%
comp_name = quote(object.company_id.name)
order_name = quote(object.name)
@@ -130,7 +130,7 @@
<field name="body_text"><![CDATA[
Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name or ''},
Your order for ${object.partner_id.name} has just been validated:
Here is your order confirmation for ${object.partner_id.name}:
| Order number: *${object.name}*
| Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
| Order date: ${object.date_order}
@@ -145,7 +145,7 @@ Your order for ${object.partner_id.name} has just been validated:
You can view the order confirmation, download it and even pay online using the following link:
${ctx.get('edi_web_url_view') or 'n/a'}
% if object.order_policy == 'prepaid' and object.company_id.paypal_account:
% if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account:
<%
comp_name = quote(object.company_id.name)
order_name = quote(object.name)