Merge lp:~carlos-realsystems/openerp-vauxoo-gbw/6.0 into lp:openerp-vauxoo-gbw/6.0

[Carlos Contreras]

[IMP] Se agrega totales por categoría en Reporte Detallado por producto

[lp:~carlos-realsystems/openerp-vauxoo-gbw/6.0]

9. By Carlos Contreras on 2013-06-14

[IMP] Adds Principal Menu for GBW Reports
Adds 2 Reports with extra columns for Aportacion
Gives sorted records for All Category Reports

=== modified file 'gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako'
--- gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako	2013-06-04 21:28:44 +0000
+++ gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako	2013-06-05 18:54:27 +0000
@@ -103,13 +103,26 @@
 <tr>
 <td colspan=4 style="border-bottom:1px solid;border-top:1px solid;" >${k}</td>
 </tr> 
+	<%			
+	suma_categoria_cantidad=0
+	suma_categoria_subtotal=0
+	%>
 	%for kp, vp in v.items():
 		<tr>
 		<td colspan=2 style="border-bottom:1px solid;font-size:small;" >&nbsp;&nbsp;[${vp['referencia']}] ${kp[0:15]}</td>
 		<td style="border-bottom:1px solid;float: right; text-align: right;font-size:small;" >${formatLang(vp['cantidad']) or 0.0}</td>
 		<td style="border-bottom:1px solid;float: right; text-align: right;font-size:small;" >${company.currency_id.symbol} ${formatLang(vp['subtotal'],monetary=True) or 0.0}</td>
-		</tr> 
+		</tr>
+		<%
+			suma_categoria_cantidad=suma_categoria_cantidad+vp['cantidad']
+			suma_categoria_subtotal=suma_categoria_subtotal+vp['subtotal']
+		%> 
 	%endfor
+	<tr>
+	<td colspan=2 style="border-bottom:2px solid;border-top:2px solid;font-size:small;" >Total (${k}):</td>
+	<td style="border-bottom:2px solid;border-top:2px solid;float: right; text-align: right;font-size:small;" >${company.currency_id.symbol} ${formatLang(suma_categoria_cantidad) or 0.0}</td>
+	<td style="border-bottom:2px solid;border-top:2px solid;float: right; text-align: right;font-size:small;" >${company.currency_id.symbol} ${formatLang(suma_categoria_subtotal,monetary=True) or 0.0}</td>
+	</tr> 
 %endfor
 <tr>
 <td colspan=2 style="border-bottom:2px solid;border-top:2px solid;" >Total:</td>