clearcorp team mailing list archive

[Juan Felipe Muñoz Ramos <juan.munoz@xxxxxxxxxxxxxxx>]

Juan Felipe Muñoz Ramos has proposed merging lp:~juan-munoz-clearcorp/openerp-ccorp-addons/account_invoice_webkit_report_feature into lp:openerp-ccorp-addons/6.1.

Requested reviews:
  CLEARCORP development team (clearcorp)

For more details, see:
https://code.launchpad.net/~juan-munoz-clearcorp/openerp-ccorp-addons/account_invoice_webkit_report_feature/+merge/104943

[FIX] account_invoice_webkit_report  bad mako  path
-- 
https://code.launchpad.net/~juan-munoz-clearcorp/openerp-ccorp-addons/account_invoice_webkit_report_feature/+merge/104943
Your team CLEARCORP development team is requested to review the proposed merge of lp:~juan-munoz-clearcorp/openerp-ccorp-addons/account_invoice_webkit_report_feature into lp:openerp-ccorp-addons/6.1.

=== modified file 'account_invoice_webkit_report/ccorp_account_webkit_report.xml'
--- account_invoice_webkit_report/ccorp_account_webkit_report.xml	2012-05-05 19:14:49 +0000
+++ account_invoice_webkit_report/ccorp_account_webkit_report.xml	2012-05-07 17:08:03 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-		<report auto="False" id="account_invoice_ccorp" model="account.invoice" name="account.invoice.layout_ccorp"  file="ccorp_account/report/invoice.mako" string="Invoice HTML" report_type="webkit" 				attachment="(object.state in ('open','paid')) and ('Fac.'+(object.number or '').replace('/',''))"
+		<report auto="False" id="account_invoice_ccorp" model="account.invoice" name="account.invoice.layout_ccorp"  file="account_invoice_webkit_report/report/invoice.mako" string="Invoice HTML" report_type="webkit" 				attachment="(object.state in ('open','paid')) and ('Fac.'+(object.number or '').replace('/',''))"
 				attachment_use="1"/>
 	</data>
 </openerp>

=== modified file 'account_invoice_webkit_report/report/invoice.mako'
--- account_invoice_webkit_report/report/invoice.mako	2012-05-05 19:14:49 +0000
+++ account_invoice_webkit_report/report/invoice.mako	2012-05-07 17:08:03 +0000
@@ -59,11 +59,8 @@
 			<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
 		</table>
 		<table id ="data-table" cellspacing = "3">
-		%if inv.amount_discounted != 0:
-				<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Disc.(%)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
-		%else:
+		
 				<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
-		%endif
 		<tbody>
 		<%i = 0 %>
 		%for line in inv.invoice_line :
@@ -81,24 +78,15 @@
 						<br/><span class = "notes"><b>${_("Note")}:</b> ${format(line.note)}</span>
 					%endif
 				</td>
-				%if inv.amount_discounted != 0:
-					<td valign = "top" style="text-align:right;">${line.discount and formatLang(line.discount) + '%' or '-'}</td>
-				%endif
+				
 				<td style="text-align:right;" valign = "top">${inv.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_unit)} ${inv.currency_id.symbol_suffix or ''|entity }</td>
-				<td style="text-align:right;" valign = "top">${inv.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_subtotal_not_discounted)} ${inv.currency_id.symbol_suffix or ''|entity }</td>
+				
 			</tr>
 		<%i += 1%>
 		%endfor
-		%if inv.amount_discounted != 0:
-		<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">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_untaxed_not_discounted)} ${inv.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">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_discounted)} ${inv.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">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_tax)} ${inv.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>${_("Total")}:</b></td><td style="border-top:2px solid;text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_total)} ${inv.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">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_untaxed_not_discounted)} ${inv.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">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_tax)} ${inv.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>${_("Total")}:</b></td><td style="border-top:2px solid;text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_total)} ${inv.currency_id.symbol_suffix or ''|entity}</td></tr>
-		%endif
+		
 		
 		</tbody>
 		</table>

=== modified file 'account_invoice_webkit_report/report/invoice.py'
--- account_invoice_webkit_report/report/invoice.py	2012-05-05 19:14:49 +0000
+++ account_invoice_webkit_report/report/invoice.py	2012-05-07 17:08:03 +0000
@@ -50,5 +50,5 @@
 report_sxw.report_sxw(
     'report.account.invoice.layout_ccorp',
     'account.invoice',
-    'addons/ccorp_account/report/invoice.mako',
+    'addons/account_invoice_webkit_report/report/invoice.mako',
     parser=account_invoice_ccorp)