clearcorp team mailing list archive

[Diana Rodríguez Martínez <diana.rodriguez@xxxxxxxxxxxxxxx>]

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-purchase_quotation_report into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-purchase_quotation_report/+merge/137640

[FIX] Fix subtotales in purchase report.
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-purchase_quotation_report/+merge/137640
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'sale_order_ccorp_report/i18n/es_CR.po'
--- sale_order_ccorp_report/i18n/es_CR.po	2012-10-30 15:17:40 +0000
+++ sale_order_ccorp_report/i18n/es_CR.po	2012-12-03 17:45:27 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-29 21:58+0000\n"
-"PO-Revision-Date: 2012-10-29 21:58+0000\n"
+"POT-Creation-Date: 2012-12-03 17:36+0000\n"
+"PO-Revision-Date: 2012-12-03 17:36+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,10 @@
 "Plural-Forms: \n"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:105
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:110
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:107
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:114
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:122
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:126
 msgid "Sub Total"
 msgstr "Subtotal"
 
@@ -62,12 +64,14 @@
 msgstr "Email"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:45
-msgid "Expiration date"
-msgstr "Fecha vencimiento"
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:109
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:116
+msgid "Sub Total with discount"
+msgstr "Sub Total con descuento"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:107
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:108
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:115
 msgid "Discount"
 msgstr "Descuento"
 
@@ -82,12 +86,9 @@
 msgstr "Tel."
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:67
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:69
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:73
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
-msgid "Total Price"
-msgstr "Precio Total"
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:45
+msgid "Expiration date"
+msgstr "Fecha vencimiento"
 
 #. module: sale_order_ccorp_report
 #: report:addons/sale_order_ccorp_report/report/sale_order.mako:39
@@ -95,7 +96,7 @@
 msgstr "Ref."
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:125
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:144
 msgid "Realized by"
 msgstr "Realizado por"
 
@@ -108,23 +109,33 @@
 msgstr "[Cod] Descripción / (Imp.)"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:125
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:144
 msgid "Authorized by"
 msgstr "Autorizado por"
 
 #. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:67
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:69
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:73
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
+msgid "Total Price"
+msgstr "Precio Total"
+
+#. module: sale_order_ccorp_report
 #: report:addons/sale_order_ccorp_report/report/sale_order.mako:51
 msgid "Shipping address"
 msgstr "Dirección envío"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:106
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:111
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:110
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:117
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:123
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:127
 msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:121
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:138
 msgid "Payment Note"
 msgstr "Nota del pago"
 
@@ -134,7 +145,7 @@
 msgstr "Nota"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:118
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:135
 msgid "Order Notes"
 msgstr "Nota Orden"
 
@@ -157,13 +168,10 @@
 msgstr "N° Cotización"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:108
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:112
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:111
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:118
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:124
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:128
 msgid "Total"
 msgstr "Total"
 
-#. module: sale_order_ccorp_report
-#: model:ir.model,name:sale_order_ccorp_report.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-

=== modified file 'sale_order_ccorp_report/report/sale_order.mako'
--- sale_order_ccorp_report/report/sale_order.mako	2012-11-12 21:52:18 +0000
+++ sale_order_ccorp_report/report/sale_order.mako	2012-12-03 17:45:27 +0000
@@ -7,6 +7,7 @@
 <body class = "data">
 	%for so in objects :
 	<% setLang(so.partner_id.lang) %>
+	<br></br>
 	<div id="wrapper">
 		<table width = "100%" class = "document_data">
 			<tr class = "title">
@@ -103,14 +104,18 @@
 		%endfor		
 		%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>${_("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>${_("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>${_("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>${_("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: