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

Proposed by Carlos Contreras
Status: Merged
Merged at revision: 3
Proposed branch: lp:~carlos-realsystems/openerp-vauxoo-gbw/6.0
Merge into: lp:openerp-vauxoo-gbw/6.0
Diff against target: 1153 lines (+854/-86)
18 files modified
gbwinvoice_report_webkit/__init__.py (+2/-1)
gbwinvoice_report_webkit/__openerp__.py (+19/-9)
gbwinvoice_report_webkit/data.xml (+150/-1)
gbwinvoice_report_webkit/gbwcategory_report.py (+4/-0)
gbwinvoice_report_webkit/gbwinvoice_report_webkit_view.xml (+20/-1)
gbwinvoice_report_webkit/i18n/en_US.po (+102/-2)
gbwinvoice_report_webkit/i18n/es_MX.po (+102/-2)
gbwinvoice_report_webkit/report/__init__.py (+1/-1)
gbwinvoice_report_webkit/report/gbwinvoice_report_webkit.py (+0/-17)
gbwinvoice_report_webkit/report/templates/gbwcategory_report_webkit.mako (+73/-28)
gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako (+122/-0)
gbwinvoice_report_webkit/report/templates/gbwinvoice_report_webkit.mako (+47/-24)
gbwinvoice_report_webkit/wizard/__init__.py (+2/-0)
gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard.py (+65/-0)
gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard_view.xml (+46/-0)
gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.py (+45/-0)
gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.xml (+9/-0)
gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard_view.xml (+45/-0)
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+167412@code.launchpad.net

Description of the change

[IMP] Show product code on Report Detail by Category.
Show product name to 15 characters

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
=== modified file 'gbwinvoice_report_webkit/__init__.py'
--- gbwinvoice_report_webkit/__init__.py 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/__init__.py 2013-06-04 21:36:25 +0000
@@ -28,5 +28,6 @@
28# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.28# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
29#29#
30##############################################################################30##############################################################################
31import report
31import wizard32import wizard
32import report
33\ No newline at end of file33\ No newline at end of file
34import gbwcategory_report
3435
=== modified file 'gbwinvoice_report_webkit/__openerp__.py'
--- gbwinvoice_report_webkit/__openerp__.py 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/__openerp__.py 2013-06-04 21:36:25 +0000
@@ -33,22 +33,30 @@
33 "description" : """ Invoce Report for GBW33 "description" : """ Invoce Report for GBW
34This module adds the follow reports :34This module adds the follow reports :
35 - Invoices by period35 - Invoices by period
36 - Invoices by product category
37 - Invoices by product category with detail
3638
37Goals:39Goals:
3840
39 * Give to GBW invoice report like actual GBW System: ADMIN41 * Show GBW invoice report and invoice report by category like actual GBW System: ADMIN
4042
41TODO:43Instalation:
42 - Filter by period in the wizard (no need to go to the Invoices anymore) or by view 44Once upon installed go to:
43 - improved report style45 Administration->Customization->Low level objects->Actions->Reports
4446
47 Change header of:
48 GBW Category Detail Invoice Report
49 GBW Category Invoice Report
50 GBW Invoice Report
51 to:
52 GBW Invoice NO Header
53
45Limitations:54Limitations:
46In order to run properly this module make sure you have installed the library ‘wkhtmltopdf’ for the pdf rendering (this library path must be added to you company settings).55In order to run properly this module make sure you have installed the library ‘wkhtmltopdf’ for the pdf rendering (this library path must be added to you company settings).
4756
48html headers and footers are deactivated for these reports because of an issue of wkhtmltopdf : http://code.google.com/p/wkhtmltopdf/issues/detail?id=65657html headers and footers are deactivated for these reports because of an issue of wkhtmltopdf : http://code.google.com/p/wkhtmltopdf/issues/detail?id=656
49Instead, the header and footer are created as text with arguments passed to wkhtmltopdf. The texts are defined inside the report classes.58Instead, the header and footer are created as text with arguments passed to wkhtmltopdf. The texts are defined inside the report classes.
5059
51 You have to create the print buttons by calling the wizard.
52 """,60 """,
53 "version" : "0.1",61 "version" : "0.1",
54 "depends" : ["base", "account", "report_webkit"],62 "depends" : ["base", "account", "report_webkit"],
@@ -56,8 +64,10 @@
56 "author" : "Real Systems",64 "author" : "Real Systems",
57 "url": "http://www.realsystems.com.mx/",65 "url": "http://www.realsystems.com.mx/",
58 "data": ["gbwinvoice_report_webkit_view.xml",66 "data": ["gbwinvoice_report_webkit_view.xml",
59 "data.xml", 67 "data.xml",
60 ],68 ],
69 "init_xml" : ['wizard/gbwinvoice_report_webkit_wizard_view.xml',
70 'wizard/gbwcategory_report_webkit_wizard_view.xml'],
61 "installable" : True,71 "installable" : True,
62 "active" : False,72 "active" : False,
63 "certificate" : "",73 "certificate" : "",
6474
=== modified file 'gbwinvoice_report_webkit/data.xml'
--- gbwinvoice_report_webkit/data.xml 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/data.xml 2013-06-04 21:36:25 +0000
@@ -1,6 +1,9 @@
1<?xml version="1.0" ?>1<?xml version="1.0" ?>
2<openerp>2<openerp>
3 <data noupdate="1">3 <data noupdate="1">
4
5<!-- Normal GBW Header !-->
6
4 <record id="ir_header_gbw" model="ir.header_webkit">7 <record id="ir_header_gbw" model="ir.header_webkit">
5 <field name="footer_html"><![CDATA[<html>8 <field name="footer_html"><![CDATA[<html>
6 <head>9 <head>
@@ -161,7 +164,153 @@
161.tax {164.tax {
162width:50%;165width:50%;
163}]]> </field>166}]]> </field>
164 <field eval="&quot;&quot;&quot;GBW Invoice Header&quot;&quot;&quot;" name="name"/>167 <field eval="&quot;&quot;&quot;GBW Normal Header&quot;&quot;&quot;" name="name"/>
168 </record>
169
170<!-- GBW Header without company data !-->
171
172 <record id="ir_noheader_gbw" model="ir.header_webkit">
173 <field name="footer_html"><![CDATA[<html>
174 <head>
175 <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
176 <script>
177 function subst() {
178 var vars={};
179 var x=document.location.search.substring(1).split('&');
180 for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
181 var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
182 for(var i in x) {
183 var y = document.getElementsByClassName(x[i]);
184 for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
185 }
186 }
187 </script>
188 </head>
189 <body style="border:0; margin: 0;" onload="subst()">
190 <table style="border-top: 1px solid black; width: 100%">
191 <tr >
192 <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>
193 </tr>
194 </table>
195 </body>
196</html>]]></field>
197 <field eval="&quot;&quot;&quot;Portrait&quot;&quot;&quot;" name="orientation"/>
198 <field eval="&quot;&quot;&quot;A4&quot;&quot;&quot;" name="format"/>
199 <field name="html"><![CDATA[<html>
200 <head>
201 <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
202 <script>
203 function subst() {
204 var vars={};
205 var x=document.location.search.substring(1).split('&');
206 for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
207 var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
208 for(var i in x) {
209 var y = document.getElementsByClassName(x[i]);
210 for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
211 }
212 }
213 </script>
214 <style type="text/css">
215 ${css}
216 </style>
217 </head>
218 <body style="border:0; margin: 0;" onload="subst()">
219 <% setLang(user.context_lang) %>
220 <table class="header" style="border-bottom: 0px solid black; width: 100%">
221 <tr>
222 <td>&nbsp;</td>
223 <td style="text-align:right">Fecha: ${ formatLang(time.strftime("%Y-%m-%d"), date=True) }<br>IMPRIMI&Oacute;: ${user.name}</td>
224 </tr>
225 </table> ${_debug or ''|n} </body>
226</html>]]>
227</field>
228 <field eval="55.0" name="margin_top"/>
229 <field name="css" ><![CDATA[
230body {
231font-family:helvetica;
232font-size:12;
233}
234
235
236.dest_address {
237margin-left:60%;
238font-size:12;
239}
240.header {
241margin-left:0;
242text-align:left;
243width:300px;
244font-size:12;
245}
246
247.title {
248font-size:16;
249font-weight: bold;
250
251}
252
253
254.basic_table{
255text-align:center;
256border:1px solid lightGrey;
257border-collapse: collapse;
258}
259.basic_table td {
260border:1px solid lightGrey;
261font-size:12;
262
263
264}
265
266.list_table {
267border-color:black;
268text-align:center;
269border-collapse: collapse;
270
271}
272.list_table td {
273border-color:gray;
274border-top:1px solid gray;
275text-align:left;
276font-size:12;
277padding-right:3px
278padding-left:3px
279padding-top:3px
280padding-bottom:3px
281}
282
283.list_table th {
284border-bottom:2px solid black;
285text-align:left;
286font-size:12;
287font-weight:bold;
288padding-right:3px
289padding-left:3px
290}
291
292.list_tabe thead {
293 display:table-header-group;
294}
295
296
297.total {
298width:100%;
299}
300.lib {
301width:10.3%;
302}
303.tot {
304text-align:right;
305width:15%;
306}
307.lefttot {
308width:74%;
309}
310.tax {
311width:50%;
312}]]> </field>
313 <field eval="&quot;&quot;&quot;GBW Invoice NO Header&quot;&quot;&quot;" name="name"/>
165 </record>314 </record>
166 315
167 <record id="ir_header_img_gbw" model="ir.header_img">316 <record id="ir_header_img_gbw" model="ir.header_img">
168317
=== added file 'gbwinvoice_report_webkit/gbwcategory_report.py'
--- gbwinvoice_report_webkit/gbwcategory_report.py 1970-01-01 00:00:00 +0000
+++ gbwinvoice_report_webkit/gbwcategory_report.py 2013-06-04 21:36:25 +0000
@@ -0,0 +1,4 @@
1from osv import osv,fields
2from tools.translate import _
3import time
4from datetime import datetime
05
=== modified file 'gbwinvoice_report_webkit/gbwinvoice_report_webkit_view.xml'
--- gbwinvoice_report_webkit/gbwinvoice_report_webkit_view.xml 2013-05-28 18:55:31 +0000
+++ gbwinvoice_report_webkit/gbwinvoice_report_webkit_view.xml 2013-06-04 21:36:25 +0000
@@ -5,9 +5,28 @@
5 id="gbwinvoice_report_webkit" 5 id="gbwinvoice_report_webkit"
6 model="account.invoice" 6 model="account.invoice"
7 name="gbwinvoice.report.webkit" 7 name="gbwinvoice.report.webkit"
8 file="gbwinvoice_report_webkit/report/invoice_gbw_report.mako" 8 file="gbwinvoice_report_webkit/report/templates/gbwinvoice_report_webkit.mako"
9 string="GBW Invoice Report"9 string="GBW Invoice Report"
10 report_type="webkit" 10 report_type="webkit"
11 />11 />
12
13 <report auto="False"
14 id="gbwcategory_report_webkit"
15 model="account.invoice.line"
16 name="gbwcategory.report.webkit"
17 file="gbwinvoice_report_webkit/report/templates/gbwcategory_report_webkit.mako"
18 string="GBW Category Invoice Report"
19 report_type="webkit"
20 />
21
22 <report auto="False"
23 id="gbwcategorydetail_report_webkit"
24 model="account.invoice.line"
25 name="gbwcategorydetail.report.webkit"
26 file="gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako"
27 string="GBW Category Detail Invoice Report"
28 report_type="webkit"
29 />
30
12 </data>31 </data>
13</openerp>32</openerp>
1433
=== modified file 'gbwinvoice_report_webkit/i18n/en_US.po'
--- gbwinvoice_report_webkit/i18n/en_US.po 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/i18n/en_US.po 2013-06-04 21:36:25 +0000
@@ -6,8 +6,8 @@
6msgstr ""6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.4\n"7"Project-Id-Version: OpenERP Server 6.0.4\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2013-05-27 17:04+0000\n"9"POT-Creation-Date: 2013-06-04 17:52+0000\n"
10"PO-Revision-Date: 2013-05-27 17:04+0000\n"10"PO-Revision-Date: 2013-06-04 17:52+0000\n"
11"Last-Translator: <>\n"11"Last-Translator: <>\n"
12"Language-Team: \n"12"Language-Team: \n"
13"MIME-Version: 1.0\n"13"MIME-Version: 1.0\n"
@@ -16,7 +16,107 @@
16"Plural-Forms: \n"16"Plural-Forms: \n"
1717
18#. module: gbwinvoice_report_webkit18#. module: gbwinvoice_report_webkit
19#: field:gbwcategory.webkitwizard,state:0
20#: field:gbwinvoice.webkitwizard,state:0
21msgid "unknown"
22msgstr "unknown"
23
24#. module: gbwinvoice_report_webkit
25#: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwcategory_report_webkit
26msgid "GBW Category Invoice Report"
27msgstr "GBW Category Invoice Report"
28
29#. module: gbwinvoice_report_webkit
30#: field:gbwcategory.webkitwizard,from_date:0
31#: field:gbwinvoice.webkitwizard,from_date:0
32msgid "From"
33msgstr "From"
34
35#. module: gbwinvoice_report_webkit
36#: field:gbwcategory.webkitwizard,report_title:0
37#: field:gbwinvoice.webkitwizard,report_title:0
38msgid "Report Title"
39msgstr "Report Title"
40
41#. module: gbwinvoice_report_webkit
42#: model:ir.model,name:gbwinvoice_report_webkit.model_gbwcategory_webkitwizard
43msgid "GBW Invoices by Category"
44msgstr "GBW Invoices by Category"
45
46#. module: gbwinvoice_report_webkit
47#: view:gbwcategory.webkitwizard:0
48#: view:gbwinvoice.webkitwizard:0
49msgid "Invoices"
50msgstr "Invoices"
51
52#. module: gbwinvoice_report_webkit
53#: help:gbwcategory.webkitwizard,detail_report:0
54msgid "Show products detail by category."
55msgstr "Show products detail by category."
56
57#. module: gbwinvoice_report_webkit
58#: view:gbwcategory.webkitwizard:0
59#: view:gbwinvoice.webkitwizard:0
60msgid "Create"
61msgstr "Create"
62
63#. module: gbwinvoice_report_webkit
64#: selection:gbwcategory.webkitwizard,state:0
65#: selection:gbwinvoice.webkitwizard,state:0
66msgid "get"
67msgstr "get"
68
69#. module: gbwinvoice_report_webkit
70#: field:gbwcategory.webkitwizard,detail_report:0
71msgid "Show Products Detail"
72msgstr "Show Products Detail"
73
74#. module: gbwinvoice_report_webkit
19#: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwinvoice_report_webkit75#: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwinvoice_report_webkit
20msgid "GBW Invoice Report"76msgid "GBW Invoice Report"
21msgstr "GBW Invoice Report"77msgstr "GBW Invoice Report"
2278
79#. module: gbwinvoice_report_webkit
80#: view:gbwcategory.webkitwizard:0
81#: view:gbwinvoice.webkitwizard:0
82msgid "Filter"
83msgstr "Filter"
84
85#. module: gbwinvoice_report_webkit
86#: field:gbwcategory.webkitwizard,to_date:0
87#: field:gbwinvoice.webkitwizard,to_date:0
88msgid "To"
89msgstr "To"
90
91#. module: gbwinvoice_report_webkit
92#: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwcategorydetail_report_webkit
93msgid "GBW Category Detail Invoice Report"
94msgstr "GBW Category Detail Invoice Report"
95
96#. module: gbwinvoice_report_webkit
97#: selection:gbwcategory.webkitwizard,state:0
98#: selection:gbwinvoice.webkitwizard,state:0
99msgid "choose"
100msgstr "choose"
101
102#. module: gbwinvoice_report_webkit
103#: model:ir.actions.act_window,name:gbwinvoice_report_webkit.action_gbwinvoice_report_webkit
104msgid "GBW Invoice Report by Period"
105msgstr "GBW Invoice Report by Period"
106
107#. module: gbwinvoice_report_webkit
108#: view:gbwcategory.webkitwizard:0
109#: view:gbwinvoice.webkitwizard:0
110msgid "Cancel"
111msgstr "Cancel"
112
113#. module: gbwinvoice_report_webkit
114#: model:ir.actions.act_window,name:gbwinvoice_report_webkit.action_gbwcategory_report_webkit
115msgid "GBW Invoice Report by Category"
116msgstr "GBW Invoice Report by Category"
117
118#. module: gbwinvoice_report_webkit
119#: model:ir.model,name:gbwinvoice_report_webkit.model_gbwinvoice_webkitwizard
120msgid "GBW Invoices by Period"
121msgstr "GBW Invoices by Period"
122
23123
=== modified file 'gbwinvoice_report_webkit/i18n/es_MX.mo'
24Binary files gbwinvoice_report_webkit/i18n/es_MX.mo 2013-05-27 18:43:36 +0000 and gbwinvoice_report_webkit/i18n/es_MX.mo 2013-06-04 21:36:25 +0000 differ124Binary files gbwinvoice_report_webkit/i18n/es_MX.mo 2013-05-27 18:43:36 +0000 and gbwinvoice_report_webkit/i18n/es_MX.mo 2013-06-04 21:36:25 +0000 differ
=== modified file 'gbwinvoice_report_webkit/i18n/es_MX.po'
--- gbwinvoice_report_webkit/i18n/es_MX.po 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/i18n/es_MX.po 2013-06-04 21:36:25 +0000
@@ -6,8 +6,8 @@
6msgstr ""6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.4\n"7"Project-Id-Version: OpenERP Server 6.0.4\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2013-05-27 17:05+0000\n"9"POT-Creation-Date: 2013-06-04 17:52+0000\n"
10"PO-Revision-Date: 2013-05-27 12:46-0600\n"10"PO-Revision-Date: 2013-06-04 13:03-0600\n"
11"Last-Translator: Carlos Enrique Contreras Vara <carlosecv@realsystems.com.mx>\n"11"Last-Translator: Carlos Enrique Contreras Vara <carlosecv@realsystems.com.mx>\n"
12"Language-Team: \n"12"Language-Team: \n"
13"MIME-Version: 1.0\n"13"MIME-Version: 1.0\n"
@@ -16,7 +16,107 @@
16"Plural-Forms: \n"16"Plural-Forms: \n"
1717
18#. module: gbwinvoice_report_webkit18#. module: gbwinvoice_report_webkit
19#: field:gbwcategory.webkitwizard,state:0
20#: field:gbwinvoice.webkitwizard,state:0
21msgid "unknown"
22msgstr "desconocido"
23
24#. module: gbwinvoice_report_webkit
25#: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwcategory_report_webkit
26msgid "GBW Category Invoice Report"
27msgstr "Reporte por Categorías GBW"
28
29#. module: gbwinvoice_report_webkit
30#: field:gbwcategory.webkitwizard,from_date:0
31#: field:gbwinvoice.webkitwizard,from_date:0
32msgid "From"
33msgstr "Desde"
34
35#. module: gbwinvoice_report_webkit
36#: field:gbwcategory.webkitwizard,report_title:0
37#: field:gbwinvoice.webkitwizard,report_title:0
38msgid "Report Title"
39msgstr "Título del Reporte"
40
41#. module: gbwinvoice_report_webkit
42#: model:ir.model,name:gbwinvoice_report_webkit.model_gbwcategory_webkitwizard
43msgid "GBW Invoices by Category"
44msgstr "Facturas por Categorías GBW"
45
46#. module: gbwinvoice_report_webkit
47#: view:gbwcategory.webkitwizard:0
48#: view:gbwinvoice.webkitwizard:0
49msgid "Invoices"
50msgstr "Facturas"
51
52#. module: gbwinvoice_report_webkit
53#: help:gbwcategory.webkitwizard,detail_report:0
54msgid "Show products detail by category."
55msgstr "Muestra el detalle de los productos por categoría."
56
57#. module: gbwinvoice_report_webkit
58#: view:gbwcategory.webkitwizard:0
59#: view:gbwinvoice.webkitwizard:0
60msgid "Create"
61msgstr "Crear"
62
63#. module: gbwinvoice_report_webkit
64#: selection:gbwcategory.webkitwizard,state:0
65#: selection:gbwinvoice.webkitwizard,state:0
66msgid "get"
67msgstr "get"
68
69#. module: gbwinvoice_report_webkit
70#: field:gbwcategory.webkitwizard,detail_report:0
71msgid "Show Products Detail"
72msgstr "Muestra el detalle de Productos"
73
74#. module: gbwinvoice_report_webkit
19#: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwinvoice_report_webkit75#: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwinvoice_report_webkit
20msgid "GBW Invoice Report"76msgid "GBW Invoice Report"
21msgstr "Reporte de Facturas GBW "77msgstr "Reporte de Facturas GBW "
2278
79#. module: gbwinvoice_report_webkit
80#: view:gbwcategory.webkitwizard:0
81#: view:gbwinvoice.webkitwizard:0
82msgid "Filter"
83msgstr "Filtro"
84
85#. module: gbwinvoice_report_webkit
86#: field:gbwcategory.webkitwizard,to_date:0
87#: field:gbwinvoice.webkitwizard,to_date:0
88msgid "To"
89msgstr "Hasta"
90
91#. module: gbwinvoice_report_webkit
92#: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwcategorydetail_report_webkit
93msgid "GBW Category Detail Invoice Report"
94msgstr "Reporte Detallado por Categoría GBW"
95
96#. module: gbwinvoice_report_webkit
97#: selection:gbwcategory.webkitwizard,state:0
98#: selection:gbwinvoice.webkitwizard,state:0
99msgid "choose"
100msgstr "elegir"
101
102#. module: gbwinvoice_report_webkit
103#: model:ir.actions.act_window,name:gbwinvoice_report_webkit.action_gbwinvoice_report_webkit
104msgid "GBW Invoice Report by Period"
105msgstr "Facturas por Periodo GBW"
106
107#. module: gbwinvoice_report_webkit
108#: view:gbwcategory.webkitwizard:0
109#: view:gbwinvoice.webkitwizard:0
110msgid "Cancel"
111msgstr "Cancelar"
112
113#. module: gbwinvoice_report_webkit
114#: model:ir.actions.act_window,name:gbwinvoice_report_webkit.action_gbwcategory_report_webkit
115msgid "GBW Invoice Report by Category"
116msgstr "Reporte por Categorías GBW"
117
118#. module: gbwinvoice_report_webkit
119#: model:ir.model,name:gbwinvoice_report_webkit.model_gbwinvoice_webkitwizard
120msgid "GBW Invoices by Period"
121msgstr "Facturas por Período GBW"
122
23123
=== modified file 'gbwinvoice_report_webkit/report/__init__.py'
--- gbwinvoice_report_webkit/report/__init__.py 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/report/__init__.py 2013-06-04 21:36:25 +0000
@@ -29,4 +29,4 @@
29#29#
30##############################################################################30##############################################################################
3131
32import gbwinvoice_report_webkit32
3333
=== removed file 'gbwinvoice_report_webkit/report/gbwinvoice_report_webkit.py'
--- gbwinvoice_report_webkit/report/gbwinvoice_report_webkit.py 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/report/gbwinvoice_report_webkit.py 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
1import time
2from report import report_sxw
3from osv import osv
4
5class gbwinvoice_report_webkit(report_sxw.rml_parse):
6 def __init__(self, cr, uid, name, context):
7 super(gbwinvoice_report_webkit, self).__init__(cr, uid, name, context=context)
8 self.localcontext.update({
9 'time': time,
10 'cr':cr,
11 'uid': uid,
12 })
13
14report_sxw.report_sxw('report.webkitgbw.invoice',
15 'account.invoice',
16 'gbwinvoice_report_webkit/report/invoice_gbw_report.mako',
17 gbwinvoice_report_webkit)
180
=== renamed file 'gbwinvoice_report_webkit/report/templates/category_gbw_report.mako' => 'gbwinvoice_report_webkit/report/templates/gbwcategory_report_webkit.mako'
--- gbwinvoice_report_webkit/report/templates/category_gbw_report.mako 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/report/templates/gbwcategory_report_webkit.mako 2013-06-04 21:36:25 +0000
@@ -1,41 +1,86 @@
1<html > 1<html >
2<body>2<body>
3
3<%4<%
4 renglones = 05existe=0
5 total_importe = 06categorias={}
6 total_iva= 07registros=0
7 total_total= 08suma_total_cantidad=0
8 facturas = 09suma_total_subtotal=0
9 facturas_reportadas = 010subtotal=0
10 facturas_borrador = 011setLang(user.context_lang)
11 facturas_canceladas = 0
12 setLang(user.context_lang)
13%>12%>
13
14<table style="align:right;" >
15<tr>
16<td style="font-size:small;" colspan=2>${data['form']['report_title'] or ''}</td>
17</tr>
18<tr>
19<td style="font-size:small;" >Del&nbsp;</td><td>${data['form']['from_date'] or '' }</td>
20<td style="font-size:small;" >&nbsp;al&nbsp;</td><td>${data['form']['to_date'] or '' }</td>
21</tr>
22</table>
23
24
14<table class="list_table" >25<table class="list_table" >
15<tr>26<tr>
16<td style="border-bottom:2px solid;" >Categoria</td>27<td style="border-bottom:2px solid;" >Categoria</td>
17<td style="border-bottom:2px solid;" >Producto</td>
18<td style="border-bottom:2px solid;" >Cantidad</td>28<td style="border-bottom:2px solid;" >Cantidad</td>
19<td style="border-bottom:2px solid;" >Importe</td>29<td style="border-bottom:2px solid;" >Importe</td>
20<td style="border-bottom:2px solid;" >Impuesto</td>
21<td style="border-bottom:2px solid;" >Importe Total</td>
22</tr> 30</tr>
23%for involn in objects:31%for involn in objects:
24<tr>32 <%
25<td style="border-bottom:2px solid;" >33 existe=0
26${involn.categ_id.name}34 t={}
27</td>35 %>
28<td style="border-bottom:2px solid;" >${involn.product_id.name}</td>36 %if involn.invoice_id.rate>0.0:
29<td style="border-bottom:2px solid;" ></td>37 <%
30<td style="border-bottom:2px solid;" ></td>38 subtotal=involn.price_subtotal*involn.invoice_id.rate
31<td style="border-bottom:2px solid;" ></td>39 %>
32<td style="border-bottom:2px solid;" ></td>40 %else:
33</tr> 41 <%
3442 subtotal=involn.price_subtotal
3543 %>
36<% renglones = renglones + 1 %>44 %endif
37%endfor45 %for k, v in categorias.items():
38</table> 46 %if k==involn.product_id.categ_id.complete_name:
39</p>47 <%
48 t['cantidad']=v['cantidad']+involn.quantity
49 t['subtotal']=v['subtotal']+subtotal
50 existe=1
51 break
52 %>
53 %endif
54 %endfor
55 %if existe==0:
56 <%
57 t[involn.product_id.categ_id.complete_name]={'cantidad': involn.quantity,'subtotal':subtotal }
58 categorias.update(t)
59 %>
60 %else:
61 <%
62 categorias[involn.product_id.categ_id.complete_name]=t
63 %>
64 %endif
65 <%
66 suma_total_cantidad=suma_total_cantidad+involn.quantity
67 suma_total_subtotal=suma_total_subtotal+subtotal
68 %>
69%endfor
70
71%for k, v in categorias.items():
72<tr>
73<td style="border-bottom:1px solid;" >${k}</td>
74<td style="border-bottom:1px solid;float: right; text-align: right" >${formatLang(v['cantidad']) or 0.0}</td>
75<td colspan=2 style="border-bottom:1px solid;float: right; text-align: right" >${company.currency_id.symbol} ${formatLang(v['subtotal'],monetary=True) or 0.0}</td>
76</tr>
77%endfor
78<tr>
79<td style="border-bottom:1px solid;border-top:1px solid;" >Total:</td>
80<td style="border-bottom:1px solid;border-top:1px solid;float: right; text-align: right" >${formatLang(suma_total_cantidad) or 0.0}</td>
81<td colspan=2 style="border-bottom:1px solid;border-top:1px solid;float: right; text-align: right" >${company.currency_id.symbol} ${formatLang(suma_total_subtotal,monetary=True) or 0.0}</td>
82</tr>
83</table>
84
40</body> 85</body>
41</html>86</html>
4287
=== added file 'gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako'
--- gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako 1970-01-01 00:00:00 +0000
+++ gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako 2013-06-04 21:36:25 +0000
@@ -0,0 +1,122 @@
1<html >
2<body>
3
4<%
5existe=0
6categorias={}
7productos={}
8registros=0
9suma_total_cantidad=0
10suma_total_subtotal=0
11subtotal=0
12setLang(user.context_lang)
13%>
14
15<table style="align:right;" >
16<tr>
17<td style="font-size:small;" colspan=2>${data['form']['report_title'] or ''}</td>
18</tr>
19<tr>
20<td style="font-size:small;" >Del&nbsp;</td><td>${data['form']['from_date'] or '' }</td>
21<td style="font-size:small;" >&nbsp;al&nbsp;</td><td>${data['form']['to_date'] or '' }</td>
22</tr>
23</table>
24
25
26<table class="list_table" >
27<tr>
28<td style="border-bottom:2px solid;" >Categoria</td>
29<td style="border-bottom:2px solid;" >Producto</td>
30<td style="border-bottom:2px solid;" >Cantidad</td>
31<td style="border-bottom:2px solid;" >Importe</td>
32</tr>
33%for involn in objects:
34 <%
35 existec=0
36 existep=0
37 tc={}
38 tp={}
39 tp2={}
40 productos={}
41 %>
42 %if involn.invoice_id.rate>0.0:
43 <%
44 subtotal=involn.price_subtotal*involn.invoice_id.rate
45 %>
46 %else:
47 <%
48 subtotal=involn.price_subtotal
49 %>
50 %endif
51 %for k, v in categorias.items():
52 %if k==involn.product_id.categ_id.complete_name:
53 <%
54 existec=1
55 productos=v
56 %>
57 %for kp, vp in v.items():
58 %if kp==involn.product_id.name:
59 <%
60 tp2['referencia']=involn.product_id.code
61 tp2['cantidad']=vp['cantidad']+involn.quantity
62 tp2['subtotal']=vp['subtotal']+subtotal
63 existep=1
64 break
65 %>
66 %endif
67 %endfor
68 %if existep==0:
69 <%
70 tp[involn.product_id.name]={'cantidad':involn.quantity,'subtotal':subtotal, 'referencia':involn.product_id.code }
71 productos.update(tp)
72 %>
73 %else:
74 <%
75 tp[involn.product_id.name]=tp2
76 productos.update(tp)
77 %>
78 %endif
79 <%
80 break
81 %>
82 %endif
83 %endfor
84 %if existec==0:
85 <%
86 tp[involn.product_id.name]={'cantidad':involn.quantity,'subtotal':subtotal, 'referencia':involn.product_id.code }
87 tc[involn.product_id.categ_id.complete_name]=tp
88 categorias.update(tc)
89 %>
90 %else:
91 <%
92 tc[involn.product_id.categ_id.complete_name]=productos
93 categorias.update(tc)
94 %>
95 %endif
96 <%
97 suma_total_cantidad=suma_total_cantidad+involn.quantity
98 suma_total_subtotal=suma_total_subtotal+subtotal
99 %>
100%endfor
101
102%for k, v in categorias.items():
103<tr>
104<td colspan=4 style="border-bottom:1px solid;border-top:1px solid;" >${k}</td>
105</tr>
106 %for kp, vp in v.items():
107 <tr>
108 <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>
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>
111 </tr>
112 %endfor
113%endfor
114<tr>
115<td colspan=2 style="border-bottom:2px solid;border-top:2px solid;" >Total:</td>
116<td style="border-bottom:2px solid;border-top:2px solid;float: right; text-align: right" >${company.currency_id.symbol} ${formatLang(suma_total_cantidad) or 0.0}</td>
117<td style="border-bottom:2px solid;border-top:2px solid;float: right; text-align: right" >${company.currency_id.symbol} ${formatLang(suma_total_subtotal,monetary=True) or 0.0}</td>
118</tr>
119</table>
120
121</body>
122</html>
0123
=== renamed file 'gbwinvoice_report_webkit/report/invoice_gbw_report.mako' => 'gbwinvoice_report_webkit/report/templates/gbwinvoice_report_webkit.mako'
--- gbwinvoice_report_webkit/report/invoice_gbw_report.mako 2013-05-27 18:43:36 +0000
+++ gbwinvoice_report_webkit/report/templates/gbwinvoice_report_webkit.mako 2013-06-04 21:36:25 +0000
@@ -1,16 +1,39 @@
1<html > 1<html >
2<body>2<body>
3<%3<%
4 renglones = 04 renglones = 0
5 total_importe = 05 total_importe = 0
6 total_iva= 06 total_iva= 0
7 total_total= 07 total_total= 0
8 facturas = 08 facturas = 0
9 facturas_reportadas = 09 facturas_reportadas = 0
10 facturas_borrador = 010 facturas_borrador = 0
11 facturas_canceladas = 011 facturas_canceladas = 0
12 setLang(user.context_lang)12 setLang(user.context_lang)
13 encabezado=True
14 try:
15 data['form']
16 except:
17 encabezado=False
18 pass
13%>19%>
20%if encabezado:
21 <table style="align:right;" >
22 <tr>
23 <td style="font-size:small;" colspan=2>${data['form']['report_title'] or ''}</td>
24 </tr>
25 <tr>
26 <td style="font-size:small;" >Del&nbsp;</td><td>${data['form']['from_date'] or '' }</td>
27 <td style="font-size:small;" >&nbsp;al&nbsp;</td><td>${data['form']['to_date'] or '' }</td>
28 </tr>
29 </table>
30%else:
31 <table style="align:right;" >
32 <tr>
33 <td style="font-size:small;" colspan=2>VENTAS FACTURADAS</td>
34 </tr>
35 </table>
36%endif
14<table class="list_table" >37<table class="list_table" >
15<tr>38<tr>
16<td style="border-bottom:2px solid;" >Fecha</td>39<td style="border-bottom:2px solid;" >Fecha</td>
@@ -29,16 +52,16 @@
29<% renglones=0 %>52<% renglones=0 %>
30 %endif 53 %endif
31 <tr>54 <tr>
32<td nowrap >${invo.date_invoice[0:11]} </td>55<td nowrap style="font-size:small;" >${time.strftime('%d-%m-%Y',time.strptime(invo.date_invoice,'%Y-%m-%d %H:%M:%S'))}</td>
33<td nowrap >${invo.partner_id.ref} ${invo.partner_id.name[0:8] }</td>56<td nowrap style="font-size:small;" >${invo.partner_id.ref} ${invo.partner_id.name[0:8] }</td>
34<td>${invo.number or '' }</td>57<td style="font-size:small;" >${invo.number or '' }</td>
35<td>${invo.currency_id.name or '' }</td>58<td style="font-size:small;" >${invo.currency_id.name or '' }</td>
36<td><div style='float: right; text-align: right'>${"{:2.4f}".format(invo.rate)}</div></td>59<td><div style="float: right; text-align: right;font-size:small;">${"{:2.4f}".format(invo.rate)}</div></td>
37%if invo.state == 'cancel' :60%if invo.state == 'cancel':
38<td colspan=3 align=center >C A N C E L A D A</td>61<td colspan=3 align=center style="font-size:small;" >C A N C E L A D A</td>
39<% facturas_canceladas= facturas_canceladas + 1 %>62<% facturas_canceladas= facturas_canceladas + 1 %>
40%elif invo.state == 'draft' :63%elif invo.state == 'draft':
41<td colspan=3 align=center >B O R R A D O R</td>64<td colspan=3 align=center style="font-size:small;">B O R R A D O R</td>
42<% facturas_borrador= facturas_borrador + 1 %>65<% facturas_borrador= facturas_borrador + 1 %>
43 %else :66 %else :
44<% 67<%
@@ -51,9 +74,9 @@
51 iva=iva*invo.rate74 iva=iva*invo.rate
52 total=total*invo.rate75 total=total*invo.rate
53%>76%>
54<td ><div style='float: right; text-align: right'>${formatLang(subtotal) or 0.0}</div></td>77<td ><div style='float: right; text-align: right;font-size:small;'>${company.currency_id.symbol} ${formatLang(subtotal, monetary=True) or 0.0}</div></td>
55<td ><div style='float: right; text-align: right'>${formatLang(iva) or 0.0}</div></td>78<td ><div style='float: right; text-align: right;font-size:small;'>${invo.currency_id.symbol} ${formatLang(iva, monetary=True) or 0.0}</div></td>
56<td ><div style='float: right; text-align: right'>${formatLang(total) or 0.0 }</div></td> 79<td ><div style='float: right; text-align: right;font-size:small;'>${invo.currency_id.symbol} ${formatLang(total, monetary=True) or 0.0 }</div></td>
57<%80<%
58 total_importe = total_importe + subtotal81 total_importe = total_importe + subtotal
59 total_iva= total_iva + iva82 total_iva= total_iva + iva
@@ -70,9 +93,9 @@
70<tr >93<tr >
71<td style="border-top:2px solid;border-bottom:2px solid;" >Total:</td>94<td style="border-top:2px solid;border-bottom:2px solid;" >Total:</td>
72<td colspan=4 style="border-top:2px solid;border-bottom:2px solid;" ></td>95<td colspan=4 style="border-top:2px solid;border-bottom:2px solid;" ></td>
73<td style="border-top:2px solid;border-bottom:2px solid;" ><div style='float: right; text-align: right'>${formatLang(total_importe)}</div></td>96<td nowrap style="border-top:2px solid;border-bottom:2px solid;" ><div style='float: right; text-align: right'>${invo.currency_id.symbol} ${formatLang(total_importe, monetary=True)}</div></td>
74<td style="border-top:2px solid;border-bottom:2px solid;" ><div style='float: right; text-align: right'>${formatLang(total_iva)}</div></td>97<td nowrap style="border-top:2px solid;border-bottom:2px solid;" ><div style='float: right; text-align: right'>${invo.currency_id.symbol} ${formatLang(total_iva, monetary=True)}</div></td>
75<td style="border-top:2px solid;border-bottom:2px solid;" ><div style='float: right; text-align: right'>${formatLang(total_total)}</div></td>98<td nowrap style="border-top:2px solid;border-bottom:2px solid;" ><div style='float: right; text-align: right'>${invo.currency_id.symbol} ${formatLang(total_total, monetary=True)}</div></td>
76</tr>99</tr>
77</table>100</table>
78<br><br>101<br><br>
79102
=== added directory 'gbwinvoice_report_webkit/wizard'
=== added file 'gbwinvoice_report_webkit/wizard/__init__.py'
--- gbwinvoice_report_webkit/wizard/__init__.py 1970-01-01 00:00:00 +0000
+++ gbwinvoice_report_webkit/wizard/__init__.py 2013-06-04 21:36:25 +0000
@@ -0,0 +1,2 @@
1import gbwinvoice_report_webkit_wizard
2import gbwcategory_report_webkit_wizard
03
=== added file 'gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard.py'
--- gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard.py 1970-01-01 00:00:00 +0000
+++ gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard.py 2013-06-04 21:36:25 +0000
@@ -0,0 +1,65 @@
1# -*- coding: utf-8 -*-
2from osv import osv,fields
3from tools.translate import _
4import time
5from datetime import datetime
6
7class gbwcategory_report_webkit_wizard(osv.osv_memory):
8 _name = "gbwcategory.webkitwizard"
9 _description = "GBW Invoices by Category"
10
11 _columns = {
12 'from_date':fields.datetime('From'),
13 'to_date':fields.datetime('To'),
14 'report_title':fields.char('Report Title', size=128, required=False),
15 'detail_report': fields.boolean('Show Products Detail', help="Show products detail by category."),
16 'state': fields.selection([('choose','choose'),
17 ('get','get'),
18 ]),
19 }
20
21 def create_report(self, cr, uid, ids, context={}):
22 data = self.read(cr,uid,ids,)[-1]
23 invoice = self.pool.get('account.invoice')
24 invoice_ids = invoice.search(cr, uid, [('date_invoice', '>', data['from_date']),('date_invoice', '<', data['to_date']),('state','!=','cancel'),('state','!=','draft')], context=context)
25
26 invoice_line = self.pool.get('account.invoice.line')
27 invoice_line_ids = invoice_line.search(cr, uid, [('invoice_id', 'in', invoice_ids)], order='product_id ASC',context=context)
28 if data['detail_report']==True:
29 data['report_title']='VENTAS FACTURADAS POR CATEGORIA DETALLE DE PRODUCTOS'
30 res={
31 'type' : 'ir.actions.report.xml',
32 'report_name' : 'gbwcategorydetail.report.webkit',
33 'datas': {
34 'model':'account.invoice.line',
35 'id': context.get('active_ids') and context.get('active_ids')[0] or False,
36 'ids': invoice_line_ids and invoice_line_ids or [],
37 'report_type': 'webkit',
38 'form': data
39 },
40 'nodestroy': False
41 }
42 else:
43 res={
44 'type' : 'ir.actions.report.xml',
45 'report_name' : 'gbwcategory.report.webkit',
46 'datas': {
47 'model':'account.invoice.line',
48 'id': context.get('active_ids') and context.get('active_ids')[0] or False,
49 'ids': invoice_line_ids and invoice_line_ids or [],
50 'report_type': 'webkit',
51 'form': data
52 },
53 'nodestroy': False
54 }
55 print data,' create_report('
56
57 return res
58
59 _defaults = {
60 'detail_report': False,
61 'report_title': lambda *a: 'VENTAS FACTURADAS POR CATEGORIA',
62 'report_type': lambda *a: 'webkit',
63 'state': lambda *a: 'choose',
64 }
65gbwcategory_report_webkit_wizard()
066
=== added file 'gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard_view.xml'
--- gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard_view.xml 1970-01-01 00:00:00 +0000
+++ gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard_view.xml 2013-06-04 21:36:25 +0000
@@ -0,0 +1,46 @@
1<?xml version="1.0"?>
2<openerp>
3 <data >
4<!--====================Defining the wizard View==================-->
5
6 <record id='gbwcategory_report_webkit_wizardform' model="ir.ui.view">
7 <field name="name">GBW Invoices by Category</field>
8 <field name="model">gbwcategory.webkitwizard</field>
9 <field name="type">form</field>
10 <field name="arch" type="xml">
11 <form string="Invoices" >
12 <group col="2" fill="0" height="500" states="choose">
13 <separator string="Filter" colspan="4"/>
14 <field name="from_date" required='1'/>
15 <field name="to_date" required='1' />
16 <field name="detail_report" />
17 <field name="report_title" invisible="1" />
18 <separator colspan="2"/>
19 <group colspan="2">
20 <button special="cancel" icon="gtk-cancel" string="Cancel"/>
21 <button type="object" name="create_report" icon="gtk-go-forward" string="Create"/>
22 </group>
23 <field invisible="1" name="state"/>
24 </group>
25 </form>
26 </field>
27 </record>
28
29 <record model="ir.actions.act_window" id="action_gbwcategory_report_webkit">
30 <field name="name">GBW Invoice Report by Category</field>
31 <field name="res_model">gbwcategory.webkitwizard</field>
32 <field name="view_type">form</field>
33 <field name="view_mode">form</field>
34 <field name="target">new</field>
35 </record>
36<!--====================Specifying the report menu ========================-->
37
38 <menuitem id="gbwcategory_report_webkit" name="GBW Invoices by Category"
39 action="action_gbwcategory_report_webkit"
40 parent="account.menu_finance_statistic_report_statement"
41 sequence="25"
42 />
43
44 </data>
45</openerp>
46
047
=== added file 'gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.py'
--- gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.py 1970-01-01 00:00:00 +0000
+++ gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.py 2013-06-04 21:36:25 +0000
@@ -0,0 +1,45 @@
1# -*- coding: utf-8 -*-
2from osv import osv,fields
3from tools.translate import _
4import time
5from datetime import datetime
6
7class gbwinvoice_report_webkit_wizard(osv.osv_memory):
8 _name = "gbwinvoice.webkitwizard"
9 _description = "GBW Invoices by Period"
10
11 _columns = {
12 'from_date':fields.datetime('From'),
13 'to_date':fields.datetime('To'),
14 'report_title':fields.char('Report Title', size=128, required=False),
15 'state': fields.selection([('choose','choose'),
16 ('get','get'),
17 ]),
18
19 }
20
21 def create_report(self, cr, uid, ids, context={}):
22 data = self.read(cr,uid,ids,)[-1]
23 invoice = self.pool.get('account.invoice')
24 invoice_ids = invoice.search(cr, uid, [('date_invoice', '>', data['from_date']),('date_invoice', '<', data['to_date'])], order='number ASC, date_invoice ASC',context=context)
25 print data,' create_report('
26
27 return {
28 'type' : 'ir.actions.report.xml',
29 'report_name' : 'gbwinvoice.report.webkit',
30 'datas': {
31 'model':'account.invoice',
32 'id': context.get('active_ids') and context.get('active_ids')[0] or False,
33 'ids': invoice_ids and invoice_ids or [],
34 'report_type': 'webkit',
35 'form': data
36 },
37 'nodestroy': False
38 }
39
40 _defaults = {
41 'report_title': lambda *a: 'VENTAS FACTURADAS',
42 'report_type': lambda *a: 'webkit',
43 'state': lambda *a: 'choose',
44 }
45gbwinvoice_report_webkit_wizard()
046
=== added file 'gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.xml'
--- gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.xml 1970-01-01 00:00:00 +0000
+++ gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.xml 2013-06-04 21:36:25 +0000
@@ -0,0 +1,9 @@
1<?xml version="1.0"?>
2<openerp>
3 <data>
4 <wizard string="Print GBW Invoices by Period" model="account.invoice"
5 name="account.gbwinvoiceswiz" />
6 <wizard string="Print GBW Invoices by Product Categories" model="account.invoice.line"
7 name="account.gbwinvoiceswiz" />
8 </data>
9</openerp>
010
=== added file 'gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard_view.xml'
--- gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard_view.xml 1970-01-01 00:00:00 +0000
+++ gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard_view.xml 2013-06-04 21:36:25 +0000
@@ -0,0 +1,45 @@
1<?xml version="1.0"?>
2<openerp>
3 <data >
4<!--====================Defining the wizard View==================-->
5
6 <record id='gbwinvoice_report_webkit_wizardform' model="ir.ui.view">
7 <field name="name">GBW Invoice Report by Period</field>
8 <field name="model">gbwinvoice.webkitwizard</field>
9 <field name="type">form</field>
10 <field name="arch" type="xml">
11 <form string="Invoices" >
12 <group col="2" fill="0" height="500" states="choose">
13 <separator string="Filter" colspan="4"/>
14 <field name="from_date" required='1'/>
15 <field name="to_date" required='1' />
16 <field name="report_title" invisible="1" />
17 <separator colspan="2"/>
18 <group colspan="2">
19 <button special="cancel" icon="gtk-cancel" string="Cancel"/>
20 <button type="object" name="create_report" icon="gtk-go-forward" string="Create"/>
21 </group>
22 <field invisible="1" name="state"/>
23 </group>
24 </form>
25 </field>
26 </record>
27
28 <record model="ir.actions.act_window" id="action_gbwinvoice_report_webkit">
29 <field name="name">GBW Invoice Report by Period</field>
30 <field name="res_model">gbwinvoice.webkitwizard</field>
31 <field name="view_type">form</field>
32 <field name="view_mode">form</field>
33 <field name="target">new</field>
34 </record>
35<!--====================Specifying the report menu ========================-->
36
37 <menuitem id="gbwinvoice_report_webkit" name="GBW Invoice Report by Period"
38 action="action_gbwinvoice_report_webkit"
39 parent="account.menu_finance_statistic_report_statement"
40 sequence="24"
41 />
42
43 </data>
44</openerp>
45

Subscribers

People subscribed via source and target branches