Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0_addons_vauxoo_add_fields_analytic_ledger_debit_credit_balance_dev_jorge into lp:addons-vauxoo/7.0

  1. 7.0_addons_vauxoo_add_fields_analytic_ledger_debit_credit_balance_dev_jorge
  2. Merge into 7.0
Status: Merged
Merged at revision: 933
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0_addons_vauxoo_add_fields_analytic_ledger_debit_credit_balance_dev_jorge
Merge into: lp:addons-vauxoo/7.0
Diff against target: 34 lines (+9/-5)
1 file modified
afr_webkit/report/afr_report_webkit_analytic_ledger.mako (+9/-5)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0_addons_vauxoo_add_fields_analytic_ledger_debit_credit_balance_dev_jorge
Reviewer Review Type Date Requested Status
Julio Serna-http://www.vauxoo.com Pending
Isaac López Zúñiga Pending
hbto [Vauxoo] http://www.vauxoo.com Pending
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Pending
Review via email: mp+195268@code.launchpad.net

Description of the change

Faltaba agregar los campos de debit, credit y balance en el reporte de mayor analítico.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'afr_webkit/report/afr_report_webkit_analytic_ledger.mako'
2--- afr_webkit/report/afr_report_webkit_analytic_ledger.mako 2013-11-13 18:29:36 +0000
3+++ afr_webkit/report/afr_report_webkit_analytic_ledger.mako 2013-11-14 17:30:28 +0000
4@@ -50,10 +50,12 @@
5 <tr>
6 <td class="celdaTituloTabla" style="text-align:left;" width="10%">${_('DATE')}</td>
7 <td class="celdaTituloTabla" width="10%">${_('PERIOD')}</td>
8- <td class="celdaTituloTabla" width="30%">${_('REFERENCE')}</td>
9- <td class="celdaTituloTabla" width="30%">${_('JOURNAL ENTRY')}</td>
10+ <td class="celdaTituloTabla" width="20%">${_('REFERENCE')}</td>
11+ <td class="celdaTituloTabla" width="20%">${_('JOURNAL ENTRY')}</td>
12 <td class="celdaTituloTabla" width="10%">${_('PARTNER')}</td>
13 <td class="celdaTituloTabla" width="10%" ></td>
14+ <td class="celdaTituloTabla" width="10%" ></td>
15+ <td class="celdaTituloTabla" width="10%" ></td>
16 </tr>
17 </thead>
18 </table>
19@@ -87,10 +89,12 @@
20 <tr>
21 <td class="celdaLineData" style="text-align:left;font-style:italic;" width="10%">${formatLang( m['date'], date=True) or ''}</td>
22 <td class="celdaLineData" style="text-align:left;" width="10%">${m['period'] or ''}</td>
23- <td class="celdaLineDataNamePartner" colspan="3">${m['name'] or ''} ${m['ref'] and (' - Ref %s'%m['ref']) or ''}</td>
24- <td class="celdaLineDataNamePartner" colspan="3">${m['entry'] or ''}</td>
25+ <td class="celdaLineDataNamePartner" colspan="2">${m['name'] or ''} ${m['ref'] and (' - Ref %s'%m['ref']) or ''}</td>
26+ <td class="celdaLineDataNamePartner" colspan="2">${m['entry'] or ''}</td>
27 <td class="celdaLineDataNamePartner" width="10%">${m['partner'] or ''}</td>
28- <td class="celdaLineData" width="10%"></td>
29+ <td class="celdaLineDataNamePartner" width="10%">${(line['total']==True) and formatLang(m['debit'], digits=2, grouping=True) or ''}</td>
30+ <td class="celdaLineDataNamePartner" width="10%">${(line['total']==True) and formatLang(m['credit'], digits=2, grouping=True) or ''}</td>
31+ <td class="celdaLineDataNamePartner" width="10%">${(line['total']==True) and formatLang(m['balance'] and m['balance'] * line.get('change_sign',1.0) or 0.0, digits=2, grouping=True) or ''}</td>
32 </tr>
33 </tbody>
34 %endfor