openerp-vauxoo-gbw

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

  1. 6.0
  2. Merge into openerp-vauxoo-gbw
Proposed by Carlos Contreras
Status: Merged
Merged at revision: 4
Proposed branch: lp:~carlos-realsystems/openerp-vauxoo-gbw/6.0
Merge into: lp:openerp-vauxoo-gbw/6.0
Diff against target: 31 lines (+14/-1)
1 file modified
gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako (+14/-1)
To merge this branch: bzr merge lp:~carlos-realsystems/openerp-vauxoo-gbw/6.0
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+167617@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~carlos-realsystems/openerp-vauxoo-gbw/6.0 updated
9. By Carlos Contreras

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
103<tr>103<tr>
104<td colspan=4 style="border-bottom:1px solid;border-top:1px solid;" >${k}</td>104<td colspan=4 style="border-bottom:1px solid;border-top:1px solid;" >${k}</td>
105</tr> 105</tr>
106 <%
107 suma_categoria_cantidad=0
108 suma_categoria_subtotal=0
109 %>
106 %for kp, vp in v.items():110 %for kp, vp in v.items():
107 <tr>111 <tr>
108 <td colspan=2 style="border-bottom:1px solid;font-size:small;" >&nbsp;&nbsp;[${vp['referencia']}] ${kp[0:15]}</td>112 <td colspan=2 style="border-bottom:1px solid;font-size:small;" >&nbsp;&nbsp;[${vp['referencia']}] ${kp[0:15]}</td>
109 <td style="border-bottom:1px solid;float: right; text-align: right;font-size:small;" >${formatLang(vp['cantidad']) or 0.0}</td>113 <td style="border-bottom:1px solid;float: right; text-align: right;font-size:small;" >${formatLang(vp['cantidad']) or 0.0}</td>
110 <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>114 <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>
111 </tr> 115 </tr>
116 <%
117 suma_categoria_cantidad=suma_categoria_cantidad+vp['cantidad']
118 suma_categoria_subtotal=suma_categoria_subtotal+vp['subtotal']
119 %>
112 %endfor120 %endfor
121 <tr>
122 <td colspan=2 style="border-bottom:2px solid;border-top:2px solid;font-size:small;" >Total (${k}):</td>
123 <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>
124 <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>
125 </tr>
113%endfor126%endfor
114<tr>127<tr>
115<td colspan=2 style="border-bottom:2px solid;border-top:2px solid;" >Total:</td>128<td colspan=2 style="border-bottom:2px solid;border-top:2px solid;" >Total:</td>

Subscribers

People subscribed via source and target branches