clearcorp team mailing list archive

[Willy Andres Gomez Solorzano <willy.gomez@xxxxxxxxxxxxxxx>]

Willy Andres Gomez Solorzano has proposed merging lp:~wg.clearcorp/openerp-ccorp-addons/6.1-sale_order_ccorp_report into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~wg.clearcorp/openerp-ccorp-addons/6.1-sale_order_ccorp_report/+merge/133987
-- 
https://code.launchpad.net/~wg.clearcorp/openerp-ccorp-addons/6.1-sale_order_ccorp_report/+merge/133987
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'sale_order_ccorp_report/report/header.html'
--- sale_order_ccorp_report/report/header.html	2012-10-30 15:17:40 +0000
+++ sale_order_ccorp_report/report/header.html	2012-11-12 20:33:19 +0000
@@ -33,7 +33,7 @@
                                 <td>${company.partner_id.address[0].street or ''|entity}</td>
                             </tr>
                             <tr>
-                                <td>${_("Tel-fax")}: ${company.partner_id.address[0].phone or '-'|entity}</td>
+                                 <td>${_("Tel-fax")}: ${company.partner_id.address[0].phone or '-'|entity} - ${company.partner_id.address[0].fax or '-'|entity}</td>
                                 <td>${company.partner_id.address[0].zip or ''|entity} ${company.partner_id.address[0].city or ''|entity}</td>
                             </tr>
                             <tr>

=== modified file 'sale_order_ccorp_report/report/sale_order.mako'
--- sale_order_ccorp_report/report/sale_order.mako	2012-10-30 15:17:40 +0000
+++ sale_order_ccorp_report/report/sale_order.mako	2012-11-12 20:33:19 +0000
@@ -117,11 +117,11 @@
 			%if company.show_sale_order_footer :
 				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
 				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
-				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted + so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_total)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
 			%else:
 				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
 				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
-				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted + so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_total)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
 			%endif
 		%endif
 		</tbody>