clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00751
[Merge] lp:~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report into lp:openerp-ccorp-addons/6.1
Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report into lp:openerp-ccorp-addons/6.1.
Requested reviews:
CLEARCORP drivers (clearcorp-drivers)
For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report/+merge/161251
[FIX] Fix spaces in the amount
--
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report/+merge/161251
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons/6.1.
=== modified file 'sale_order_ccorp_report/report/sale_order.mako'
--- sale_order_ccorp_report/report/sale_order.mako 2013-04-25 21:22:25 +0000
+++ sale_order_ccorp_report/report/sale_order.mako 2013-04-26 23:00:34 +0000
@@ -91,17 +91,17 @@
%else:
<tr class = "odd">
%endif
- <td valign = "top">${formatLang(line.product_uom_qty)} ${format(line.product_uom.name)}</td>
- <td valign = "top" id="desc_col">${line.name} ${line.tax_id != [] and (' / (' + (', '.join([ lt.description for lt in line.tax_id ])) + ')') or ''|entity}
+ <td valign = "top">${formatLang(line.product_uom_qty)} ${format(line.product_uom.name)}</td>
+ <td valign = "top" id="desc_col">${line.name} ${line.tax_id != [] and (' / (' + (', '.join([ lt.description for lt in line.tax_id ])) + ')') or ''|entity}
%if company.show_sale_order_footer:
- <td valign = "top" style="text-align:right;">${int(line.delay)}${_("days")}</td>
+ <td valign = "top" style="text-align:right;">${int(line.delay)} ${_("days")}</td>
%endif
</td>
%if discount(so) != 0:
<td valign = "top">${line.discount and formatLang(line.discount) + '%' or '-'}</td>
%endif
- <td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_unit)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
- <td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_subtotal_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+ <td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_unit)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+ <td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_subtotal_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
</tr>
%if line.notes :
<tr>
@@ -114,28 +114,28 @@
%if discount(so) != 0:
%if company.show_sale_order_footer :
<% amount_discount = (so.amount_untaxed_not_discounted - so.amount_discounted) %>
- <tr><td style="border-style:none"/><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"/><td style="border-style:none"><b>${_("Discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_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"/><td style="border-style:none"><b>${_("Sub Total with discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(amount_discount)} ${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"/><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"/><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>
+ <tr><td style="border-style:none"/><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"/><td style="border-style:none"><b>${_("Discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_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"/><td style="border-style:none"><b>${_("Sub Total with discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(amount_discount)} ${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"/><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"/><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:
<% amount_discount = (so.amount_untaxed_not_discounted - so.amount_discounted) %>
- <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>${_("Discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_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"/><td style="border-style:none"><b>${_("Sub Total with discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(amount_discount)} ${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_total)} ${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-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>${_("Discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_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"/><td style="border-style:none"><b>${_("Sub Total with discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(amount_discount)} ${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_total)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
%endif
%else:
%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_total)} ${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-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_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_total)} ${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-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_total)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
%endif
%endif
</tbody>
Follow ups
