Merge lp:~carlos-realsystems/openerp-vauxoo-gbw/6.0 into lp:openerp-vauxoo-gbw/6.0
- 6.0
- Merge into openerp-vauxoo-gbw
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Moisés López - http://www.vauxoo.com | Pending | ||
Review via email: mp+167412@code.launchpad.net |
Commit message
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
1 | === modified file 'gbwinvoice_report_webkit/__init__.py' | |||
2 | --- gbwinvoice_report_webkit/__init__.py 2013-05-27 18:43:36 +0000 | |||
3 | +++ gbwinvoice_report_webkit/__init__.py 2013-06-04 21:36:25 +0000 | |||
4 | @@ -28,5 +28,6 @@ | |||
5 | 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. |
6 | 29 | # | 29 | # |
7 | 30 | ############################################################################## | 30 | ############################################################################## |
8 | 31 | import report | ||
9 | 31 | import wizard | 32 | import wizard |
10 | 32 | import report | ||
11 | 33 | \ No newline at end of file | 33 | \ No newline at end of file |
12 | 34 | import gbwcategory_report | ||
13 | 34 | 35 | ||
14 | === modified file 'gbwinvoice_report_webkit/__openerp__.py' | |||
15 | --- gbwinvoice_report_webkit/__openerp__.py 2013-05-27 18:43:36 +0000 | |||
16 | +++ gbwinvoice_report_webkit/__openerp__.py 2013-06-04 21:36:25 +0000 | |||
17 | @@ -33,22 +33,30 @@ | |||
18 | 33 | "description" : """ Invoce Report for GBW | 33 | "description" : """ Invoce Report for GBW |
19 | 34 | This module adds the follow reports : | 34 | This module adds the follow reports : |
20 | 35 | - Invoices by period | 35 | - Invoices by period |
21 | 36 | - Invoices by product category | ||
22 | 37 | - Invoices by product category with detail | ||
23 | 36 | 38 | ||
24 | 37 | Goals: | 39 | Goals: |
25 | 38 | 40 | ||
32 | 39 | * Give to GBW invoice report like actual GBW System: ADMIN | 41 | * Show GBW invoice report and invoice report by category like actual GBW System: ADMIN |
33 | 40 | 42 | ||
34 | 41 | TODO: | 43 | Instalation: |
35 | 42 | - Filter by period in the wizard (no need to go to the Invoices anymore) or by view | 44 | Once upon installed go to: |
36 | 43 | - improved report style | 45 | Administration->Customization->Low level objects->Actions->Reports |
37 | 44 | 46 | ||
38 | 47 | Change header of: | ||
39 | 48 | GBW Category Detail Invoice Report | ||
40 | 49 | GBW Category Invoice Report | ||
41 | 50 | GBW Invoice Report | ||
42 | 51 | to: | ||
43 | 52 | GBW Invoice NO Header | ||
44 | 53 | |||
45 | 45 | Limitations: | 54 | Limitations: |
46 | 46 | In 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). | 55 | In 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). |
47 | 47 | 56 | ||
48 | 48 | html headers and footers are deactivated for these reports because of an issue of wkhtmltopdf : http://code.google.com/p/wkhtmltopdf/issues/detail?id=656 | 57 | html headers and footers are deactivated for these reports because of an issue of wkhtmltopdf : http://code.google.com/p/wkhtmltopdf/issues/detail?id=656 |
49 | 49 | Instead, the header and footer are created as text with arguments passed to wkhtmltopdf. The texts are defined inside the report classes. | 58 | Instead, the header and footer are created as text with arguments passed to wkhtmltopdf. The texts are defined inside the report classes. |
52 | 50 | 59 | ||
51 | 51 | You have to create the print buttons by calling the wizard. | ||
53 | 52 | """, | 60 | """, |
54 | 53 | "version" : "0.1", | 61 | "version" : "0.1", |
55 | 54 | "depends" : ["base", "account", "report_webkit"], | 62 | "depends" : ["base", "account", "report_webkit"], |
56 | @@ -56,8 +64,10 @@ | |||
57 | 56 | "author" : "Real Systems", | 64 | "author" : "Real Systems", |
58 | 57 | "url": "http://www.realsystems.com.mx/", | 65 | "url": "http://www.realsystems.com.mx/", |
59 | 58 | "data": ["gbwinvoice_report_webkit_view.xml", | 66 | "data": ["gbwinvoice_report_webkit_view.xml", |
61 | 59 | "data.xml", | 67 | "data.xml", |
62 | 60 | ], | 68 | ], |
63 | 69 | "init_xml" : ['wizard/gbwinvoice_report_webkit_wizard_view.xml', | ||
64 | 70 | 'wizard/gbwcategory_report_webkit_wizard_view.xml'], | ||
65 | 61 | "installable" : True, | 71 | "installable" : True, |
66 | 62 | "active" : False, | 72 | "active" : False, |
67 | 63 | "certificate" : "", | 73 | "certificate" : "", |
68 | 64 | 74 | ||
69 | === modified file 'gbwinvoice_report_webkit/data.xml' | |||
70 | --- gbwinvoice_report_webkit/data.xml 2013-05-27 18:43:36 +0000 | |||
71 | +++ gbwinvoice_report_webkit/data.xml 2013-06-04 21:36:25 +0000 | |||
72 | @@ -1,6 +1,9 @@ | |||
73 | 1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
74 | 2 | <openerp> | 2 | <openerp> |
75 | 3 | <data noupdate="1"> | 3 | <data noupdate="1"> |
76 | 4 | |||
77 | 5 | <!-- Normal GBW Header !--> | ||
78 | 6 | |||
79 | 4 | <record id="ir_header_gbw" model="ir.header_webkit"> | 7 | <record id="ir_header_gbw" model="ir.header_webkit"> |
80 | 5 | <field name="footer_html"><![CDATA[<html> | 8 | <field name="footer_html"><![CDATA[<html> |
81 | 6 | <head> | 9 | <head> |
82 | @@ -161,7 +164,153 @@ | |||
83 | 161 | .tax { | 164 | .tax { |
84 | 162 | width:50%; | 165 | width:50%; |
85 | 163 | }]]> </field> | 166 | }]]> </field> |
87 | 164 | <field eval=""""GBW Invoice Header"""" name="name"/> | 167 | <field eval=""""GBW Normal Header"""" name="name"/> |
88 | 168 | </record> | ||
89 | 169 | |||
90 | 170 | <!-- GBW Header without company data !--> | ||
91 | 171 | |||
92 | 172 | <record id="ir_noheader_gbw" model="ir.header_webkit"> | ||
93 | 173 | <field name="footer_html"><![CDATA[<html> | ||
94 | 174 | <head> | ||
95 | 175 | <meta content="text/html; charset=UTF-8" http-equiv="content-type"/> | ||
96 | 176 | <script> | ||
97 | 177 | function subst() { | ||
98 | 178 | var vars={}; | ||
99 | 179 | var x=document.location.search.substring(1).split('&'); | ||
100 | 180 | for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);} | ||
101 | 181 | var x=['frompage','topage','page','webpage','section','subsection','subsubsection']; | ||
102 | 182 | for(var i in x) { | ||
103 | 183 | var y = document.getElementsByClassName(x[i]); | ||
104 | 184 | for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]]; | ||
105 | 185 | } | ||
106 | 186 | } | ||
107 | 187 | </script> | ||
108 | 188 | </head> | ||
109 | 189 | <body style="border:0; margin: 0;" onload="subst()"> | ||
110 | 190 | <table style="border-top: 1px solid black; width: 100%"> | ||
111 | 191 | <tr > | ||
112 | 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> | ||
113 | 193 | </tr> | ||
114 | 194 | </table> | ||
115 | 195 | </body> | ||
116 | 196 | </html>]]></field> | ||
117 | 197 | <field eval=""""Portrait"""" name="orientation"/> | ||
118 | 198 | <field eval=""""A4"""" name="format"/> | ||
119 | 199 | <field name="html"><![CDATA[<html> | ||
120 | 200 | <head> | ||
121 | 201 | <meta content="text/html; charset=UTF-8" http-equiv="content-type"/> | ||
122 | 202 | <script> | ||
123 | 203 | function subst() { | ||
124 | 204 | var vars={}; | ||
125 | 205 | var x=document.location.search.substring(1).split('&'); | ||
126 | 206 | for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);} | ||
127 | 207 | var x=['frompage','topage','page','webpage','section','subsection','subsubsection']; | ||
128 | 208 | for(var i in x) { | ||
129 | 209 | var y = document.getElementsByClassName(x[i]); | ||
130 | 210 | for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]]; | ||
131 | 211 | } | ||
132 | 212 | } | ||
133 | 213 | </script> | ||
134 | 214 | <style type="text/css"> | ||
135 | 215 | ${css} | ||
136 | 216 | </style> | ||
137 | 217 | </head> | ||
138 | 218 | <body style="border:0; margin: 0;" onload="subst()"> | ||
139 | 219 | <% setLang(user.context_lang) %> | ||
140 | 220 | <table class="header" style="border-bottom: 0px solid black; width: 100%"> | ||
141 | 221 | <tr> | ||
142 | 222 | <td> </td> | ||
143 | 223 | <td style="text-align:right">Fecha: ${ formatLang(time.strftime("%Y-%m-%d"), date=True) }<br>IMPRIMIÓ: ${user.name}</td> | ||
144 | 224 | </tr> | ||
145 | 225 | </table> ${_debug or ''|n} </body> | ||
146 | 226 | </html>]]> | ||
147 | 227 | </field> | ||
148 | 228 | <field eval="55.0" name="margin_top"/> | ||
149 | 229 | <field name="css" ><![CDATA[ | ||
150 | 230 | body { | ||
151 | 231 | font-family:helvetica; | ||
152 | 232 | font-size:12; | ||
153 | 233 | } | ||
154 | 234 | |||
155 | 235 | |||
156 | 236 | .dest_address { | ||
157 | 237 | margin-left:60%; | ||
158 | 238 | font-size:12; | ||
159 | 239 | } | ||
160 | 240 | .header { | ||
161 | 241 | margin-left:0; | ||
162 | 242 | text-align:left; | ||
163 | 243 | width:300px; | ||
164 | 244 | font-size:12; | ||
165 | 245 | } | ||
166 | 246 | |||
167 | 247 | .title { | ||
168 | 248 | font-size:16; | ||
169 | 249 | font-weight: bold; | ||
170 | 250 | |||
171 | 251 | } | ||
172 | 252 | |||
173 | 253 | |||
174 | 254 | .basic_table{ | ||
175 | 255 | text-align:center; | ||
176 | 256 | border:1px solid lightGrey; | ||
177 | 257 | border-collapse: collapse; | ||
178 | 258 | } | ||
179 | 259 | .basic_table td { | ||
180 | 260 | border:1px solid lightGrey; | ||
181 | 261 | font-size:12; | ||
182 | 262 | |||
183 | 263 | |||
184 | 264 | } | ||
185 | 265 | |||
186 | 266 | .list_table { | ||
187 | 267 | border-color:black; | ||
188 | 268 | text-align:center; | ||
189 | 269 | border-collapse: collapse; | ||
190 | 270 | |||
191 | 271 | } | ||
192 | 272 | .list_table td { | ||
193 | 273 | border-color:gray; | ||
194 | 274 | border-top:1px solid gray; | ||
195 | 275 | text-align:left; | ||
196 | 276 | font-size:12; | ||
197 | 277 | padding-right:3px | ||
198 | 278 | padding-left:3px | ||
199 | 279 | padding-top:3px | ||
200 | 280 | padding-bottom:3px | ||
201 | 281 | } | ||
202 | 282 | |||
203 | 283 | .list_table th { | ||
204 | 284 | border-bottom:2px solid black; | ||
205 | 285 | text-align:left; | ||
206 | 286 | font-size:12; | ||
207 | 287 | font-weight:bold; | ||
208 | 288 | padding-right:3px | ||
209 | 289 | padding-left:3px | ||
210 | 290 | } | ||
211 | 291 | |||
212 | 292 | .list_tabe thead { | ||
213 | 293 | display:table-header-group; | ||
214 | 294 | } | ||
215 | 295 | |||
216 | 296 | |||
217 | 297 | .total { | ||
218 | 298 | width:100%; | ||
219 | 299 | } | ||
220 | 300 | .lib { | ||
221 | 301 | width:10.3%; | ||
222 | 302 | } | ||
223 | 303 | .tot { | ||
224 | 304 | text-align:right; | ||
225 | 305 | width:15%; | ||
226 | 306 | } | ||
227 | 307 | .lefttot { | ||
228 | 308 | width:74%; | ||
229 | 309 | } | ||
230 | 310 | .tax { | ||
231 | 311 | width:50%; | ||
232 | 312 | }]]> </field> | ||
233 | 313 | <field eval=""""GBW Invoice NO Header"""" name="name"/> | ||
234 | 165 | </record> | 314 | </record> |
235 | 166 | 315 | ||
236 | 167 | <record id="ir_header_img_gbw" model="ir.header_img"> | 316 | <record id="ir_header_img_gbw" model="ir.header_img"> |
237 | 168 | 317 | ||
238 | === added file 'gbwinvoice_report_webkit/gbwcategory_report.py' | |||
239 | --- gbwinvoice_report_webkit/gbwcategory_report.py 1970-01-01 00:00:00 +0000 | |||
240 | +++ gbwinvoice_report_webkit/gbwcategory_report.py 2013-06-04 21:36:25 +0000 | |||
241 | @@ -0,0 +1,4 @@ | |||
242 | 1 | from osv import osv,fields | ||
243 | 2 | from tools.translate import _ | ||
244 | 3 | import time | ||
245 | 4 | from datetime import datetime | ||
246 | 0 | 5 | ||
247 | === modified file 'gbwinvoice_report_webkit/gbwinvoice_report_webkit_view.xml' | |||
248 | --- gbwinvoice_report_webkit/gbwinvoice_report_webkit_view.xml 2013-05-28 18:55:31 +0000 | |||
249 | +++ gbwinvoice_report_webkit/gbwinvoice_report_webkit_view.xml 2013-06-04 21:36:25 +0000 | |||
250 | @@ -5,9 +5,28 @@ | |||
251 | 5 | id="gbwinvoice_report_webkit" | 5 | id="gbwinvoice_report_webkit" |
252 | 6 | model="account.invoice" | 6 | model="account.invoice" |
253 | 7 | name="gbwinvoice.report.webkit" | 7 | name="gbwinvoice.report.webkit" |
255 | 8 | file="gbwinvoice_report_webkit/report/invoice_gbw_report.mako" | 8 | file="gbwinvoice_report_webkit/report/templates/gbwinvoice_report_webkit.mako" |
256 | 9 | string="GBW Invoice Report" | 9 | string="GBW Invoice Report" |
257 | 10 | report_type="webkit" | 10 | report_type="webkit" |
258 | 11 | /> | 11 | /> |
259 | 12 | |||
260 | 13 | <report auto="False" | ||
261 | 14 | id="gbwcategory_report_webkit" | ||
262 | 15 | model="account.invoice.line" | ||
263 | 16 | name="gbwcategory.report.webkit" | ||
264 | 17 | file="gbwinvoice_report_webkit/report/templates/gbwcategory_report_webkit.mako" | ||
265 | 18 | string="GBW Category Invoice Report" | ||
266 | 19 | report_type="webkit" | ||
267 | 20 | /> | ||
268 | 21 | |||
269 | 22 | <report auto="False" | ||
270 | 23 | id="gbwcategorydetail_report_webkit" | ||
271 | 24 | model="account.invoice.line" | ||
272 | 25 | name="gbwcategorydetail.report.webkit" | ||
273 | 26 | file="gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako" | ||
274 | 27 | string="GBW Category Detail Invoice Report" | ||
275 | 28 | report_type="webkit" | ||
276 | 29 | /> | ||
277 | 30 | |||
278 | 12 | </data> | 31 | </data> |
279 | 13 | </openerp> | 32 | </openerp> |
280 | 14 | 33 | ||
281 | === modified file 'gbwinvoice_report_webkit/i18n/en_US.po' | |||
282 | --- gbwinvoice_report_webkit/i18n/en_US.po 2013-05-27 18:43:36 +0000 | |||
283 | +++ gbwinvoice_report_webkit/i18n/en_US.po 2013-06-04 21:36:25 +0000 | |||
284 | @@ -6,8 +6,8 @@ | |||
285 | 6 | msgstr "" | 6 | msgstr "" |
286 | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" |
287 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
290 | 9 | "POT-Creation-Date: 2013-05-27 17:04+0000\n" | 9 | "POT-Creation-Date: 2013-06-04 17:52+0000\n" |
291 | 10 | "PO-Revision-Date: 2013-05-27 17:04+0000\n" | 10 | "PO-Revision-Date: 2013-06-04 17:52+0000\n" |
292 | 11 | "Last-Translator: <>\n" | 11 | "Last-Translator: <>\n" |
293 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
294 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
295 | @@ -16,7 +16,107 @@ | |||
296 | 16 | "Plural-Forms: \n" | 16 | "Plural-Forms: \n" |
297 | 17 | 17 | ||
298 | 18 | #. module: gbwinvoice_report_webkit | 18 | #. module: gbwinvoice_report_webkit |
299 | 19 | #: field:gbwcategory.webkitwizard,state:0 | ||
300 | 20 | #: field:gbwinvoice.webkitwizard,state:0 | ||
301 | 21 | msgid "unknown" | ||
302 | 22 | msgstr "unknown" | ||
303 | 23 | |||
304 | 24 | #. module: gbwinvoice_report_webkit | ||
305 | 25 | #: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwcategory_report_webkit | ||
306 | 26 | msgid "GBW Category Invoice Report" | ||
307 | 27 | msgstr "GBW Category Invoice Report" | ||
308 | 28 | |||
309 | 29 | #. module: gbwinvoice_report_webkit | ||
310 | 30 | #: field:gbwcategory.webkitwizard,from_date:0 | ||
311 | 31 | #: field:gbwinvoice.webkitwizard,from_date:0 | ||
312 | 32 | msgid "From" | ||
313 | 33 | msgstr "From" | ||
314 | 34 | |||
315 | 35 | #. module: gbwinvoice_report_webkit | ||
316 | 36 | #: field:gbwcategory.webkitwizard,report_title:0 | ||
317 | 37 | #: field:gbwinvoice.webkitwizard,report_title:0 | ||
318 | 38 | msgid "Report Title" | ||
319 | 39 | msgstr "Report Title" | ||
320 | 40 | |||
321 | 41 | #. module: gbwinvoice_report_webkit | ||
322 | 42 | #: model:ir.model,name:gbwinvoice_report_webkit.model_gbwcategory_webkitwizard | ||
323 | 43 | msgid "GBW Invoices by Category" | ||
324 | 44 | msgstr "GBW Invoices by Category" | ||
325 | 45 | |||
326 | 46 | #. module: gbwinvoice_report_webkit | ||
327 | 47 | #: view:gbwcategory.webkitwizard:0 | ||
328 | 48 | #: view:gbwinvoice.webkitwizard:0 | ||
329 | 49 | msgid "Invoices" | ||
330 | 50 | msgstr "Invoices" | ||
331 | 51 | |||
332 | 52 | #. module: gbwinvoice_report_webkit | ||
333 | 53 | #: help:gbwcategory.webkitwizard,detail_report:0 | ||
334 | 54 | msgid "Show products detail by category." | ||
335 | 55 | msgstr "Show products detail by category." | ||
336 | 56 | |||
337 | 57 | #. module: gbwinvoice_report_webkit | ||
338 | 58 | #: view:gbwcategory.webkitwizard:0 | ||
339 | 59 | #: view:gbwinvoice.webkitwizard:0 | ||
340 | 60 | msgid "Create" | ||
341 | 61 | msgstr "Create" | ||
342 | 62 | |||
343 | 63 | #. module: gbwinvoice_report_webkit | ||
344 | 64 | #: selection:gbwcategory.webkitwizard,state:0 | ||
345 | 65 | #: selection:gbwinvoice.webkitwizard,state:0 | ||
346 | 66 | msgid "get" | ||
347 | 67 | msgstr "get" | ||
348 | 68 | |||
349 | 69 | #. module: gbwinvoice_report_webkit | ||
350 | 70 | #: field:gbwcategory.webkitwizard,detail_report:0 | ||
351 | 71 | msgid "Show Products Detail" | ||
352 | 72 | msgstr "Show Products Detail" | ||
353 | 73 | |||
354 | 74 | #. module: gbwinvoice_report_webkit | ||
355 | 19 | #: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwinvoice_report_webkit | 75 | #: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwinvoice_report_webkit |
356 | 20 | msgid "GBW Invoice Report" | 76 | msgid "GBW Invoice Report" |
357 | 21 | msgstr "GBW Invoice Report" | 77 | msgstr "GBW Invoice Report" |
358 | 22 | 78 | ||
359 | 79 | #. module: gbwinvoice_report_webkit | ||
360 | 80 | #: view:gbwcategory.webkitwizard:0 | ||
361 | 81 | #: view:gbwinvoice.webkitwizard:0 | ||
362 | 82 | msgid "Filter" | ||
363 | 83 | msgstr "Filter" | ||
364 | 84 | |||
365 | 85 | #. module: gbwinvoice_report_webkit | ||
366 | 86 | #: field:gbwcategory.webkitwizard,to_date:0 | ||
367 | 87 | #: field:gbwinvoice.webkitwizard,to_date:0 | ||
368 | 88 | msgid "To" | ||
369 | 89 | msgstr "To" | ||
370 | 90 | |||
371 | 91 | #. module: gbwinvoice_report_webkit | ||
372 | 92 | #: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwcategorydetail_report_webkit | ||
373 | 93 | msgid "GBW Category Detail Invoice Report" | ||
374 | 94 | msgstr "GBW Category Detail Invoice Report" | ||
375 | 95 | |||
376 | 96 | #. module: gbwinvoice_report_webkit | ||
377 | 97 | #: selection:gbwcategory.webkitwizard,state:0 | ||
378 | 98 | #: selection:gbwinvoice.webkitwizard,state:0 | ||
379 | 99 | msgid "choose" | ||
380 | 100 | msgstr "choose" | ||
381 | 101 | |||
382 | 102 | #. module: gbwinvoice_report_webkit | ||
383 | 103 | #: model:ir.actions.act_window,name:gbwinvoice_report_webkit.action_gbwinvoice_report_webkit | ||
384 | 104 | msgid "GBW Invoice Report by Period" | ||
385 | 105 | msgstr "GBW Invoice Report by Period" | ||
386 | 106 | |||
387 | 107 | #. module: gbwinvoice_report_webkit | ||
388 | 108 | #: view:gbwcategory.webkitwizard:0 | ||
389 | 109 | #: view:gbwinvoice.webkitwizard:0 | ||
390 | 110 | msgid "Cancel" | ||
391 | 111 | msgstr "Cancel" | ||
392 | 112 | |||
393 | 113 | #. module: gbwinvoice_report_webkit | ||
394 | 114 | #: model:ir.actions.act_window,name:gbwinvoice_report_webkit.action_gbwcategory_report_webkit | ||
395 | 115 | msgid "GBW Invoice Report by Category" | ||
396 | 116 | msgstr "GBW Invoice Report by Category" | ||
397 | 117 | |||
398 | 118 | #. module: gbwinvoice_report_webkit | ||
399 | 119 | #: model:ir.model,name:gbwinvoice_report_webkit.model_gbwinvoice_webkitwizard | ||
400 | 120 | msgid "GBW Invoices by Period" | ||
401 | 121 | msgstr "GBW Invoices by Period" | ||
402 | 122 | |||
403 | 23 | 123 | ||
404 | === modified file 'gbwinvoice_report_webkit/i18n/es_MX.mo' | |||
405 | 24 | Binary 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 | 124 | Binary 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 |
406 | === modified file 'gbwinvoice_report_webkit/i18n/es_MX.po' | |||
407 | --- gbwinvoice_report_webkit/i18n/es_MX.po 2013-05-27 18:43:36 +0000 | |||
408 | +++ gbwinvoice_report_webkit/i18n/es_MX.po 2013-06-04 21:36:25 +0000 | |||
409 | @@ -6,8 +6,8 @@ | |||
410 | 6 | msgstr "" | 6 | msgstr "" |
411 | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" |
412 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
415 | 9 | "POT-Creation-Date: 2013-05-27 17:05+0000\n" | 9 | "POT-Creation-Date: 2013-06-04 17:52+0000\n" |
416 | 10 | "PO-Revision-Date: 2013-05-27 12:46-0600\n" | 10 | "PO-Revision-Date: 2013-06-04 13:03-0600\n" |
417 | 11 | "Last-Translator: Carlos Enrique Contreras Vara <carlosecv@realsystems.com.mx>\n" | 11 | "Last-Translator: Carlos Enrique Contreras Vara <carlosecv@realsystems.com.mx>\n" |
418 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
419 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
420 | @@ -16,7 +16,107 @@ | |||
421 | 16 | "Plural-Forms: \n" | 16 | "Plural-Forms: \n" |
422 | 17 | 17 | ||
423 | 18 | #. module: gbwinvoice_report_webkit | 18 | #. module: gbwinvoice_report_webkit |
424 | 19 | #: field:gbwcategory.webkitwizard,state:0 | ||
425 | 20 | #: field:gbwinvoice.webkitwizard,state:0 | ||
426 | 21 | msgid "unknown" | ||
427 | 22 | msgstr "desconocido" | ||
428 | 23 | |||
429 | 24 | #. module: gbwinvoice_report_webkit | ||
430 | 25 | #: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwcategory_report_webkit | ||
431 | 26 | msgid "GBW Category Invoice Report" | ||
432 | 27 | msgstr "Reporte por Categorías GBW" | ||
433 | 28 | |||
434 | 29 | #. module: gbwinvoice_report_webkit | ||
435 | 30 | #: field:gbwcategory.webkitwizard,from_date:0 | ||
436 | 31 | #: field:gbwinvoice.webkitwizard,from_date:0 | ||
437 | 32 | msgid "From" | ||
438 | 33 | msgstr "Desde" | ||
439 | 34 | |||
440 | 35 | #. module: gbwinvoice_report_webkit | ||
441 | 36 | #: field:gbwcategory.webkitwizard,report_title:0 | ||
442 | 37 | #: field:gbwinvoice.webkitwizard,report_title:0 | ||
443 | 38 | msgid "Report Title" | ||
444 | 39 | msgstr "Título del Reporte" | ||
445 | 40 | |||
446 | 41 | #. module: gbwinvoice_report_webkit | ||
447 | 42 | #: model:ir.model,name:gbwinvoice_report_webkit.model_gbwcategory_webkitwizard | ||
448 | 43 | msgid "GBW Invoices by Category" | ||
449 | 44 | msgstr "Facturas por Categorías GBW" | ||
450 | 45 | |||
451 | 46 | #. module: gbwinvoice_report_webkit | ||
452 | 47 | #: view:gbwcategory.webkitwizard:0 | ||
453 | 48 | #: view:gbwinvoice.webkitwizard:0 | ||
454 | 49 | msgid "Invoices" | ||
455 | 50 | msgstr "Facturas" | ||
456 | 51 | |||
457 | 52 | #. module: gbwinvoice_report_webkit | ||
458 | 53 | #: help:gbwcategory.webkitwizard,detail_report:0 | ||
459 | 54 | msgid "Show products detail by category." | ||
460 | 55 | msgstr "Muestra el detalle de los productos por categoría." | ||
461 | 56 | |||
462 | 57 | #. module: gbwinvoice_report_webkit | ||
463 | 58 | #: view:gbwcategory.webkitwizard:0 | ||
464 | 59 | #: view:gbwinvoice.webkitwizard:0 | ||
465 | 60 | msgid "Create" | ||
466 | 61 | msgstr "Crear" | ||
467 | 62 | |||
468 | 63 | #. module: gbwinvoice_report_webkit | ||
469 | 64 | #: selection:gbwcategory.webkitwizard,state:0 | ||
470 | 65 | #: selection:gbwinvoice.webkitwizard,state:0 | ||
471 | 66 | msgid "get" | ||
472 | 67 | msgstr "get" | ||
473 | 68 | |||
474 | 69 | #. module: gbwinvoice_report_webkit | ||
475 | 70 | #: field:gbwcategory.webkitwizard,detail_report:0 | ||
476 | 71 | msgid "Show Products Detail" | ||
477 | 72 | msgstr "Muestra el detalle de Productos" | ||
478 | 73 | |||
479 | 74 | #. module: gbwinvoice_report_webkit | ||
480 | 19 | #: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwinvoice_report_webkit | 75 | #: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwinvoice_report_webkit |
481 | 20 | msgid "GBW Invoice Report" | 76 | msgid "GBW Invoice Report" |
482 | 21 | msgstr "Reporte de Facturas GBW " | 77 | msgstr "Reporte de Facturas GBW " |
483 | 22 | 78 | ||
484 | 79 | #. module: gbwinvoice_report_webkit | ||
485 | 80 | #: view:gbwcategory.webkitwizard:0 | ||
486 | 81 | #: view:gbwinvoice.webkitwizard:0 | ||
487 | 82 | msgid "Filter" | ||
488 | 83 | msgstr "Filtro" | ||
489 | 84 | |||
490 | 85 | #. module: gbwinvoice_report_webkit | ||
491 | 86 | #: field:gbwcategory.webkitwizard,to_date:0 | ||
492 | 87 | #: field:gbwinvoice.webkitwizard,to_date:0 | ||
493 | 88 | msgid "To" | ||
494 | 89 | msgstr "Hasta" | ||
495 | 90 | |||
496 | 91 | #. module: gbwinvoice_report_webkit | ||
497 | 92 | #: model:ir.actions.report.xml,name:gbwinvoice_report_webkit.gbwcategorydetail_report_webkit | ||
498 | 93 | msgid "GBW Category Detail Invoice Report" | ||
499 | 94 | msgstr "Reporte Detallado por Categoría GBW" | ||
500 | 95 | |||
501 | 96 | #. module: gbwinvoice_report_webkit | ||
502 | 97 | #: selection:gbwcategory.webkitwizard,state:0 | ||
503 | 98 | #: selection:gbwinvoice.webkitwizard,state:0 | ||
504 | 99 | msgid "choose" | ||
505 | 100 | msgstr "elegir" | ||
506 | 101 | |||
507 | 102 | #. module: gbwinvoice_report_webkit | ||
508 | 103 | #: model:ir.actions.act_window,name:gbwinvoice_report_webkit.action_gbwinvoice_report_webkit | ||
509 | 104 | msgid "GBW Invoice Report by Period" | ||
510 | 105 | msgstr "Facturas por Periodo GBW" | ||
511 | 106 | |||
512 | 107 | #. module: gbwinvoice_report_webkit | ||
513 | 108 | #: view:gbwcategory.webkitwizard:0 | ||
514 | 109 | #: view:gbwinvoice.webkitwizard:0 | ||
515 | 110 | msgid "Cancel" | ||
516 | 111 | msgstr "Cancelar" | ||
517 | 112 | |||
518 | 113 | #. module: gbwinvoice_report_webkit | ||
519 | 114 | #: model:ir.actions.act_window,name:gbwinvoice_report_webkit.action_gbwcategory_report_webkit | ||
520 | 115 | msgid "GBW Invoice Report by Category" | ||
521 | 116 | msgstr "Reporte por Categorías GBW" | ||
522 | 117 | |||
523 | 118 | #. module: gbwinvoice_report_webkit | ||
524 | 119 | #: model:ir.model,name:gbwinvoice_report_webkit.model_gbwinvoice_webkitwizard | ||
525 | 120 | msgid "GBW Invoices by Period" | ||
526 | 121 | msgstr "Facturas por Período GBW" | ||
527 | 122 | |||
528 | 23 | 123 | ||
529 | === modified file 'gbwinvoice_report_webkit/report/__init__.py' | |||
530 | --- gbwinvoice_report_webkit/report/__init__.py 2013-05-27 18:43:36 +0000 | |||
531 | +++ gbwinvoice_report_webkit/report/__init__.py 2013-06-04 21:36:25 +0000 | |||
532 | @@ -29,4 +29,4 @@ | |||
533 | 29 | # | 29 | # |
534 | 30 | ############################################################################## | 30 | ############################################################################## |
535 | 31 | 31 | ||
537 | 32 | import gbwinvoice_report_webkit | 32 | |
538 | 33 | 33 | ||
539 | === removed file 'gbwinvoice_report_webkit/report/gbwinvoice_report_webkit.py' | |||
540 | --- gbwinvoice_report_webkit/report/gbwinvoice_report_webkit.py 2013-05-27 18:43:36 +0000 | |||
541 | +++ gbwinvoice_report_webkit/report/gbwinvoice_report_webkit.py 1970-01-01 00:00:00 +0000 | |||
542 | @@ -1,17 +0,0 @@ | |||
543 | 1 | import time | ||
544 | 2 | from report import report_sxw | ||
545 | 3 | from osv import osv | ||
546 | 4 | |||
547 | 5 | class gbwinvoice_report_webkit(report_sxw.rml_parse): | ||
548 | 6 | def __init__(self, cr, uid, name, context): | ||
549 | 7 | super(gbwinvoice_report_webkit, self).__init__(cr, uid, name, context=context) | ||
550 | 8 | self.localcontext.update({ | ||
551 | 9 | 'time': time, | ||
552 | 10 | 'cr':cr, | ||
553 | 11 | 'uid': uid, | ||
554 | 12 | }) | ||
555 | 13 | |||
556 | 14 | report_sxw.report_sxw('report.webkitgbw.invoice', | ||
557 | 15 | 'account.invoice', | ||
558 | 16 | 'gbwinvoice_report_webkit/report/invoice_gbw_report.mako', | ||
559 | 17 | gbwinvoice_report_webkit) | ||
560 | 18 | 0 | ||
561 | === renamed file 'gbwinvoice_report_webkit/report/templates/category_gbw_report.mako' => 'gbwinvoice_report_webkit/report/templates/gbwcategory_report_webkit.mako' | |||
562 | --- gbwinvoice_report_webkit/report/templates/category_gbw_report.mako 2013-05-27 18:43:36 +0000 | |||
563 | +++ gbwinvoice_report_webkit/report/templates/gbwcategory_report_webkit.mako 2013-06-04 21:36:25 +0000 | |||
564 | @@ -1,41 +1,86 @@ | |||
565 | 1 | <html > | 1 | <html > |
566 | 2 | <body> | 2 | <body> |
567 | 3 | |||
568 | 3 | <% | 4 | <% |
578 | 4 | renglones = 0 | 5 | existe=0 |
579 | 5 | total_importe = 0 | 6 | categorias={} |
580 | 6 | total_iva= 0 | 7 | registros=0 |
581 | 7 | total_total= 0 | 8 | suma_total_cantidad=0 |
582 | 8 | facturas = 0 | 9 | suma_total_subtotal=0 |
583 | 9 | facturas_reportadas = 0 | 10 | subtotal=0 |
584 | 10 | facturas_borrador = 0 | 11 | setLang(user.context_lang) |
576 | 11 | facturas_canceladas = 0 | ||
577 | 12 | setLang(user.context_lang) | ||
585 | 13 | %> | 12 | %> |
586 | 13 | |||
587 | 14 | <table style="align:right;" > | ||
588 | 15 | <tr> | ||
589 | 16 | <td style="font-size:small;" colspan=2>${data['form']['report_title'] or ''}</td> | ||
590 | 17 | </tr> | ||
591 | 18 | <tr> | ||
592 | 19 | <td style="font-size:small;" >Del </td><td>${data['form']['from_date'] or '' }</td> | ||
593 | 20 | <td style="font-size:small;" > al </td><td>${data['form']['to_date'] or '' }</td> | ||
594 | 21 | </tr> | ||
595 | 22 | </table> | ||
596 | 23 | |||
597 | 24 | |||
598 | 14 | <table class="list_table" > | 25 | <table class="list_table" > |
599 | 15 | <tr> | 26 | <tr> |
600 | 16 | <td style="border-bottom:2px solid;" >Categoria</td> | 27 | <td style="border-bottom:2px solid;" >Categoria</td> |
601 | 17 | <td style="border-bottom:2px solid;" >Producto</td> | ||
602 | 18 | <td style="border-bottom:2px solid;" >Cantidad</td> | 28 | <td style="border-bottom:2px solid;" >Cantidad</td> |
603 | 19 | <td style="border-bottom:2px solid;" >Importe</td> | 29 | <td style="border-bottom:2px solid;" >Importe</td> |
604 | 20 | <td style="border-bottom:2px solid;" >Impuesto</td> | ||
605 | 21 | <td style="border-bottom:2px solid;" >Importe Total</td> | ||
606 | 22 | </tr> | 30 | </tr> |
607 | 23 | %for involn in objects: | 31 | %for involn in objects: |
624 | 24 | <tr> | 32 | <% |
625 | 25 | <td style="border-bottom:2px solid;" > | 33 | existe=0 |
626 | 26 | ${involn.categ_id.name} | 34 | t={} |
627 | 27 | </td> | 35 | %> |
628 | 28 | <td style="border-bottom:2px solid;" >${involn.product_id.name}</td> | 36 | %if involn.invoice_id.rate>0.0: |
629 | 29 | <td style="border-bottom:2px solid;" ></td> | 37 | <% |
630 | 30 | <td style="border-bottom:2px solid;" ></td> | 38 | subtotal=involn.price_subtotal*involn.invoice_id.rate |
631 | 31 | <td style="border-bottom:2px solid;" ></td> | 39 | %> |
632 | 32 | <td style="border-bottom:2px solid;" ></td> | 40 | %else: |
633 | 33 | </tr> | 41 | <% |
634 | 34 | 42 | subtotal=involn.price_subtotal | |
635 | 35 | 43 | %> | |
636 | 36 | <% renglones = renglones + 1 %> | 44 | %endif |
637 | 37 | %endfor | 45 | %for k, v in categorias.items(): |
638 | 38 | </table> | 46 | %if k==involn.product_id.categ_id.complete_name: |
639 | 39 | </p> | 47 | <% |
640 | 48 | t['cantidad']=v['cantidad']+involn.quantity | ||
641 | 49 | t['subtotal']=v['subtotal']+subtotal | ||
642 | 50 | existe=1 | ||
643 | 51 | break | ||
644 | 52 | %> | ||
645 | 53 | %endif | ||
646 | 54 | %endfor | ||
647 | 55 | %if existe==0: | ||
648 | 56 | <% | ||
649 | 57 | t[involn.product_id.categ_id.complete_name]={'cantidad': involn.quantity,'subtotal':subtotal } | ||
650 | 58 | categorias.update(t) | ||
651 | 59 | %> | ||
652 | 60 | %else: | ||
653 | 61 | <% | ||
654 | 62 | categorias[involn.product_id.categ_id.complete_name]=t | ||
655 | 63 | %> | ||
656 | 64 | %endif | ||
657 | 65 | <% | ||
658 | 66 | suma_total_cantidad=suma_total_cantidad+involn.quantity | ||
659 | 67 | suma_total_subtotal=suma_total_subtotal+subtotal | ||
660 | 68 | %> | ||
661 | 69 | %endfor | ||
662 | 70 | |||
663 | 71 | %for k, v in categorias.items(): | ||
664 | 72 | <tr> | ||
665 | 73 | <td style="border-bottom:1px solid;" >${k}</td> | ||
666 | 74 | <td style="border-bottom:1px solid;float: right; text-align: right" >${formatLang(v['cantidad']) or 0.0}</td> | ||
667 | 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> | ||
668 | 76 | </tr> | ||
669 | 77 | %endfor | ||
670 | 78 | <tr> | ||
671 | 79 | <td style="border-bottom:1px solid;border-top:1px solid;" >Total:</td> | ||
672 | 80 | <td style="border-bottom:1px solid;border-top:1px solid;float: right; text-align: right" >${formatLang(suma_total_cantidad) or 0.0}</td> | ||
673 | 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> | ||
674 | 82 | </tr> | ||
675 | 83 | </table> | ||
676 | 84 | |||
677 | 40 | </body> | 85 | </body> |
678 | 41 | </html> | 86 | </html> |
679 | 42 | 87 | ||
680 | === added file 'gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako' | |||
681 | --- gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako 1970-01-01 00:00:00 +0000 | |||
682 | +++ gbwinvoice_report_webkit/report/templates/gbwcategorydetail_report_webkit.mako 2013-06-04 21:36:25 +0000 | |||
683 | @@ -0,0 +1,122 @@ | |||
684 | 1 | <html > | ||
685 | 2 | <body> | ||
686 | 3 | |||
687 | 4 | <% | ||
688 | 5 | existe=0 | ||
689 | 6 | categorias={} | ||
690 | 7 | productos={} | ||
691 | 8 | registros=0 | ||
692 | 9 | suma_total_cantidad=0 | ||
693 | 10 | suma_total_subtotal=0 | ||
694 | 11 | subtotal=0 | ||
695 | 12 | setLang(user.context_lang) | ||
696 | 13 | %> | ||
697 | 14 | |||
698 | 15 | <table style="align:right;" > | ||
699 | 16 | <tr> | ||
700 | 17 | <td style="font-size:small;" colspan=2>${data['form']['report_title'] or ''}</td> | ||
701 | 18 | </tr> | ||
702 | 19 | <tr> | ||
703 | 20 | <td style="font-size:small;" >Del </td><td>${data['form']['from_date'] or '' }</td> | ||
704 | 21 | <td style="font-size:small;" > al </td><td>${data['form']['to_date'] or '' }</td> | ||
705 | 22 | </tr> | ||
706 | 23 | </table> | ||
707 | 24 | |||
708 | 25 | |||
709 | 26 | <table class="list_table" > | ||
710 | 27 | <tr> | ||
711 | 28 | <td style="border-bottom:2px solid;" >Categoria</td> | ||
712 | 29 | <td style="border-bottom:2px solid;" >Producto</td> | ||
713 | 30 | <td style="border-bottom:2px solid;" >Cantidad</td> | ||
714 | 31 | <td style="border-bottom:2px solid;" >Importe</td> | ||
715 | 32 | </tr> | ||
716 | 33 | %for involn in objects: | ||
717 | 34 | <% | ||
718 | 35 | existec=0 | ||
719 | 36 | existep=0 | ||
720 | 37 | tc={} | ||
721 | 38 | tp={} | ||
722 | 39 | tp2={} | ||
723 | 40 | productos={} | ||
724 | 41 | %> | ||
725 | 42 | %if involn.invoice_id.rate>0.0: | ||
726 | 43 | <% | ||
727 | 44 | subtotal=involn.price_subtotal*involn.invoice_id.rate | ||
728 | 45 | %> | ||
729 | 46 | %else: | ||
730 | 47 | <% | ||
731 | 48 | subtotal=involn.price_subtotal | ||
732 | 49 | %> | ||
733 | 50 | %endif | ||
734 | 51 | %for k, v in categorias.items(): | ||
735 | 52 | %if k==involn.product_id.categ_id.complete_name: | ||
736 | 53 | <% | ||
737 | 54 | existec=1 | ||
738 | 55 | productos=v | ||
739 | 56 | %> | ||
740 | 57 | %for kp, vp in v.items(): | ||
741 | 58 | %if kp==involn.product_id.name: | ||
742 | 59 | <% | ||
743 | 60 | tp2['referencia']=involn.product_id.code | ||
744 | 61 | tp2['cantidad']=vp['cantidad']+involn.quantity | ||
745 | 62 | tp2['subtotal']=vp['subtotal']+subtotal | ||
746 | 63 | existep=1 | ||
747 | 64 | break | ||
748 | 65 | %> | ||
749 | 66 | %endif | ||
750 | 67 | %endfor | ||
751 | 68 | %if existep==0: | ||
752 | 69 | <% | ||
753 | 70 | tp[involn.product_id.name]={'cantidad':involn.quantity,'subtotal':subtotal, 'referencia':involn.product_id.code } | ||
754 | 71 | productos.update(tp) | ||
755 | 72 | %> | ||
756 | 73 | %else: | ||
757 | 74 | <% | ||
758 | 75 | tp[involn.product_id.name]=tp2 | ||
759 | 76 | productos.update(tp) | ||
760 | 77 | %> | ||
761 | 78 | %endif | ||
762 | 79 | <% | ||
763 | 80 | break | ||
764 | 81 | %> | ||
765 | 82 | %endif | ||
766 | 83 | %endfor | ||
767 | 84 | %if existec==0: | ||
768 | 85 | <% | ||
769 | 86 | tp[involn.product_id.name]={'cantidad':involn.quantity,'subtotal':subtotal, 'referencia':involn.product_id.code } | ||
770 | 87 | tc[involn.product_id.categ_id.complete_name]=tp | ||
771 | 88 | categorias.update(tc) | ||
772 | 89 | %> | ||
773 | 90 | %else: | ||
774 | 91 | <% | ||
775 | 92 | tc[involn.product_id.categ_id.complete_name]=productos | ||
776 | 93 | categorias.update(tc) | ||
777 | 94 | %> | ||
778 | 95 | %endif | ||
779 | 96 | <% | ||
780 | 97 | suma_total_cantidad=suma_total_cantidad+involn.quantity | ||
781 | 98 | suma_total_subtotal=suma_total_subtotal+subtotal | ||
782 | 99 | %> | ||
783 | 100 | %endfor | ||
784 | 101 | |||
785 | 102 | %for k, v in categorias.items(): | ||
786 | 103 | <tr> | ||
787 | 104 | <td colspan=4 style="border-bottom:1px solid;border-top:1px solid;" >${k}</td> | ||
788 | 105 | </tr> | ||
789 | 106 | %for kp, vp in v.items(): | ||
790 | 107 | <tr> | ||
791 | 108 | <td colspan=2 style="border-bottom:1px solid;font-size:small;" > [${vp['referencia']}] ${kp[0:15]}</td> | ||
792 | 109 | <td style="border-bottom:1px solid;float: right; text-align: right;font-size:small;" >${formatLang(vp['cantidad']) or 0.0}</td> | ||
793 | 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> | ||
794 | 111 | </tr> | ||
795 | 112 | %endfor | ||
796 | 113 | %endfor | ||
797 | 114 | <tr> | ||
798 | 115 | <td colspan=2 style="border-bottom:2px solid;border-top:2px solid;" >Total:</td> | ||
799 | 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> | ||
800 | 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> | ||
801 | 118 | </tr> | ||
802 | 119 | </table> | ||
803 | 120 | |||
804 | 121 | </body> | ||
805 | 122 | </html> | ||
806 | 0 | 123 | ||
807 | === renamed file 'gbwinvoice_report_webkit/report/invoice_gbw_report.mako' => 'gbwinvoice_report_webkit/report/templates/gbwinvoice_report_webkit.mako' | |||
808 | --- gbwinvoice_report_webkit/report/invoice_gbw_report.mako 2013-05-27 18:43:36 +0000 | |||
809 | +++ gbwinvoice_report_webkit/report/templates/gbwinvoice_report_webkit.mako 2013-06-04 21:36:25 +0000 | |||
810 | @@ -1,16 +1,39 @@ | |||
811 | 1 | <html > | 1 | <html > |
812 | 2 | <body> | 2 | <body> |
813 | 3 | <% | 3 | <% |
823 | 4 | renglones = 0 | 4 | renglones = 0 |
824 | 5 | total_importe = 0 | 5 | total_importe = 0 |
825 | 6 | total_iva= 0 | 6 | total_iva= 0 |
826 | 7 | total_total= 0 | 7 | total_total= 0 |
827 | 8 | facturas = 0 | 8 | facturas = 0 |
828 | 9 | facturas_reportadas = 0 | 9 | facturas_reportadas = 0 |
829 | 10 | facturas_borrador = 0 | 10 | facturas_borrador = 0 |
830 | 11 | facturas_canceladas = 0 | 11 | facturas_canceladas = 0 |
831 | 12 | setLang(user.context_lang) | 12 | setLang(user.context_lang) |
832 | 13 | encabezado=True | ||
833 | 14 | try: | ||
834 | 15 | data['form'] | ||
835 | 16 | except: | ||
836 | 17 | encabezado=False | ||
837 | 18 | pass | ||
838 | 13 | %> | 19 | %> |
839 | 20 | %if encabezado: | ||
840 | 21 | <table style="align:right;" > | ||
841 | 22 | <tr> | ||
842 | 23 | <td style="font-size:small;" colspan=2>${data['form']['report_title'] or ''}</td> | ||
843 | 24 | </tr> | ||
844 | 25 | <tr> | ||
845 | 26 | <td style="font-size:small;" >Del </td><td>${data['form']['from_date'] or '' }</td> | ||
846 | 27 | <td style="font-size:small;" > al </td><td>${data['form']['to_date'] or '' }</td> | ||
847 | 28 | </tr> | ||
848 | 29 | </table> | ||
849 | 30 | %else: | ||
850 | 31 | <table style="align:right;" > | ||
851 | 32 | <tr> | ||
852 | 33 | <td style="font-size:small;" colspan=2>VENTAS FACTURADAS</td> | ||
853 | 34 | </tr> | ||
854 | 35 | </table> | ||
855 | 36 | %endif | ||
856 | 14 | <table class="list_table" > | 37 | <table class="list_table" > |
857 | 15 | <tr> | 38 | <tr> |
858 | 16 | <td style="border-bottom:2px solid;" >Fecha</td> | 39 | <td style="border-bottom:2px solid;" >Fecha</td> |
859 | @@ -29,16 +52,16 @@ | |||
860 | 29 | <% renglones=0 %> | 52 | <% renglones=0 %> |
861 | 30 | %endif | 53 | %endif |
862 | 31 | <tr> | 54 | <tr> |
870 | 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> |
871 | 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> |
872 | 34 | <td>${invo.number or '' }</td> | 57 | <td style="font-size:small;" >${invo.number or '' }</td> |
873 | 35 | <td>${invo.currency_id.name or '' }</td> | 58 | <td style="font-size:small;" >${invo.currency_id.name or '' }</td> |
874 | 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> |
875 | 37 | %if invo.state == 'cancel' : | 60 | %if invo.state == 'cancel': |
876 | 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> |
877 | 39 | <% facturas_canceladas= facturas_canceladas + 1 %> | 62 | <% facturas_canceladas= facturas_canceladas + 1 %> |
880 | 40 | %elif invo.state == 'draft' : | 63 | %elif invo.state == 'draft': |
881 | 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> |
882 | 42 | <% facturas_borrador= facturas_borrador + 1 %> | 65 | <% facturas_borrador= facturas_borrador + 1 %> |
883 | 43 | %else : | 66 | %else : |
884 | 44 | <% | 67 | <% |
885 | @@ -51,9 +74,9 @@ | |||
886 | 51 | iva=iva*invo.rate | 74 | iva=iva*invo.rate |
887 | 52 | total=total*invo.rate | 75 | total=total*invo.rate |
888 | 53 | %> | 76 | %> |
892 | 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> |
893 | 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> |
894 | 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> |
895 | 57 | <% | 80 | <% |
896 | 58 | total_importe = total_importe + subtotal | 81 | total_importe = total_importe + subtotal |
897 | 59 | total_iva= total_iva + iva | 82 | total_iva= total_iva + iva |
898 | @@ -70,9 +93,9 @@ | |||
899 | 70 | <tr > | 93 | <tr > |
900 | 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> |
901 | 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> |
905 | 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> |
906 | 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> |
907 | 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> |
908 | 76 | </tr> | 99 | </tr> |
909 | 77 | </table> | 100 | </table> |
910 | 78 | <br><br> | 101 | <br><br> |
911 | 79 | 102 | ||
912 | === added directory 'gbwinvoice_report_webkit/wizard' | |||
913 | === added file 'gbwinvoice_report_webkit/wizard/__init__.py' | |||
914 | --- gbwinvoice_report_webkit/wizard/__init__.py 1970-01-01 00:00:00 +0000 | |||
915 | +++ gbwinvoice_report_webkit/wizard/__init__.py 2013-06-04 21:36:25 +0000 | |||
916 | @@ -0,0 +1,2 @@ | |||
917 | 1 | import gbwinvoice_report_webkit_wizard | ||
918 | 2 | import gbwcategory_report_webkit_wizard | ||
919 | 0 | 3 | ||
920 | === added file 'gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard.py' | |||
921 | --- gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard.py 1970-01-01 00:00:00 +0000 | |||
922 | +++ gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard.py 2013-06-04 21:36:25 +0000 | |||
923 | @@ -0,0 +1,65 @@ | |||
924 | 1 | # -*- coding: utf-8 -*- | ||
925 | 2 | from osv import osv,fields | ||
926 | 3 | from tools.translate import _ | ||
927 | 4 | import time | ||
928 | 5 | from datetime import datetime | ||
929 | 6 | |||
930 | 7 | class gbwcategory_report_webkit_wizard(osv.osv_memory): | ||
931 | 8 | _name = "gbwcategory.webkitwizard" | ||
932 | 9 | _description = "GBW Invoices by Category" | ||
933 | 10 | |||
934 | 11 | _columns = { | ||
935 | 12 | 'from_date':fields.datetime('From'), | ||
936 | 13 | 'to_date':fields.datetime('To'), | ||
937 | 14 | 'report_title':fields.char('Report Title', size=128, required=False), | ||
938 | 15 | 'detail_report': fields.boolean('Show Products Detail', help="Show products detail by category."), | ||
939 | 16 | 'state': fields.selection([('choose','choose'), | ||
940 | 17 | ('get','get'), | ||
941 | 18 | ]), | ||
942 | 19 | } | ||
943 | 20 | |||
944 | 21 | def create_report(self, cr, uid, ids, context={}): | ||
945 | 22 | data = self.read(cr,uid,ids,)[-1] | ||
946 | 23 | invoice = self.pool.get('account.invoice') | ||
947 | 24 | invoice_ids = invoice.search(cr, uid, [('date_invoice', '>', data['from_date']),('date_invoice', '<', data['to_date']),('state','!=','cancel'),('state','!=','draft')], context=context) | ||
948 | 25 | |||
949 | 26 | invoice_line = self.pool.get('account.invoice.line') | ||
950 | 27 | invoice_line_ids = invoice_line.search(cr, uid, [('invoice_id', 'in', invoice_ids)], order='product_id ASC',context=context) | ||
951 | 28 | if data['detail_report']==True: | ||
952 | 29 | data['report_title']='VENTAS FACTURADAS POR CATEGORIA DETALLE DE PRODUCTOS' | ||
953 | 30 | res={ | ||
954 | 31 | 'type' : 'ir.actions.report.xml', | ||
955 | 32 | 'report_name' : 'gbwcategorydetail.report.webkit', | ||
956 | 33 | 'datas': { | ||
957 | 34 | 'model':'account.invoice.line', | ||
958 | 35 | 'id': context.get('active_ids') and context.get('active_ids')[0] or False, | ||
959 | 36 | 'ids': invoice_line_ids and invoice_line_ids or [], | ||
960 | 37 | 'report_type': 'webkit', | ||
961 | 38 | 'form': data | ||
962 | 39 | }, | ||
963 | 40 | 'nodestroy': False | ||
964 | 41 | } | ||
965 | 42 | else: | ||
966 | 43 | res={ | ||
967 | 44 | 'type' : 'ir.actions.report.xml', | ||
968 | 45 | 'report_name' : 'gbwcategory.report.webkit', | ||
969 | 46 | 'datas': { | ||
970 | 47 | 'model':'account.invoice.line', | ||
971 | 48 | 'id': context.get('active_ids') and context.get('active_ids')[0] or False, | ||
972 | 49 | 'ids': invoice_line_ids and invoice_line_ids or [], | ||
973 | 50 | 'report_type': 'webkit', | ||
974 | 51 | 'form': data | ||
975 | 52 | }, | ||
976 | 53 | 'nodestroy': False | ||
977 | 54 | } | ||
978 | 55 | print data,' create_report(' | ||
979 | 56 | |||
980 | 57 | return res | ||
981 | 58 | |||
982 | 59 | _defaults = { | ||
983 | 60 | 'detail_report': False, | ||
984 | 61 | 'report_title': lambda *a: 'VENTAS FACTURADAS POR CATEGORIA', | ||
985 | 62 | 'report_type': lambda *a: 'webkit', | ||
986 | 63 | 'state': lambda *a: 'choose', | ||
987 | 64 | } | ||
988 | 65 | gbwcategory_report_webkit_wizard() | ||
989 | 0 | 66 | ||
990 | === added file 'gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard_view.xml' | |||
991 | --- gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard_view.xml 1970-01-01 00:00:00 +0000 | |||
992 | +++ gbwinvoice_report_webkit/wizard/gbwcategory_report_webkit_wizard_view.xml 2013-06-04 21:36:25 +0000 | |||
993 | @@ -0,0 +1,46 @@ | |||
994 | 1 | <?xml version="1.0"?> | ||
995 | 2 | <openerp> | ||
996 | 3 | <data > | ||
997 | 4 | <!--====================Defining the wizard View==================--> | ||
998 | 5 | |||
999 | 6 | <record id='gbwcategory_report_webkit_wizardform' model="ir.ui.view"> | ||
1000 | 7 | <field name="name">GBW Invoices by Category</field> | ||
1001 | 8 | <field name="model">gbwcategory.webkitwizard</field> | ||
1002 | 9 | <field name="type">form</field> | ||
1003 | 10 | <field name="arch" type="xml"> | ||
1004 | 11 | <form string="Invoices" > | ||
1005 | 12 | <group col="2" fill="0" height="500" states="choose"> | ||
1006 | 13 | <separator string="Filter" colspan="4"/> | ||
1007 | 14 | <field name="from_date" required='1'/> | ||
1008 | 15 | <field name="to_date" required='1' /> | ||
1009 | 16 | <field name="detail_report" /> | ||
1010 | 17 | <field name="report_title" invisible="1" /> | ||
1011 | 18 | <separator colspan="2"/> | ||
1012 | 19 | <group colspan="2"> | ||
1013 | 20 | <button special="cancel" icon="gtk-cancel" string="Cancel"/> | ||
1014 | 21 | <button type="object" name="create_report" icon="gtk-go-forward" string="Create"/> | ||
1015 | 22 | </group> | ||
1016 | 23 | <field invisible="1" name="state"/> | ||
1017 | 24 | </group> | ||
1018 | 25 | </form> | ||
1019 | 26 | </field> | ||
1020 | 27 | </record> | ||
1021 | 28 | |||
1022 | 29 | <record model="ir.actions.act_window" id="action_gbwcategory_report_webkit"> | ||
1023 | 30 | <field name="name">GBW Invoice Report by Category</field> | ||
1024 | 31 | <field name="res_model">gbwcategory.webkitwizard</field> | ||
1025 | 32 | <field name="view_type">form</field> | ||
1026 | 33 | <field name="view_mode">form</field> | ||
1027 | 34 | <field name="target">new</field> | ||
1028 | 35 | </record> | ||
1029 | 36 | <!--====================Specifying the report menu ========================--> | ||
1030 | 37 | |||
1031 | 38 | <menuitem id="gbwcategory_report_webkit" name="GBW Invoices by Category" | ||
1032 | 39 | action="action_gbwcategory_report_webkit" | ||
1033 | 40 | parent="account.menu_finance_statistic_report_statement" | ||
1034 | 41 | sequence="25" | ||
1035 | 42 | /> | ||
1036 | 43 | |||
1037 | 44 | </data> | ||
1038 | 45 | </openerp> | ||
1039 | 46 | |||
1040 | 0 | 47 | ||
1041 | === added file 'gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.py' | |||
1042 | --- gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.py 1970-01-01 00:00:00 +0000 | |||
1043 | +++ gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.py 2013-06-04 21:36:25 +0000 | |||
1044 | @@ -0,0 +1,45 @@ | |||
1045 | 1 | # -*- coding: utf-8 -*- | ||
1046 | 2 | from osv import osv,fields | ||
1047 | 3 | from tools.translate import _ | ||
1048 | 4 | import time | ||
1049 | 5 | from datetime import datetime | ||
1050 | 6 | |||
1051 | 7 | class gbwinvoice_report_webkit_wizard(osv.osv_memory): | ||
1052 | 8 | _name = "gbwinvoice.webkitwizard" | ||
1053 | 9 | _description = "GBW Invoices by Period" | ||
1054 | 10 | |||
1055 | 11 | _columns = { | ||
1056 | 12 | 'from_date':fields.datetime('From'), | ||
1057 | 13 | 'to_date':fields.datetime('To'), | ||
1058 | 14 | 'report_title':fields.char('Report Title', size=128, required=False), | ||
1059 | 15 | 'state': fields.selection([('choose','choose'), | ||
1060 | 16 | ('get','get'), | ||
1061 | 17 | ]), | ||
1062 | 18 | |||
1063 | 19 | } | ||
1064 | 20 | |||
1065 | 21 | def create_report(self, cr, uid, ids, context={}): | ||
1066 | 22 | data = self.read(cr,uid,ids,)[-1] | ||
1067 | 23 | invoice = self.pool.get('account.invoice') | ||
1068 | 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) | ||
1069 | 25 | print data,' create_report(' | ||
1070 | 26 | |||
1071 | 27 | return { | ||
1072 | 28 | 'type' : 'ir.actions.report.xml', | ||
1073 | 29 | 'report_name' : 'gbwinvoice.report.webkit', | ||
1074 | 30 | 'datas': { | ||
1075 | 31 | 'model':'account.invoice', | ||
1076 | 32 | 'id': context.get('active_ids') and context.get('active_ids')[0] or False, | ||
1077 | 33 | 'ids': invoice_ids and invoice_ids or [], | ||
1078 | 34 | 'report_type': 'webkit', | ||
1079 | 35 | 'form': data | ||
1080 | 36 | }, | ||
1081 | 37 | 'nodestroy': False | ||
1082 | 38 | } | ||
1083 | 39 | |||
1084 | 40 | _defaults = { | ||
1085 | 41 | 'report_title': lambda *a: 'VENTAS FACTURADAS', | ||
1086 | 42 | 'report_type': lambda *a: 'webkit', | ||
1087 | 43 | 'state': lambda *a: 'choose', | ||
1088 | 44 | } | ||
1089 | 45 | gbwinvoice_report_webkit_wizard() | ||
1090 | 0 | 46 | ||
1091 | === added file 'gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.xml' | |||
1092 | --- gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.xml 1970-01-01 00:00:00 +0000 | |||
1093 | +++ gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard.xml 2013-06-04 21:36:25 +0000 | |||
1094 | @@ -0,0 +1,9 @@ | |||
1095 | 1 | <?xml version="1.0"?> | ||
1096 | 2 | <openerp> | ||
1097 | 3 | <data> | ||
1098 | 4 | <wizard string="Print GBW Invoices by Period" model="account.invoice" | ||
1099 | 5 | name="account.gbwinvoiceswiz" /> | ||
1100 | 6 | <wizard string="Print GBW Invoices by Product Categories" model="account.invoice.line" | ||
1101 | 7 | name="account.gbwinvoiceswiz" /> | ||
1102 | 8 | </data> | ||
1103 | 9 | </openerp> | ||
1104 | 0 | 10 | ||
1105 | === added file 'gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard_view.xml' | |||
1106 | --- gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard_view.xml 1970-01-01 00:00:00 +0000 | |||
1107 | +++ gbwinvoice_report_webkit/wizard/gbwinvoice_report_webkit_wizard_view.xml 2013-06-04 21:36:25 +0000 | |||
1108 | @@ -0,0 +1,45 @@ | |||
1109 | 1 | <?xml version="1.0"?> | ||
1110 | 2 | <openerp> | ||
1111 | 3 | <data > | ||
1112 | 4 | <!--====================Defining the wizard View==================--> | ||
1113 | 5 | |||
1114 | 6 | <record id='gbwinvoice_report_webkit_wizardform' model="ir.ui.view"> | ||
1115 | 7 | <field name="name">GBW Invoice Report by Period</field> | ||
1116 | 8 | <field name="model">gbwinvoice.webkitwizard</field> | ||
1117 | 9 | <field name="type">form</field> | ||
1118 | 10 | <field name="arch" type="xml"> | ||
1119 | 11 | <form string="Invoices" > | ||
1120 | 12 | <group col="2" fill="0" height="500" states="choose"> | ||
1121 | 13 | <separator string="Filter" colspan="4"/> | ||
1122 | 14 | <field name="from_date" required='1'/> | ||
1123 | 15 | <field name="to_date" required='1' /> | ||
1124 | 16 | <field name="report_title" invisible="1" /> | ||
1125 | 17 | <separator colspan="2"/> | ||
1126 | 18 | <group colspan="2"> | ||
1127 | 19 | <button special="cancel" icon="gtk-cancel" string="Cancel"/> | ||
1128 | 20 | <button type="object" name="create_report" icon="gtk-go-forward" string="Create"/> | ||
1129 | 21 | </group> | ||
1130 | 22 | <field invisible="1" name="state"/> | ||
1131 | 23 | </group> | ||
1132 | 24 | </form> | ||
1133 | 25 | </field> | ||
1134 | 26 | </record> | ||
1135 | 27 | |||
1136 | 28 | <record model="ir.actions.act_window" id="action_gbwinvoice_report_webkit"> | ||
1137 | 29 | <field name="name">GBW Invoice Report by Period</field> | ||
1138 | 30 | <field name="res_model">gbwinvoice.webkitwizard</field> | ||
1139 | 31 | <field name="view_type">form</field> | ||
1140 | 32 | <field name="view_mode">form</field> | ||
1141 | 33 | <field name="target">new</field> | ||
1142 | 34 | </record> | ||
1143 | 35 | <!--====================Specifying the report menu ========================--> | ||
1144 | 36 | |||
1145 | 37 | <menuitem id="gbwinvoice_report_webkit" name="GBW Invoice Report by Period" | ||
1146 | 38 | action="action_gbwinvoice_report_webkit" | ||
1147 | 39 | parent="account.menu_finance_statistic_report_statement" | ||
1148 | 40 | sequence="24" | ||
1149 | 41 | /> | ||
1150 | 42 | |||
1151 | 43 | </data> | ||
1152 | 44 | </openerp> | ||
1153 | 45 |