Merge lp:~vauxoo/account-financial-report/7.0-report_webkit_afr-dev-yani into lp:~account-report-core-editor/account-financial-report/7.0

Proposed by Yanina Aular (Vauxoo)
Status: Superseded
Proposed branch: lp:~vauxoo/account-financial-report/7.0-report_webkit_afr-dev-yani
Merge into: lp:~account-report-core-editor/account-financial-report/7.0
Diff against target: 953 lines (+840/-1)
17 files modified
account_financial_report/wizard/wizard.py (+0/-1)
account_financial_report_ext/__init__.py (+26/-0)
account_financial_report_ext/__openerp__.py (+54/-0)
account_financial_report_ext/data/html_css_afr.xml (+274/-0)
account_financial_report_ext/model/__init__.py (+25/-0)
account_financial_report_ext/report/__init__.py (+25/-0)
account_financial_report_ext/report/afr_report_webkit_analytic_ledger.mako (+19/-0)
account_financial_report_ext/report/afr_report_webkit_cols1.mako (+18/-0)
account_financial_report_ext/report/afr_report_webkit_cols13.mako (+19/-0)
account_financial_report_ext/report/afr_report_webkit_cols2.mako (+19/-0)
account_financial_report_ext/report/afr_report_webkit_cols4.mako (+19/-0)
account_financial_report_ext/report/afr_report_webkit_cols5.mako (+41/-0)
account_financial_report_ext/report/afr_report_webkit_journal_ledger.mako (+19/-0)
account_financial_report_ext/report/afr_report_webkit_qtr.mako (+19/-0)
account_financial_report_ext/report/report_afr.xml (+148/-0)
account_financial_report_ext/wizard/__init__.py (+26/-0)
account_financial_report_ext/wizard/afr_report_wizard.py (+89/-0)
To merge this branch: bzr merge lp:~vauxoo/account-financial-report/7.0-report_webkit_afr-dev-yani
Reviewer Review Type Date Requested Status
hbto [Vauxoo] http://www.vauxoo.com Pending
Review via email: mp+190779@code.launchpad.net

Description of the change

The templates for creating account financial report reports in webkit ready.

To post a comment you must log in.
67. By Yanina Aular (Vauxoo)

[IMP] file renamed

Unmerged revisions

67. By Yanina Aular (Vauxoo)

[IMP] file renamed

66. By Yanina Aular (Vauxoo)

[ADD] Documentation

65. By Yanina Aular (Vauxoo)

[FIX] It fixes to call a method with two parameters. A better example is added in the report of 5 columns

64. By Yanina Aular (Vauxoo)

[ADD] title to distinguish mako reports

63. By Yanina Aular (Vauxoo)

[ADD] webkit report template for analytic ledger, cols13, journal ledger, qtr

62. By Yanina Aular (Vauxoo)

[ADD] report template for 2 columns, 4 columns, 5 columns

61. By Yanina Aular (Vauxoo)

[CC] clean code

60. By Yanina Aular (Vauxoo)

[IMP] a method is created in the model wizard.report for consulting methods in the module parser account_financial_report, very NICE! :)

59. By Yanina Aular (Vauxoo)

[FIX] The id of the wizard not is being saved correctly in the original module Print_Report method (account_financial_report)

58. By Yanina Aular (Vauxoo)

[IMP] load an image into the report webkit, import parser code in the method inherited from the wizard

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_financial_report/wizard/wizard.py'
2--- account_financial_report/wizard/wizard.py 2013-07-26 17:03:11 +0000
3+++ account_financial_report/wizard/wizard.py 2013-10-12 02:09:45 +0000
4@@ -284,7 +284,6 @@
5 name = 'afr.qtrcols'
6 if data['form']['columns'] == 'thirteen':
7 name = 'afr.13cols'
8-
9 return {'type': 'ir.actions.report.xml', 'report_name': name, 'datas': data}
10
11 wizard_report()
12
13=== added directory 'account_financial_report_ext'
14=== added file 'account_financial_report_ext/__init__.py'
15--- account_financial_report_ext/__init__.py 1970-01-01 00:00:00 +0000
16+++ account_financial_report_ext/__init__.py 2013-10-12 02:09:45 +0000
17@@ -0,0 +1,26 @@
18+#!/usr/bin/python
19+# -*- encoding: utf-8 -*-
20+###############################################################################
21+# Module Writen to OpenERP, Open Source Management Solution
22+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
23+# All Rights Reserved
24+############# Credits #########################################################
25+# Coded by: Yanina Aular <yani@vauxoo.com>
26+# Planified by: Humberto Arocha <hbto@vauxoo.com>
27+# Audited by: Humberto Arocha <hbto@vauxoo.com>
28+###############################################################################
29+# This program is free software: you can redistribute it and/or modify
30+# it under the terms of the GNU Affero General Public License as published
31+# by the Free Software Foundation, either version 3 of the License, or
32+# (at your option) any later version.
33+#
34+# This program is distributed in the hope that it will be useful,
35+# but WITHOUT ANY WARRANTY; without even the implied warranty of
36+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
37+# GNU Affero General Public License for more details.
38+#
39+# You should have received a copy of the GNU Affero General Public License
40+# along with this program. If not, see <http://www.gnu.org/licenses/>.
41+###############################################################################
42+import model
43+import wizard
44
45=== added file 'account_financial_report_ext/__openerp__.py'
46--- account_financial_report_ext/__openerp__.py 1970-01-01 00:00:00 +0000
47+++ account_financial_report_ext/__openerp__.py 2013-10-12 02:09:45 +0000
48@@ -0,0 +1,54 @@
49+#!/usr/bin/python
50+# -*- encoding: utf-8 -*-
51+###############################################################################
52+# Module Writen to OpenERP, Open Source Management Solution
53+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
54+# All Rights Reserved
55+############# Credits #########################################################
56+# Coded by: Yanina Aular <yani@vauxoo.com>
57+# Planified by: Humberto Arocha <hbto@vauxoo.com>
58+# Audited by: Humberto Arocha <hbto@vauxoo.com>
59+###############################################################################
60+# This program is free software: you can redistribute it and/or modify
61+# it under the terms of the GNU Affero General Public License as published
62+# by the Free Software Foundation, either version 3 of the License, or
63+# (at your option) any later version.
64+#
65+# This program is distributed in the hope that it will be useful,
66+# but WITHOUT ANY WARRANTY; without even the implied warranty of
67+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
68+# GNU Affero General Public License for more details.
69+#
70+# You should have received a copy of the GNU Affero General Public License
71+# along with this program. If not, see <http://www.gnu.org/licenses/>.
72+###############################################################################
73+
74+{
75+ 'name': 'Account Financial Report Ext',
76+ 'version': '1.0',
77+ 'author': 'Vauxoo',
78+ 'website': 'http://www.vauxoo.com/',
79+ 'category': 'Accounting',
80+ 'description': '''
81+Account Financial Report Ext
82+============================
83+
84+Account Financial Report Reports on Webkit
85+
86+Main Features
87+=============
88+
89+account_financial_report module reports are now printed using webkit.
90+
91+
92+''',
93+ 'depends': ['base', 'mail', 'account_accountant', 'account_financial_report', 'report_webkit'],
94+ 'data': [
95+ 'data/html_css_afr.xml',
96+ 'report/report_afr.xml',
97+ ],
98+ 'demo': [],
99+ 'test': [],
100+ 'active': False,
101+ 'installable': True,
102+}
103
104=== added directory 'account_financial_report_ext/data'
105=== added file 'account_financial_report_ext/data/html_css_afr.xml'
106--- account_financial_report_ext/data/html_css_afr.xml 1970-01-01 00:00:00 +0000
107+++ account_financial_report_ext/data/html_css_afr.xml 2013-10-12 02:09:45 +0000
108@@ -0,0 +1,274 @@
109+<?xml version="1.0" ?>
110+<openerp>
111+ <data noupdate="0">
112+ <record id="ir_header_webkit_afrreport_analytic_ledger" model="ir.header_webkit">
113+ <field name="name">Reports AFR WebKit</field>
114+ <field name="footer_html">
115+ <![CDATA[]]></field>
116+ <field name="orientation">Portrait</field>
117+ <field name="format">Letter</field>
118+ <field name="html">
119+ <![CDATA[]]> </field>
120+ <field eval="0.0" name="margin_top"/>
121+ <field name="css" >
122+ <![CDATA[ ]]>
123+ </field>
124+ </record>
125+
126+ <record id="ir_header_webkit_afrreport_col13" model="ir.header_webkit">
127+ <field name="name">Reports AFR WebKit</field>
128+ <field name="footer_html">
129+ <![CDATA[]]></field>
130+ <field name="orientation">Portrait</field>
131+ <field name="format">Letter</field>
132+ <field name="html">
133+ <![CDATA[]]> </field>
134+ <field eval="0.0" name="margin_top"/>
135+ <field name="css" >
136+ <![CDATA[ ]]>
137+ </field>
138+ </record>
139+
140+ <record id="ir_header_webkit_afrreport_qtr" model="ir.header_webkit">
141+ <field name="name">Reports AFR WebKit</field>
142+ <field name="footer_html">
143+ <![CDATA[]]></field>
144+ <field name="orientation">Portrait</field>
145+ <field name="format">Letter</field>
146+ <field name="html">
147+ <![CDATA[]]> </field>
148+ <field eval="0.0" name="margin_top"/>
149+ <field name="css" >
150+ <![CDATA[ ]]>
151+ </field>
152+ </record>
153+
154+ <record id="ir_header_webkit_afrreport_journal_ledger" model="ir.header_webkit">
155+ <field name="name">Reports AFR WebKit</field>
156+ <field name="footer_html">
157+ <![CDATA[]]></field>
158+ <field name="orientation">Portrait</field>
159+ <field name="format">Letter</field>
160+ <field name="html">
161+ <![CDATA[]]> </field>
162+ <field eval="0.0" name="margin_top"/>
163+ <field name="css" >
164+ <![CDATA[ ]]>
165+ </field>
166+ </record>
167+
168+ <record id="ir_header_webkit_afrreport_five_colums" model="ir.header_webkit">
169+ <field name="name">Reports AFR WebKit</field>
170+ <field name="footer_html">
171+ <![CDATA[]]></field>
172+ <field name="orientation">Portrait</field>
173+ <field name="format">Letter</field>
174+ <field name="html">
175+ <![CDATA[]]> </field>
176+ <field eval="0.0" name="margin_top"/>
177+ <field name="css" >
178+ <![CDATA[ ]]>
179+ </field>
180+ </record>
181+
182+ <record id="ir_header_webkit_afrreport_four_colums" model="ir.header_webkit">
183+ <field name="name">Reports AFR WebKit</field>
184+ <field name="footer_html">
185+ <![CDATA[]]></field>
186+ <field name="orientation">Portrait</field>
187+ <field name="format">Letter</field>
188+ <field name="html">
189+ <![CDATA[]]> </field>
190+ <field eval="0.0" name="margin_top"/>
191+ <field name="css" >
192+ <![CDATA[ ]]>
193+ </field>
194+ </record>
195+
196+ <record id="ir_header_webkit_afrreport_two_colums" model="ir.header_webkit">
197+ <field name="name">Reports AFR WebKit</field>
198+ <field name="footer_html">
199+ <![CDATA[]]></field>
200+ <field name="orientation">Portrait</field>
201+ <field name="format">Letter</field>
202+ <field name="html">
203+ <![CDATA[]]> </field>
204+ <field eval="0.0" name="margin_top"/>
205+ <field name="css" >
206+ <![CDATA[ ]]>
207+ </field>
208+ </record>
209+
210+ <record id="ir_header_webkit_afrreport_one_colums" model="ir.header_webkit">
211+ <field name="name">Reports AFR WebKit</field>
212+ <field name="footer_html">
213+ <![CDATA[]]></field>
214+ <field name="orientation">Portrait</field>
215+ <field name="format">Letter</field>
216+ <field name="html">
217+ <![CDATA[]]> </field>
218+ <field eval="0.0" name="margin_top"/>
219+ <field name="css" >
220+ <![CDATA[ ]]>
221+ </field>
222+ </record>
223+
224+ <record id="ir_header_webkit_afrreport_five_colums" model="ir.header_webkit">
225+ <field name="name">Reports AFR WebKit Five Columns</field>
226+ <field name="footer_html">
227+<![CDATA[<html>
228+ <head>
229+ <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
230+ <script>
231+ function subst() {
232+ var vars={};
233+ var x=document.location.search.substring(1).split('&');
234+ for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
235+ var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
236+ for(var i in x) {
237+ var y = document.getElementsByClassName(x[i]);
238+ for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
239+ }
240+ }
241+ </script>
242+ </head>
243+ <body style="border:0; margin: 0;" onload="subst()">
244+ <table style="border-top: 1px solid black; width: 100%">
245+ <tr >
246+ <td style="text-align:right;font-size:12;" width="95%">Page <span class="page"/></td><td style="text-align:left;font-size:12;"> of <span class="topage"/></td>
247+ </tr>
248+ </table>
249+ </body>
250+</html>]]></field>
251+ <field name="orientation">Portrait</field>
252+ <field name="format">Letter</field>
253+ <field name="html">
254+<![CDATA[<html>
255+ <head>
256+ <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
257+ <script>
258+ function subst() {
259+ var vars={};
260+ var x=document.location.search.substring(1).split('&');
261+ for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
262+ var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
263+ for(var i in x) {
264+ var y = document.getElementsByClassName(x[i]);
265+ for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
266+ }
267+ }
268+ </script>
269+ <style type="text/css">
270+ ${css}
271+ </style>
272+ </head>
273+ <body style="border:0; margin: 0;" onload="subst()">
274+ ${_debug or ''|n}
275+ </body>
276+</html>]]>
277+</field>
278+ <field eval="0.0" name="margin_top"/>
279+ <field name="css" >
280+<![CDATA[
281+
282+table.basic_table{
283+text-align:left;
284+border:1px solid lightGrey;
285+border-collapse: collapse;
286+}
287+
288+.dest_address {
289+font-size:12pt;
290+margin-left:0;
291+text-align:left;
292+line-height:80%;
293+padding-top:0px
294+}
295+
296+.prueba{
297+color:black;
298+background-color:#dcdcdc;
299+}
300+
301+
302+.celdaTotalTitulo{
303+font-size:11pt;
304+text-align:left;
305+font-weight:bold;
306+font-family:Arial,Helvetica,sans-serif;
307+background-color:#dcdcdc;
308+}
309+
310+.celdaTotal{
311+font-size:10pt;
312+font-family: monospace;
313+text-align:right;
314+font-weight:bold;
315+background-color:#dcdcdc;
316+}
317+
318+.celdaDetailTitulo{
319+font-style:italic;
320+font-size:11pt;
321+text-align:left;
322+font-family:Arial,Helvetica,sans-serif;
323+background-color:#F5F5F5;
324+}
325+
326+.celdaDetail{
327+font-size:10pt;
328+font-family: monospace;
329+text-align:right;
330+background-color:#F5F5F5;
331+}
332+
333+.celdaAbstractTotal{
334+font-size:11pt;
335+text-align:left;
336+font-family:Arial,Helvetica,sans-serif;
337+background-color:#EAEAEA;
338+}
339+
340+.celdaTituloTabla{
341+font-size:11pt;
342+text-align:left;
343+font-family:Arial,Helvetica,sans-serif;
344+background-color:#620400;
345+color:#FFFFFF;
346+}
347+
348+
349+.celdaAbstract{
350+font-size:10pt;
351+font-family: monospace;
352+text-align:right;
353+background-color:#EAEAEA;
354+}
355+
356+div.td_company
357+{
358+font-size:12pt;
359+margin-left:0;
360+font-weight:bold;
361+font-family:Arial,Helvetica,sans-serif;
362+}
363+
364+div.td_company_title
365+{
366+font-size:22pt;
367+margin-left:0;
368+font-weight:bold;
369+font-family:Arial,Helvetica,sans-serif;
370+}
371+
372+]]>
373+ </field>
374+ </record>
375+
376+ <record id="ir_header_img_companylogo0" model="ir.header_img">
377+ <field eval="&quot;&quot;&quot;jpg&quot;&quot;&quot;" name="type"/>
378+ <field eval="&quot;&quot;&quot;company_logo&quot;&quot;&quot;" name="name"/>
379+ </record>
380+
381+ </data>
382+</openerp>
383
384=== added directory 'account_financial_report_ext/demo'
385=== added directory 'account_financial_report_ext/doc'
386=== added directory 'account_financial_report_ext/doc/images'
387=== added directory 'account_financial_report_ext/i18n'
388=== added directory 'account_financial_report_ext/model'
389=== added file 'account_financial_report_ext/model/__init__.py'
390--- account_financial_report_ext/model/__init__.py 1970-01-01 00:00:00 +0000
391+++ account_financial_report_ext/model/__init__.py 2013-10-12 02:09:45 +0000
392@@ -0,0 +1,25 @@
393+#!/usr/bin/python
394+# -*- encoding: utf-8 -*-
395+###############################################################################
396+# Module Writen to OpenERP, Open Source Management Solution
397+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
398+# All Rights Reserved
399+############# Credits #########################################################
400+# Coded by: Yanina Aular <yani@vauxoo.com>
401+# Planified by: Humberto Arocha <hbto@vauxoo.com>
402+# Audited by: Humberto Arocha <hbto@vauxoo.com>
403+###############################################################################
404+# This program is free software: you can redistribute it and/or modify
405+# it under the terms of the GNU Affero General Public License as published
406+# by the Free Software Foundation, either version 3 of the License, or
407+# (at your option) any later version.
408+#
409+# This program is distributed in the hope that it will be useful,
410+# but WITHOUT ANY WARRANTY; without even the implied warranty of
411+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
412+# GNU Affero General Public License for more details.
413+#
414+# You should have received a copy of the GNU Affero General Public License
415+# along with this program. If not, see <http://www.gnu.org/licenses/>.
416+###############################################################################
417+
418
419=== added directory 'account_financial_report_ext/report'
420=== added file 'account_financial_report_ext/report/__init__.py'
421--- account_financial_report_ext/report/__init__.py 1970-01-01 00:00:00 +0000
422+++ account_financial_report_ext/report/__init__.py 2013-10-12 02:09:45 +0000
423@@ -0,0 +1,25 @@
424+#!/usr/bin/python
425+# -*- encoding: utf-8 -*-
426+###############################################################################
427+# Module Writen to OpenERP, Open Source Management Solution
428+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
429+# All Rights Reserved
430+############# Credits #########################################################
431+# Coded by: Yanina Aular <yani@vauxoo.com>
432+# Planified by: Humberto Arocha <hbto@vauxoo.com>
433+# Audited by: Humberto Arocha <hbto@vauxoo.com>
434+###############################################################################
435+# This program is free software: you can redistribute it and/or modify
436+# it under the terms of the GNU Affero General Public License as published
437+# by the Free Software Foundation, either version 3 of the License, or
438+# (at your option) any later version.
439+#
440+# This program is distributed in the hope that it will be useful,
441+# but WITHOUT ANY WARRANTY; without even the implied warranty of
442+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
443+# GNU Affero General Public License for more details.
444+#
445+# You should have received a copy of the GNU Affero General Public License
446+# along with this program. If not, see <http://www.gnu.org/licenses/>.
447+###############################################################################
448+
449
450=== added file 'account_financial_report_ext/report/afr_report_webkit_analytic_ledger.mako'
451--- account_financial_report_ext/report/afr_report_webkit_analytic_ledger.mako 1970-01-01 00:00:00 +0000
452+++ account_financial_report_ext/report/afr_report_webkit_analytic_ledger.mako 2013-10-12 02:09:45 +0000
453@@ -0,0 +1,19 @@
454+<!DOCTYPE html SYSTEM
455+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
456+<html xmlns="http://www.w3.org/1999/xhtml">
457+<head>
458+<style type="text/css">
459+ ${css}
460+</style>
461+</head>
462+
463+<body style="border:0; margin: 0;" onload="subst()" >
464+
465+
466+ <h1><center>Analytic Ledger</center></h1>
467+ %for obj in objects:
468+ <center>${obj.company_id.name}</center>
469+ <center>${obj.get_parser_method('get_vat_by_country',data['form'])}</center>
470+ %endfor
471+</body>
472+</html>
473
474=== added file 'account_financial_report_ext/report/afr_report_webkit_cols1.mako'
475--- account_financial_report_ext/report/afr_report_webkit_cols1.mako 1970-01-01 00:00:00 +0000
476+++ account_financial_report_ext/report/afr_report_webkit_cols1.mako 2013-10-12 02:09:45 +0000
477@@ -0,0 +1,18 @@
478+<!DOCTYPE html SYSTEM
479+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
480+<html xmlns="http://www.w3.org/1999/xhtml">
481+<head>
482+<style type="text/css">
483+ ${css}
484+</style>
485+</head>
486+
487+<body style="border:0; margin: 0;" onload="subst()" >
488+
489+ <h1><center>End. Balance</center></h1>
490+ %for obj in objects:
491+ <center>${obj.company_id.name}</center>
492+ <center>${obj.get_parser_method('get_vat_by_country',data['form'])}</center>
493+ %endfor
494+</body>
495+</html>
496
497=== added file 'account_financial_report_ext/report/afr_report_webkit_cols13.mako'
498--- account_financial_report_ext/report/afr_report_webkit_cols13.mako 1970-01-01 00:00:00 +0000
499+++ account_financial_report_ext/report/afr_report_webkit_cols13.mako 2013-10-12 02:09:45 +0000
500@@ -0,0 +1,19 @@
501+<!DOCTYPE html SYSTEM
502+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
503+<html xmlns="http://www.w3.org/1999/xhtml">
504+<head>
505+<style type="text/css">
506+ ${css}
507+</style>
508+</head>
509+
510+<body style="border:0; margin: 0;" onload="subst()" >
511+
512+
513+ <h1><center>12 Months | YTD</center></h1>
514+ %for obj in objects:
515+ <center>${obj.company_id.name}</center>
516+ <center>${obj.get_parser_method('get_vat_by_country',data['form'])}</center>
517+ %endfor
518+</body>
519+</html>
520
521=== added file 'account_financial_report_ext/report/afr_report_webkit_cols2.mako'
522--- account_financial_report_ext/report/afr_report_webkit_cols2.mako 1970-01-01 00:00:00 +0000
523+++ account_financial_report_ext/report/afr_report_webkit_cols2.mako 2013-10-12 02:09:45 +0000
524@@ -0,0 +1,19 @@
525+<!DOCTYPE html SYSTEM
526+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
527+<html xmlns="http://www.w3.org/1999/xhtml">
528+<head>
529+<style type="text/css">
530+ ${css}
531+</style>
532+</head>
533+
534+<body style="border:0; margin: 0;" onload="subst()" >
535+
536+
537+ <h1><center>Debit | Credit</center></h1>
538+ %for obj in objects:
539+ <center>${obj.company_id.name}</center>
540+ <center>${obj.get_parser_method('get_vat_by_country',data['form'])}</center>
541+ %endfor
542+</body>
543+</html>
544
545=== added file 'account_financial_report_ext/report/afr_report_webkit_cols4.mako'
546--- account_financial_report_ext/report/afr_report_webkit_cols4.mako 1970-01-01 00:00:00 +0000
547+++ account_financial_report_ext/report/afr_report_webkit_cols4.mako 2013-10-12 02:09:45 +0000
548@@ -0,0 +1,19 @@
549+<!DOCTYPE html SYSTEM
550+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
551+<html xmlns="http://www.w3.org/1999/xhtml">
552+<head>
553+<style type="text/css">
554+ ${css}
555+</style>
556+</head>
557+
558+<body style="border:0; margin: 0;" onload="subst()" >
559+
560+
561+ <h1><center>Initial | Debit | Credit | YTD</center></h1>
562+ %for obj in objects:
563+ <center>${obj.company_id.name}</center>
564+ <center>${obj.get_parser_method('get_vat_by_country',data['form'])}</center>
565+ %endfor
566+</body>
567+</html>
568
569=== added file 'account_financial_report_ext/report/afr_report_webkit_cols5.mako'
570--- account_financial_report_ext/report/afr_report_webkit_cols5.mako 1970-01-01 00:00:00 +0000
571+++ account_financial_report_ext/report/afr_report_webkit_cols5.mako 2013-10-12 02:09:45 +0000
572@@ -0,0 +1,41 @@
573+<!DOCTYPE html SYSTEM
574+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
575+<html xmlns="http://www.w3.org/1999/xhtml">
576+<head>
577+<style type="text/css">
578+ ${css}
579+</style>
580+</head>
581+
582+<body style="border:0; margin: 0;" onload="subst()" >
583+
584+
585+ <h1><center>Initial | Debit | Credit | Period | YTD</center></h1>
586+ %for obj in objects:
587+ <center>${obj.company_id.name}</center>
588+ <center>${obj.get_parser_method('get_vat_by_country',data['form'])}</center>
589+ <center>${obj.get_parser_method('get_informe_text',data['form'])}</center>
590+ <center>(Expressed in ${data['form'] and obj.get_parser_method('exchange_name',
591+ (data['form'])) or '' })</center>
592+
593+ <div>${helper.embed_image('jpeg',str(obj.company_id.logo),220, 60)}</div>
594+ <table style="width: 100%; text-align:center;">
595+ <tr>
596+ <th class="celdaTituloTabla" style="text-align:center;"
597+ width="10%">${_('Code')}</th>
598+ <th class="celdaTituloTabla" style="text-align:center;"
599+ width="30%">${_('ACCOUNT')}</th>
600+ <th class="celdaTituloTabla" style="text-align:center;"
601+ width="10%">${_('INIT. BAL.')}</th>
602+ <th class="celdaTituloTabla" style="text-align:center;"
603+ width="10%">${_('DEBIT')}</th>
604+ <th class="celdaTituloTabla" style="text-align:center;"
605+ width="10%">${_('CREDIT')}</th>
606+ <th class="celdaTituloTabla" style="text-align:center;"
607+ width="10%">${_('PERIOD')}</th>
608+ <th class="celdaTituloTabla" style="text-align:center;"
609+ width="10%">${_('YTD')}</th>
610+ </tr>
611+ %endfor
612+</body>
613+</html>
614
615=== added file 'account_financial_report_ext/report/afr_report_webkit_journal_ledger.mako'
616--- account_financial_report_ext/report/afr_report_webkit_journal_ledger.mako 1970-01-01 00:00:00 +0000
617+++ account_financial_report_ext/report/afr_report_webkit_journal_ledger.mako 2013-10-12 02:09:45 +0000
618@@ -0,0 +1,19 @@
619+<!DOCTYPE html SYSTEM
620+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
621+<html xmlns="http://www.w3.org/1999/xhtml">
622+<head>
623+<style type="text/css">
624+ ${css}
625+</style>
626+</head>
627+
628+<body style="border:0; margin: 0;" onload="subst()" >
629+
630+
631+ <h1><center>Journal Ledger</center></h1>
632+ %for obj in objects:
633+ <center>${obj.company_id.name}</center>
634+ <center>${obj.get_parser_method('get_vat_by_country',data['form'])}</center>
635+ %endfor
636+</body>
637+</html>
638
639=== added file 'account_financial_report_ext/report/afr_report_webkit_qtr.mako'
640--- account_financial_report_ext/report/afr_report_webkit_qtr.mako 1970-01-01 00:00:00 +0000
641+++ account_financial_report_ext/report/afr_report_webkit_qtr.mako 2013-10-12 02:09:45 +0000
642@@ -0,0 +1,19 @@
643+<!DOCTYPE html SYSTEM
644+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
645+<html xmlns="http://www.w3.org/1999/xhtml">
646+<head>
647+<style type="text/css">
648+ ${css}
649+</style>
650+</head>
651+
652+<body style="border:0; margin: 0;" onload="subst()" >
653+
654+
655+ <h1><center>4 QTR | YTD</center></h1>
656+ %for obj in objects:
657+ <center>${obj.company_id.name}</center>
658+ <center>${obj.get_parser_method('get_vat_by_country',data['form'])}</center>
659+ %endfor
660+</body>
661+</html>
662
663=== added file 'account_financial_report_ext/report/report_afr.xml'
664--- account_financial_report_ext/report/report_afr.xml 1970-01-01 00:00:00 +0000
665+++ account_financial_report_ext/report/report_afr.xml 2013-10-12 02:09:45 +0000
666@@ -0,0 +1,148 @@
667+<?xml version="1.0"?>
668+<openerp>
669+ <data>
670+ <report
671+ auto = "True"
672+ id="afr_report_col5"
673+ model="wizard.report"
674+ name="afr_report_col5"
675+ file="account_financial_report_ext/report/afr_report_webkit_cols5.mako"
676+ string="Print AFR"
677+ report_type="webkit"
678+ multi="True"
679+ menu="False"/>
680+
681+ <record id="property_afr_report_webkit1" model="ir.property">
682+ <field name="name">webkit_header</field>
683+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
684+ <field eval="'ir.header_webkit,'+str(ref('account_financial_report_ext.ir_header_webkit_afrreport_five_colums'))" model="ir.header_webkit" name="value"/>
685+ <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_ext.afr_report_col5'))" model="ir.actions.report.xml" name="res_id"/>
686+ </record>
687+
688+
689+ <report
690+ auto = "True"
691+ id="afr_report_col1"
692+ model="wizard.report"
693+ name="afr_report_col1"
694+ file="account_financial_report_ext/report/afr_report_webkit_cols1.mako"
695+ string="Print AFR"
696+ report_type="webkit"
697+ multi="True"
698+ menu="False"/>
699+
700+ <record id="property_afr_report_webkit2" model="ir.property">
701+ <field name="name">webkit_header</field>
702+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
703+ <field eval="'ir.header_webkit,'+str(ref('account_financial_report_ext.ir_header_webkit_afrreport_one_colums'))" model="ir.header_webkit" name="value"/>
704+ <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_ext.afr_report_col1'))" model="ir.actions.report.xml" name="res_id"/>
705+ </record>
706+
707+ <report
708+ auto = "True"
709+ id="afr_report_col2"
710+ model="wizard.report"
711+ name="afr_report_col2"
712+ file="account_financial_report_ext/report/afr_report_webkit_cols2.mako"
713+ string="Print AFR"
714+ report_type="webkit"
715+ multi="True"
716+ menu="False"/>
717+
718+ <record id="property_afr_report_webkit3" model="ir.property">
719+ <field name="name">webkit_header</field>
720+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
721+ <field eval="'ir.header_webkit,'+str(ref('account_financial_report_ext.ir_header_webkit_afrreport_two_colums'))" model="ir.header_webkit" name="value"/>
722+ <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_ext.afr_report_col2'))" model="ir.actions.report.xml" name="res_id"/>
723+ </record>
724+
725+ <report
726+ auto = "True"
727+ id="afr_report_col4"
728+ model="wizard.report"
729+ name="afr_report_col4"
730+ file="account_financial_report_ext/report/afr_report_webkit_cols4.mako"
731+ string="Print AFR"
732+ report_type="webkit"
733+ multi="True"
734+ menu="False"/>
735+
736+ <record id="property_afr_report_webkit4" model="ir.property">
737+ <field name="name">webkit_header</field>
738+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
739+ <field eval="'ir.header_webkit,'+str(ref('account_financial_report_ext.ir_header_webkit_afrreport_four_colums'))" model="ir.header_webkit" name="value"/>
740+ <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_ext.afr_report_col4'))" model="ir.actions.report.xml" name="res_id"/>
741+ </record>
742+
743+
744+ <report
745+ auto = "True"
746+ id="afr_report_journal_ledger"
747+ model="wizard.report"
748+ name="afr_report_journal_ledger"
749+ file="account_financial_report_ext/report/afr_report_webkit_journal_ledger.mako"
750+ string="Print AFR"
751+ report_type="webkit"
752+ multi="True"
753+ menu="False"/>
754+
755+ <record id="property_afr_report_webkit6" model="ir.property">
756+ <field name="name">webkit_header</field>
757+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
758+ <field eval="'ir.header_webkit,'+str(ref('account_financial_report_ext.ir_header_webkit_afrreport_journal_ledger'))" model="ir.header_webkit" name="value"/>
759+ <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_ext.afr_report_journal_ledger'))" model="ir.actions.report.xml" name="res_id"/>
760+ </record>
761+
762+ <report
763+ auto = "True"
764+ id="afr_report_qtr"
765+ model="wizard.report"
766+ name="afr_report_qtr"
767+ file="account_financial_report_ext/report/afr_report_webkit_qtr.mako"
768+ string="Print AFR"
769+ report_type="webkit"
770+ multi="True"
771+ menu="False"/>
772+
773+ <record id="property_afr_report_webkit7" model="ir.property">
774+ <field name="name">webkit_header</field>
775+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
776+ <field eval="'ir.header_webkit,'+str(ref('account_financial_report_ext.ir_header_webkit_afrreport_qtr'))" model="ir.header_webkit" name="value"/>
777+ <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_ext.afr_report_qtr'))" model="ir.actions.report.xml" name="res_id"/>
778+ </record>
779+ <report
780+ auto = "True"
781+ id="afr_report_col13"
782+ model="wizard.report"
783+ name="afr_report_col13"
784+ file="account_financial_report_ext/report/afr_report_webkit_cols13.mako"
785+ string="Print AFR"
786+ report_type="webkit"
787+ multi="True"
788+ menu="False"/>
789+
790+ <record id="property_afr_report_webkit8" model="ir.property">
791+ <field name="name">webkit_header</field>
792+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
793+ <field eval="'ir.header_webkit,'+str(ref('account_financial_report_ext.ir_header_webkit_afrreport_col13'))" model="ir.header_webkit" name="value"/>
794+ <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_ext.afr_report_col13'))" model="ir.actions.report.xml" name="res_id"/>
795+ </record>
796+ <report
797+ auto = "True"
798+ id="afr_report_analytic_ledger"
799+ model="wizard.report"
800+ name="afr_report_analytic_ledger"
801+ file="account_financial_report_ext/report/afr_report_webkit_analytic_ledger.mako"
802+ string="Print AFR"
803+ report_type="webkit"
804+ multi="True"
805+ menu="False"/>
806+
807+ <record id="property_afr_report_webkit9" model="ir.property">
808+ <field name="name">webkit_header</field>
809+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
810+ <field eval="'ir.header_webkit,'+str(ref('account_financial_report_ext.ir_header_webkit_afrreport_analytic_ledger'))" model="ir.header_webkit" name="value"/>
811+ <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_ext.afr_report_analytic_ledger'))" model="ir.actions.report.xml" name="res_id"/>
812+ </record>
813+ </data>
814+</openerp>
815
816=== added directory 'account_financial_report_ext/security'
817=== added directory 'account_financial_report_ext/static'
818=== added directory 'account_financial_report_ext/static/description'
819=== added file 'account_financial_report_ext/static/description/index.html'
820=== added directory 'account_financial_report_ext/static/src'
821=== added directory 'account_financial_report_ext/static/src/css'
822=== added directory 'account_financial_report_ext/static/src/img'
823=== added directory 'account_financial_report_ext/static/src/js'
824=== added directory 'account_financial_report_ext/static/src/xml'
825=== added directory 'account_financial_report_ext/test'
826=== added directory 'account_financial_report_ext/view'
827=== added directory 'account_financial_report_ext/wizard'
828=== added file 'account_financial_report_ext/wizard/__init__.py'
829--- account_financial_report_ext/wizard/__init__.py 1970-01-01 00:00:00 +0000
830+++ account_financial_report_ext/wizard/__init__.py 2013-10-12 02:09:45 +0000
831@@ -0,0 +1,26 @@
832+#!/usr/bin/python
833+# -*- encoding: utf-8 -*-
834+###############################################################################
835+# Module Writen to OpenERP, Open Source Management Solution
836+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
837+# All Rights Reserved
838+############# Credits #########################################################
839+# Coded by: Yanina Aular <yani@vauxoo.com>
840+# Planified by: Humberto Arocha <hbto@vauxoo.com>
841+# Audited by: Humberto Arocha <hbto@vauxoo.com>
842+###############################################################################
843+# This program is free software: you can redistribute it and/or modify
844+# it under the terms of the GNU Affero General Public License as published
845+# by the Free Software Foundation, either version 3 of the License, or
846+# (at your option) any later version.
847+#
848+# This program is distributed in the hope that it will be useful,
849+# but WITHOUT ANY WARRANTY; without even the implied warranty of
850+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
851+# GNU Affero General Public License for more details.
852+#
853+# You should have received a copy of the GNU Affero General Public License
854+# along with this program. If not, see <http://www.gnu.org/licenses/>.
855+###############################################################################
856+
857+import afr_report_wizard
858
859=== added file 'account_financial_report_ext/wizard/afr_report_wizard.py'
860--- account_financial_report_ext/wizard/afr_report_wizard.py 1970-01-01 00:00:00 +0000
861+++ account_financial_report_ext/wizard/afr_report_wizard.py 2013-10-12 02:09:45 +0000
862@@ -0,0 +1,89 @@
863+#!/usr/bin/python
864+# -*- encoding: utf-8 -*-
865+###############################################################################
866+# Module Writen to OpenERP, Open Source Management Solution
867+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
868+# All Rights Reserved
869+############# Credits #########################################################
870+# Coded by: Yanina Aular <yani@vauxoo.com>
871+# Planified by: Humberto Arocha <hbto@vauxoo.com>
872+# Audited by: Humberto Arocha <hbto@vauxoo.com>
873+###############################################################################
874+# This program is free software: you can redistribute it and/or modify
875+# it under the terms of the GNU Affero General Public License as published
876+# by the Free Software Foundation, either version 3 of the License, or
877+# (at your option) any later version.
878+#
879+# This program is distributed in the hope that it will be useful,
880+# but WITHOUT ANY WARRANTY; without even the implied warranty of
881+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
882+# GNU Affero General Public License for more details.
883+#
884+# You should have received a copy of the GNU Affero General Public License
885+# along with this program. If not, see <http://www.gnu.org/licenses/>.
886+###############################################################################
887+
888+
889+
890+from osv import osv, fields
891+import pooler
892+import time
893+from tools.translate import _
894+from account_financial_report.report import parser as Parser
895+
896+
897+class wizard_report(osv.osv_memory):
898+ _inherit = "wizard.report"
899+
900+ def get_parser_method(self, cr, uid, ids, method=None, args=None, param=None, context=None):
901+ if context is None:
902+ context = {}
903+
904+ acc_bal_obj = Parser.account_balance(cr, uid, ids ,context=context)
905+ res = []
906+
907+ if method:
908+ if method in ("get_company_accounts", "_get_analytic_ledger", "_get_journal_ledger",
909+ "lines"):
910+ res = getattr(acc_bal_obj, method)(args, param)
911+ else:
912+ res = getattr(acc_bal_obj, method)(args)
913+
914+ return res
915+
916+ def print_report(self, cr, uid, ids, data, context=None):
917+ if context is None:
918+ context = {}
919+
920+ res = super(wizard_report, self).print_report(cr, uid, ids, data=data, context=context)
921+
922+ res.get('datas')['ids'] = ids
923+
924+ if( res.get('report_name') == 'afr.1cols'):
925+ res['report_name'] = 'afr_report_col1'
926+
927+ if( res.get('report_name') == 'afr.2cols'):
928+ res['report_name'] = 'afr_report_col2'
929+
930+ if( res.get('report_name') == 'afr.4cols'):
931+ res['report_name'] = 'afr_report_col4'
932+
933+ if( res.get('report_name') == 'afr.5cols'):
934+ res['report_name'] = 'afr_report_col5'
935+
936+ if( res.get('report_name') == 'afr.journal.ledger'):
937+ res['report_name'] = 'afr_report_journal_ledger'
938+
939+ if( res.get('report_name') == 'afr.analytic.ledger'):
940+ res['report_name'] = 'afr_report_analytic_ledger'
941+
942+ if( res.get('report_name') == 'afr.qtrcols'):
943+ res['report_name'] = 'afr_report_qtr'
944+
945+ if( res.get('report_name') == 'afr.13cols'):
946+ res['report_name'] = 'afr_report_col13'
947+
948+ return res
949+
950+
951+
952
953=== added directory 'account_financial_report_ext/workflow'

Subscribers

People subscribed via source and target branches

to status/vote changes: