Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-afr_webkit-new-report-dev-ernesto into lp:addons-vauxoo/7.0

  1. 7.0-afr_webkit-new-report-dev-ernesto
  2. Merge into 7.0
Status: Merged
Merged at revision: 942
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-afr_webkit-new-report-dev-ernesto
Merge into: lp:addons-vauxoo/7.0
Diff against target: 167 lines (+143/-0)
3 files modified
afr_webkit/report/afr_report_webkit_partner_balance.mako (+99/-0)
afr_webkit/report/report_afr.xml (+39/-0)
afr_webkit/wizard/afr_report_wizard.py (+5/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-afr_webkit-new-report-dev-ernesto
Reviewer Review Type Date Requested Status
Luis Ernesto García Medina - http://www.vauxoo.com Pending
hbto [Vauxoo] http://www.vauxoo.com Pending
Review via email: mp+196773@code.launchpad.net

Description of the change

Se agrego el nuevo reporte afr_report_webkit_partner_balance con opciones de imprimir en PDF y Hoja de Calculo

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=== added file 'afr_webkit/report/afr_report_webkit_partner_balance.mako'
2--- afr_webkit/report/afr_report_webkit_partner_balance.mako 1970-01-01 00:00:00 +0000
3+++ afr_webkit/report/afr_report_webkit_partner_balance.mako 2013-11-26 19:22:34 +0000
4@@ -0,0 +1,99 @@
5+<!DOCTYPE html SYSTEM
6+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
7+<html xmlns="http://www.w3.org/1999/xhtml">
8+<head>
9+<style type="text/css">
10+ ${css}
11+</style>
12+</head>
13+
14+<body style="border:0; margin: 0;" onload="subst()" >
15+%for obj in objects:
16+<table width="100%">
17+ <tr>
18+ <td>
19+ <div>${helper.embed_image('jpeg',str(obj.company_id.logo),250, 120)}</div>
20+ </td>
21+ <td>
22+ <table style="width: 40%; text-align:center;">
23+ <tr><td><div class="td_company_title">${obj.company_id.name or ''|entity}</div></td></tr>
24+ <tr><td><div class="td_company">${obj.get_parser_method('get_vat_by_country',data['form']) or ''|entity}</div></td></tr>
25+ <tr><td><div class="td_company">${obj.get_parser_method('get_informe_text',data['form']) or ''| entity}</div></td></tr>
26+ <tr><td><div class="td_company">${_(Expressed in data['form'] and (' %s'% obj.get_parser_method('exchange_name',data['form'])) or '')}</div></td></tr>
27+ <tr><td><div class="td_company_date"> ${data['form'] and obj.get_parser_method('get_month',data['form']) or ''}</div></td></tr>
28+ </table>
29+ </td>
30+ </tr>
31+</table>
32+
33+<table width="100%">
34+ <thead>
35+ <tr>
36+ <td class="celdaTituloTabla" style="width: 100%; text-align:left;">${_('Expressed in: %s') % (obj.get_parser_method('exchange_name',data['form'])) or ''|entity}</td>
37+ </tr>
38+ </thead>
39+</table>
40+<table width="100%">
41+ <thead>
42+ <tr>
43+ <td class="celdaTituloTabla" style="text-align:right" width="10%">${_('CODE')}</td>
44+ <td class="celdaTituloTabla" width="50%">${_('ACCOUNT')}</td>
45+ <td class="celdaTituloTabla" width="10%" style="text-align:center;" >${_('INICIAL')}</td>
46+ <td class="celdaTituloTabla" width="10%" style="text-align:center;" >${_('DEBIT')}</td>
47+ <td class="celdaTituloTabla" width="10%" style="text-align:center;" >${_('CREDIT')}</td>
48+ <td class="celdaTituloTabla" width="10%" style="text-align:center;" >${_('BALANCE')}</td>
49+ </tr>
50+ </thead>
51+</table>
52+<table width="100%">
53+ <thead>
54+ <tr>
55+ <td class="celdaTituloTabla" style="text-align:left;" width="10%"></td>
56+ <td class="celdaTituloTabla" width="90%">${_('PARTNER')}</td>
57+ </tr>
58+ </thead>
59+</table>
60+<table width="100%">
61+ <tr>
62+ <td width="10%"></td>
63+ <td width="10%"></td>
64+ <td width="10%"></td>
65+ <td width="10%"></td>
66+ <td width="10%"></td>
67+ <td width="10%"></td>
68+ <td width="10%"></td>
69+ <td width="10%"></td>
70+ <td width="10%"></td>
71+ <td width="10%"></td>
72+ </tr>
73+ %for line in obj.get_parser_method('lines',data['form']):
74+ %if line['type']!= 'view':
75+ <tbody>
76+ <tr>
77+ <td class="celdaLineDataTotal" style="text-align:right;font-style:italic;" width="10%">${line['label'] == True and line['code'] or ''}</td>
78+ <td class="celdaLineDataNameTotal" colspan="5">${line['name'].upper() or line['name'].title() or ''}</td>
79+ <td class="celdaLineDataTotal" width="10%" style="text-align:right;">${(line['total']==True) and formatLang(line['balanceinit'] and line['balanceinit'] * line.get('change_sign',1.0) or 0.0, digits=2, grouping=True) or ''}</td>
80+ <td class="celdaLineDataTotal" width="10%" style="text-align:right;">${(line['total']==True) and formatLang(line['debit'], digits=2, grouping=True) or ''}</td>
81+ <td class="celdaLineDataTotal" width="10%" style="text-align:right;">${(line['total']==True) and formatLang(line['credit'], digits=2, grouping=True) or ''}</td>
82+ <td class="celdaLineDataTotal" width="10%" style="text-align:right;">${(line['total']==True) and formatLang(line['balance'] and line['balance'] * line.get('change_sign',1.0) or 0.0, digits=2, grouping=True) or ''}</td>
83+ </tr>
84+ </tbody>
85+ %for m in line['partner']:
86+ <tbody>
87+ <tr>
88+ <td class="celdaLineData" style="text-align:left;font-style:italic;" width="10%"></td>
89+ <td class="celdaLineData" style="text-align:left;" colspan="5">${m['partner_name'] or ''}</td>
90+ <td class="celdaLineDataNamePartner" width="10%" style="text-align:right;">${formatLang(m['balanceinit'] and m['balanceinit'] * m.get('change_sign',1.0) or 0.0, digits=2, grouping=True) or ''}</td>
91+ <td class="celdaLineDataNamePartner" width="10%" style="text-align:right;">${(line['total']==True) and formatLang(m['debit'], digits=2, grouping=True) or ''}</td>
92+ <td class="celdaLineDataNamePartner" width="10%" style="text-align:right;">${(line['total']==True) and formatLang(m['credit'], digits=2, grouping=True) or ''}</td>
93+ <td class="celdaLineDataNamePartner" width="10%" style="text-align:right;">${(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>
94+ </tr>
95+ </tbody>
96+ %endfor
97+ %endif
98+ %endfor
99+</table>
100+
101+%endfor
102+</body>
103+</html>
104
105=== modified file 'afr_webkit/report/report_afr.xml'
106--- afr_webkit/report/report_afr.xml 2013-10-29 22:49:19 +0000
107+++ afr_webkit/report/report_afr.xml 2013-11-26 19:22:34 +0000
108@@ -312,5 +312,44 @@
109 <field eval="'ir.header_webkit,'+str(ref('afr_webkit.ir_header_webkit_afrreport_analytic_ledger'))" model="ir.header_webkit" name="value"/>
110 <field eval="'ir.actions.report.xml,'+str(ref('afr_webkit.afr_report_analytic_ledger_html'))" model="ir.actions.report.xml" name="res_id"/>
111 </record>
112+
113+ <report
114+ auto = "True"
115+ id="afr_report_4_cols_partner_balance"
116+ model="wizard.report"
117+ name="afr_report_partner_balance"
118+ file="afr_webkit/report/afr_report_webkit_partner_balance.mako"
119+ string="Print AFR"
120+ report_type="webkit"
121+ multi="True"
122+ menu="False"/>
123+
124+ <record id="property_afr_report_webkit10" model="ir.property">
125+ <field name="name">webkit_header</field>
126+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
127+ <field eval="'ir.header_webkit,'+str(ref('afr_webkit.ir_header_webkit_afrreport_analytic_ledger'))" model="ir.header_webkit" name="value"/>
128+ <field eval="'ir.actions.report.xml,'+str(ref('afr_webkit.afr_report_4_cols_partner_balance'))" model="ir.actions.report.xml" name="res_id"/>
129+ </record>
130+
131+ <report
132+ auto = "True"
133+ id="afr_report_4_cols_partner_balance_html"
134+ model="wizard.report"
135+ name="afr_report_partner_balance_html"
136+ file="afr_webkit/report/afr_report_webkit_partner_balance.mako"
137+ string="Print AFR"
138+ report_type="webkit"
139+ multi="True"
140+ menu="False"/>
141+ <record id="afr_report_4_cols_partner_balance_html" model="ir.actions.report.xml">
142+ <field name="webkit_debug">True</field>
143+ <field name="precise_mode">True</field>
144+ </record>
145+ <record id="property_afr_report_webkit10_html" model="ir.property">
146+ <field name="name">webkit_header</field>
147+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
148+ <field eval="'ir.header_webkit,'+str(ref('afr_webkit.ir_header_webkit_afrreport_analytic_ledger'))" model="ir.header_webkit" name="value"/>
149+ <field eval="'ir.actions.report.xml,'+str(ref('afr_webkit.afr_report_4_cols_partner_balance_html'))" model="ir.actions.report.xml" name="res_id"/>
150+ </record>
151 </data>
152 </openerp>
153
154=== modified file 'afr_webkit/wizard/afr_report_wizard.py'
155--- afr_webkit/wizard/afr_report_wizard.py 2013-11-07 01:59:40 +0000
156+++ afr_webkit/wizard/afr_report_wizard.py 2013-11-26 19:22:34 +0000
157@@ -119,6 +119,11 @@
158 res['report_name'] = 'afr_report_col13_html'
159 else:
160 res['report_name'] = 'afr_report_col13'
161+ if( res.get('report_name') == 'afr.partner.balance'):
162+ if (res.get('datas').get('form')['report_format'] == 'spreadsheet'):
163+ res['report_name'] = 'afr_report_partner_balance_html'
164+ else:
165+ res['report_name'] = 'afr_report_partner_balance'
166
167 return res
168