openerp-l10n-ar-localization

Merge lp:~ingenieria-adhoc/openerp-l10n-ar-localization/70_IMP_vat_report into lp:openerp-l10n-ar-localization/7.0

  1. 70_IMP_vat_report
  2. Merge into 7.0
Proposed by Juan José Scarafía (ADHOC)
Status: Needs review
Proposed branch: lp:~ingenieria-adhoc/openerp-l10n-ar-localization/70_IMP_vat_report
Merge into: lp:openerp-l10n-ar-localization/7.0
Diff against target: 692 lines (+587/-11)
5 files modified
l10n_ar_vat_reports/__openerp__.py (+20/-9)
l10n_ar_vat_reports/i18n/es.po (+173/-0)
l10n_ar_vat_reports/i18n/es_AR.po (+173/-0)
l10n_ar_vat_reports/i18n/l10n_ar_vat_reports.pot (+172/-0)
l10n_ar_vat_reports/wizard/report_prompt.py (+49/-2)
To merge this branch: bzr merge lp:~ingenieria-adhoc/openerp-l10n-ar-localization/70_IMP_vat_report
Reviewer Review Type Date Requested Status
Cristian Sebastian Rocha Pending
Review via email: mp+195604@code.launchpad.net

Description of the change

ADD translations
ADD label with period in the report
Default range for last month
FIX name so that is variable for purchase and sale VAT report

To post a comment you must log in.
Revision history for this message
Juan José Scarafía (ADHOC) (juanjose-scarafia) wrote :

Aclaro que estas son modificaciones menores sobre la rama estable 7. Modificaciones solo sobre el modulo de reporte de iva.

En cambio el otro merge proposal es un poco más grande y se propone sobre la trunk (https://code.launchpad.net/~sistemas-adhoc/openerp-l10n-ar-localization/trunk/+merge/195814)

Reply

Unmerged revisions

222. By Juan José Scarafía (ADHOC)

ADD translations, description for period, fix name on purchase report_description

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ar_vat_reports/__openerp__.py'
2--- l10n_ar_vat_reports/__openerp__.py 2013-11-12 17:47:05 +0000
3+++ l10n_ar_vat_reports/__openerp__.py 2013-11-18 13:24:25 +0000
4@@ -1,11 +1,22 @@
5 # v7.0 - Beta.
6-{ 'active': False,
7+{
8+ "name": "Argentina VAT Reports",
9+ "description": """
10+Argentina VAT Reports
11+=====================
12+Creates Sale and Purchase VAT report menus in "accounting/reporting/taxes report"
13+
14+It requires pentaho_reports module, you can find it in https://github.com/WillowIT/Pentaho-reports-for-OpenERP
15+ """,
16+ "version": "0.1",
17 'author': 'Sistemas ADHOC',
18- 'category': 'Reporting subsystems',
19- 'data': ['wizard/report_prompt.xml', 'report/report_data.xml'],
20- 'depends': ['account', 'pentaho_reports'],
21- 'description': '\n\nTitile of pentaho res.partner report sample\n\n===========================================\n\n\n\nDescription of pentaho res.partner report sample\n\n\n\n ',
22- 'installable': True,
23- 'name': 'Pentaho res.partner report sample',
24- 'version': '0.220',
25- 'website': 'http://www.sistemasadhoc.com.ar'}
26+ 'website': 'http://www.sistemasadhoc.com.ar',
27+ "depends": ["pentaho_reports", "l10n_ar_invoice"],
28+ "category": "Reporting subsystems",
29+ "data": [
30+ 'wizard/report_prompt.xml',
31+ 'report/report_data.xml',
32+ ],
33+ "installable": True,
34+ "active": False
35+}
36
37=== added directory 'l10n_ar_vat_reports/i18n'
38=== added file 'l10n_ar_vat_reports/i18n/es.po'
39--- l10n_ar_vat_reports/i18n/es.po 1970-01-01 00:00:00 +0000
40+++ l10n_ar_vat_reports/i18n/es.po 2013-11-18 13:24:25 +0000
41@@ -0,0 +1,173 @@
42+# Translation of OpenERP Server.
43+# This file contains the translation of the following modules:
44+# * l10n_ar_vat_reports
45+#
46+msgid ""
47+msgstr ""
48+"Project-Id-Version: OpenERP Server 7.0\n"
49+"Report-Msgid-Bugs-To: \n"
50+"POT-Creation-Date: 2013-10-09 12:24+0000\n"
51+"PO-Revision-Date: 2013-10-09 09:27-0300\n"
52+"Last-Translator: Juan Jose Scarafia <scarafia.juanjose@gmail.com>\n"
53+"Language-Team: \n"
54+"MIME-Version: 1.0\n"
55+"Content-Type: text/plain; charset=UTF-8\n"
56+"Content-Transfer-Encoding: 8bit\n"
57+"Plural-Forms: \n"
58+"X-Generator: Poedit 1.5.4\n"
59+
60+#. module: l10n_ar_vat_reports
61+#: selection:account.invoice.vat.report,output_type:0
62+msgid "Plain Text (txt)"
63+msgstr "Texto Pleno (txt)"
64+
65+#. module: l10n_ar_vat_reports
66+#: view:account.invoice.vat.report:0
67+msgid "Print"
68+msgstr "Imprimir"
69+
70+#. module: l10n_ar_vat_reports
71+#: field:account.invoice.vat.report,output_type:0
72+msgid "Report format"
73+msgstr "Formato del reporte"
74+
75+#. module: l10n_ar_vat_reports
76+#: selection:account.invoice.vat.report,output_type:0
77+msgid "Excel Spreadsheet (xls)"
78+msgstr "Hoja de cálculo Excel (xls)"
79+
80+#. module: l10n_ar_vat_reports
81+#: help:account.invoice.vat.report,output_type:0
82+msgid "Choose the format for the output"
83+msgstr "Elija el formato para la salida"
84+
85+#. module: l10n_ar_vat_reports
86+#: field:account.invoice.vat.report,company_id:0
87+msgid "Company"
88+msgstr "Compañía"
89+
90+#. module: l10n_ar_vat_reports
91+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_taxes_reports_menu
92+msgid "Taxes Report"
93+msgstr "Informe Impuestos"
94+
95+#. module: l10n_ar_vat_reports
96+#: selection:account.invoice.vat.report,output_type:0
97+msgid "HyperText (html)"
98+msgstr "Hipertexto (html)"
99+
100+#. module: l10n_ar_vat_reports
101+#: selection:account.invoice.vat.report,filter:0
102+msgid "Date"
103+msgstr "Fecha"
104+
105+#. module: l10n_ar_vat_reports
106+#: view:account.invoice.vat.report:0
107+#: field:account.invoice.vat.report,journal_ids:0
108+msgid "Journals"
109+msgstr "Diarios"
110+
111+#. module: l10n_ar_vat_reports
112+#: selection:account.invoice.vat.report,output_type:0
113+msgid "Rich Text (rtf)"
114+msgstr "Texto enriquecido (RTF)"
115+
116+#. module: l10n_ar_vat_reports
117+#: view:account.invoice.vat.report:0
118+msgid "Report Options"
119+msgstr "Opciones de Informe"
120+
121+#. module: l10n_ar_vat_reports
122+#: view:account.invoice.vat.report:0
123+#: selection:account.invoice.vat.report,filter:0
124+msgid "Periods"
125+msgstr "Períodos"
126+
127+#. module: l10n_ar_vat_reports
128+#: field:account.invoice.vat.report,date_to:0
129+msgid "End Date"
130+msgstr "Fecha de Finalización"
131+
132+#. module: l10n_ar_vat_reports
133+#: view:account.invoice.vat.report:0
134+msgid "Dates"
135+msgstr "Fechas"
136+
137+#. module: l10n_ar_vat_reports
138+#: field:account.invoice.vat.report,period_from:0
139+msgid "Start Period"
140+msgstr "Período inicial"
141+
142+#. module: l10n_ar_vat_reports
143+#: selection:account.invoice.vat.report,output_type:0
144+msgid "Portable Document (pdf)"
145+msgstr "Documento Portable (pdf)"
146+
147+#. module: l10n_ar_vat_reports
148+#: help:account.invoice.vat.report,fiscalyear_id:0
149+msgid "Keep empty for all open fiscal year"
150+msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos"
151+
152+#. module: l10n_ar_vat_reports
153+#: field:account.invoice.vat.report,period_to:0
154+msgid "End Period"
155+msgstr "Período final"
156+
157+#. module: l10n_ar_vat_reports
158+#: field:account.invoice.vat.report,fiscalyear_id:0
159+msgid "Fiscal Year"
160+msgstr "Ejercicio Fiscal"
161+
162+#. module: l10n_ar_vat_reports
163+#: selection:account.invoice.vat.report,filter:0
164+msgid "No Filters"
165+msgstr "No filtros"
166+
167+#. module: l10n_ar_vat_reports
168+#: selection:account.invoice.vat.report,output_type:0
169+msgid "Comma Separated Values (csv)"
170+msgstr "Valores separados por comas (csv)"
171+
172+#. module: l10n_ar_vat_reports
173+#: model:ir.actions.report.xml,name:l10n_ar_vat_reports.account_invoice_vat_report_report
174+#: model:ir.model,name:l10n_ar_vat_reports.model_account_invoice_vat_report
175+msgid "Account Invoice VAT Report"
176+msgstr "Reporte de Libro IVA"
177+
178+#. module: l10n_ar_vat_reports
179+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_action
180+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_menu
181+msgid "Sales VAT Report"
182+msgstr "Libro IVA Ventas"
183+
184+#. module: l10n_ar_vat_reports
185+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_action
186+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_menu
187+msgid "Purchases VAT Report"
188+msgstr "Libro IVA Compras"
189+
190+#. module: l10n_ar_vat_reports
191+#: view:account.invoice.vat.report:0
192+msgid "Filters"
193+msgstr "Filtros"
194+
195+#. module: l10n_ar_vat_reports
196+#: view:account.invoice.vat.report:0
197+msgid "Cancel"
198+msgstr "Cancelar"
199+
200+#. module: l10n_ar_vat_reports
201+#: field:account.invoice.vat.report,date_from:0
202+msgid "Start Date"
203+msgstr "Fecha inicial"
204+
205+#. module: l10n_ar_vat_reports
206+#: field:account.invoice.vat.report,filter:0
207+msgid "Filter by"
208+msgstr "Filtrar por"
209+
210+#. module: l10n_ar_vat_reports
211+#: view:account.invoice.vat.report:0
212+msgid "or"
213+msgstr "o"
214+
215
216=== added file 'l10n_ar_vat_reports/i18n/es_AR.po'
217--- l10n_ar_vat_reports/i18n/es_AR.po 1970-01-01 00:00:00 +0000
218+++ l10n_ar_vat_reports/i18n/es_AR.po 2013-11-18 13:24:25 +0000
219@@ -0,0 +1,173 @@
220+# Translation of OpenERP Server.
221+# This file contains the translation of the following modules:
222+# * l10n_ar_vat_reports
223+#
224+msgid ""
225+msgstr ""
226+"Project-Id-Version: OpenERP Server 7.0\n"
227+"Report-Msgid-Bugs-To: \n"
228+"POT-Creation-Date: 2013-10-09 12:24+0000\n"
229+"PO-Revision-Date: 2013-10-09 09:27-0300\n"
230+"Last-Translator: Juan Jose Scarafia <scarafia.juanjose@gmail.com>\n"
231+"Language-Team: \n"
232+"MIME-Version: 1.0\n"
233+"Content-Type: text/plain; charset=UTF-8\n"
234+"Content-Transfer-Encoding: 8bit\n"
235+"Plural-Forms: \n"
236+"X-Generator: Poedit 1.5.4\n"
237+
238+#. module: l10n_ar_vat_reports
239+#: selection:account.invoice.vat.report,output_type:0
240+msgid "Plain Text (txt)"
241+msgstr "Texto Pleno (txt)"
242+
243+#. module: l10n_ar_vat_reports
244+#: view:account.invoice.vat.report:0
245+msgid "Print"
246+msgstr "Imprimir"
247+
248+#. module: l10n_ar_vat_reports
249+#: field:account.invoice.vat.report,output_type:0
250+msgid "Report format"
251+msgstr "Formato del reporte"
252+
253+#. module: l10n_ar_vat_reports
254+#: selection:account.invoice.vat.report,output_type:0
255+msgid "Excel Spreadsheet (xls)"
256+msgstr "Hoja de cálculo Excel (xls)"
257+
258+#. module: l10n_ar_vat_reports
259+#: help:account.invoice.vat.report,output_type:0
260+msgid "Choose the format for the output"
261+msgstr "Elija el formato para la salida"
262+
263+#. module: l10n_ar_vat_reports
264+#: field:account.invoice.vat.report,company_id:0
265+msgid "Company"
266+msgstr "Compañía"
267+
268+#. module: l10n_ar_vat_reports
269+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_taxes_reports_menu
270+msgid "Taxes Report"
271+msgstr "Informe Impuestos"
272+
273+#. module: l10n_ar_vat_reports
274+#: selection:account.invoice.vat.report,output_type:0
275+msgid "HyperText (html)"
276+msgstr "Hipertexto (html)"
277+
278+#. module: l10n_ar_vat_reports
279+#: selection:account.invoice.vat.report,filter:0
280+msgid "Date"
281+msgstr "Fecha"
282+
283+#. module: l10n_ar_vat_reports
284+#: view:account.invoice.vat.report:0
285+#: field:account.invoice.vat.report,journal_ids:0
286+msgid "Journals"
287+msgstr "Diarios"
288+
289+#. module: l10n_ar_vat_reports
290+#: selection:account.invoice.vat.report,output_type:0
291+msgid "Rich Text (rtf)"
292+msgstr "Texto enriquecido (RTF)"
293+
294+#. module: l10n_ar_vat_reports
295+#: view:account.invoice.vat.report:0
296+msgid "Report Options"
297+msgstr "Opciones de Informe"
298+
299+#. module: l10n_ar_vat_reports
300+#: view:account.invoice.vat.report:0
301+#: selection:account.invoice.vat.report,filter:0
302+msgid "Periods"
303+msgstr "Períodos"
304+
305+#. module: l10n_ar_vat_reports
306+#: field:account.invoice.vat.report,date_to:0
307+msgid "End Date"
308+msgstr "Fecha de Finalización"
309+
310+#. module: l10n_ar_vat_reports
311+#: view:account.invoice.vat.report:0
312+msgid "Dates"
313+msgstr "Fechas"
314+
315+#. module: l10n_ar_vat_reports
316+#: field:account.invoice.vat.report,period_from:0
317+msgid "Start Period"
318+msgstr "Período inicial"
319+
320+#. module: l10n_ar_vat_reports
321+#: selection:account.invoice.vat.report,output_type:0
322+msgid "Portable Document (pdf)"
323+msgstr "Documento Portable (pdf)"
324+
325+#. module: l10n_ar_vat_reports
326+#: help:account.invoice.vat.report,fiscalyear_id:0
327+msgid "Keep empty for all open fiscal year"
328+msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos"
329+
330+#. module: l10n_ar_vat_reports
331+#: field:account.invoice.vat.report,period_to:0
332+msgid "End Period"
333+msgstr "Período final"
334+
335+#. module: l10n_ar_vat_reports
336+#: field:account.invoice.vat.report,fiscalyear_id:0
337+msgid "Fiscal Year"
338+msgstr "Ejercicio Fiscal"
339+
340+#. module: l10n_ar_vat_reports
341+#: selection:account.invoice.vat.report,filter:0
342+msgid "No Filters"
343+msgstr "No filtros"
344+
345+#. module: l10n_ar_vat_reports
346+#: selection:account.invoice.vat.report,output_type:0
347+msgid "Comma Separated Values (csv)"
348+msgstr "Valores separados por comas (csv)"
349+
350+#. module: l10n_ar_vat_reports
351+#: model:ir.actions.report.xml,name:l10n_ar_vat_reports.account_invoice_vat_report_report
352+#: model:ir.model,name:l10n_ar_vat_reports.model_account_invoice_vat_report
353+msgid "Account Invoice VAT Report"
354+msgstr "Reporte de Libro IVA"
355+
356+#. module: l10n_ar_vat_reports
357+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_action
358+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_menu
359+msgid "Sales VAT Report"
360+msgstr "Libro IVA Ventas"
361+
362+#. module: l10n_ar_vat_reports
363+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_action
364+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_menu
365+msgid "Purchases VAT Report"
366+msgstr "Libro IVA Compras"
367+
368+#. module: l10n_ar_vat_reports
369+#: view:account.invoice.vat.report:0
370+msgid "Filters"
371+msgstr "Filtros"
372+
373+#. module: l10n_ar_vat_reports
374+#: view:account.invoice.vat.report:0
375+msgid "Cancel"
376+msgstr "Cancelar"
377+
378+#. module: l10n_ar_vat_reports
379+#: field:account.invoice.vat.report,date_from:0
380+msgid "Start Date"
381+msgstr "Fecha inicial"
382+
383+#. module: l10n_ar_vat_reports
384+#: field:account.invoice.vat.report,filter:0
385+msgid "Filter by"
386+msgstr "Filtrar por"
387+
388+#. module: l10n_ar_vat_reports
389+#: view:account.invoice.vat.report:0
390+msgid "or"
391+msgstr "o"
392+
393
394=== added file 'l10n_ar_vat_reports/i18n/l10n_ar_vat_reports.pot'
395--- l10n_ar_vat_reports/i18n/l10n_ar_vat_reports.pot 1970-01-01 00:00:00 +0000
396+++ l10n_ar_vat_reports/i18n/l10n_ar_vat_reports.pot 2013-11-18 13:24:25 +0000
397@@ -0,0 +1,172 @@
398+# Translation of OpenERP Server.
399+# This file contains the translation of the following modules:
400+# * l10n_ar_vat_reports
401+#
402+msgid ""
403+msgstr ""
404+"Project-Id-Version: OpenERP Server 7.0\n"
405+"Report-Msgid-Bugs-To: \n"
406+"POT-Creation-Date: 2013-10-09 12:23+0000\n"
407+"PO-Revision-Date: 2013-10-09 12:23+0000\n"
408+"Last-Translator: <>\n"
409+"Language-Team: \n"
410+"MIME-Version: 1.0\n"
411+"Content-Type: text/plain; charset=UTF-8\n"
412+"Content-Transfer-Encoding: \n"
413+"Plural-Forms: \n"
414+
415+#. module: l10n_ar_vat_reports
416+#: selection:account.invoice.vat.report,output_type:0
417+msgid "Plain Text (txt)"
418+msgstr ""
419+
420+#. module: l10n_ar_vat_reports
421+#: view:account.invoice.vat.report:0
422+msgid "Print"
423+msgstr ""
424+
425+#. module: l10n_ar_vat_reports
426+#: field:account.invoice.vat.report,output_type:0
427+msgid "Report format"
428+msgstr ""
429+
430+#. module: l10n_ar_vat_reports
431+#: selection:account.invoice.vat.report,output_type:0
432+msgid "Excel Spreadsheet (xls)"
433+msgstr ""
434+
435+#. module: l10n_ar_vat_reports
436+#: help:account.invoice.vat.report,output_type:0
437+msgid "Choose the format for the output"
438+msgstr ""
439+
440+#. module: l10n_ar_vat_reports
441+#: field:account.invoice.vat.report,company_id:0
442+msgid "Company"
443+msgstr ""
444+
445+#. module: l10n_ar_vat_reports
446+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_taxes_reports_menu
447+msgid "Taxes Report"
448+msgstr ""
449+
450+#. module: l10n_ar_vat_reports
451+#: selection:account.invoice.vat.report,output_type:0
452+msgid "HyperText (html)"
453+msgstr ""
454+
455+#. module: l10n_ar_vat_reports
456+#: selection:account.invoice.vat.report,filter:0
457+msgid "Date"
458+msgstr ""
459+
460+#. module: l10n_ar_vat_reports
461+#: view:account.invoice.vat.report:0
462+#: field:account.invoice.vat.report,journal_ids:0
463+msgid "Journals"
464+msgstr ""
465+
466+#. module: l10n_ar_vat_reports
467+#: selection:account.invoice.vat.report,output_type:0
468+msgid "Rich Text (rtf)"
469+msgstr ""
470+
471+#. module: l10n_ar_vat_reports
472+#: view:account.invoice.vat.report:0
473+msgid "Report Options"
474+msgstr ""
475+
476+#. module: l10n_ar_vat_reports
477+#: view:account.invoice.vat.report:0
478+#: selection:account.invoice.vat.report,filter:0
479+msgid "Periods"
480+msgstr ""
481+
482+#. module: l10n_ar_vat_reports
483+#: field:account.invoice.vat.report,date_to:0
484+msgid "End Date"
485+msgstr ""
486+
487+#. module: l10n_ar_vat_reports
488+#: view:account.invoice.vat.report:0
489+msgid "Dates"
490+msgstr ""
491+
492+#. module: l10n_ar_vat_reports
493+#: field:account.invoice.vat.report,period_from:0
494+msgid "Start Period"
495+msgstr ""
496+
497+#. module: l10n_ar_vat_reports
498+#: selection:account.invoice.vat.report,output_type:0
499+msgid "Portable Document (pdf)"
500+msgstr ""
501+
502+#. module: l10n_ar_vat_reports
503+#: help:account.invoice.vat.report,fiscalyear_id:0
504+msgid "Keep empty for all open fiscal year"
505+msgstr ""
506+
507+#. module: l10n_ar_vat_reports
508+#: field:account.invoice.vat.report,period_to:0
509+msgid "End Period"
510+msgstr ""
511+
512+#. module: l10n_ar_vat_reports
513+#: field:account.invoice.vat.report,fiscalyear_id:0
514+msgid "Fiscal Year"
515+msgstr ""
516+
517+#. module: l10n_ar_vat_reports
518+#: selection:account.invoice.vat.report,filter:0
519+msgid "No Filters"
520+msgstr ""
521+
522+#. module: l10n_ar_vat_reports
523+#: selection:account.invoice.vat.report,output_type:0
524+msgid "Comma Separated Values (csv)"
525+msgstr ""
526+
527+#. module: l10n_ar_vat_reports
528+#: model:ir.actions.report.xml,name:l10n_ar_vat_reports.account_invoice_vat_report_report
529+#: model:ir.model,name:l10n_ar_vat_reports.model_account_invoice_vat_report
530+msgid "Account Invoice VAT Report"
531+msgstr ""
532+
533+#. module: l10n_ar_vat_reports
534+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_action
535+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_menu
536+msgid "Sales VAT Report"
537+msgstr ""
538+
539+#. module: l10n_ar_vat_reports
540+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_action
541+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_menu
542+msgid "Purchases VAT Report"
543+msgstr ""
544+
545+#. module: l10n_ar_vat_reports
546+#: view:account.invoice.vat.report:0
547+msgid "Filters"
548+msgstr ""
549+
550+#. module: l10n_ar_vat_reports
551+#: view:account.invoice.vat.report:0
552+msgid "Cancel"
553+msgstr ""
554+
555+#. module: l10n_ar_vat_reports
556+#: field:account.invoice.vat.report,date_from:0
557+msgid "Start Date"
558+msgstr ""
559+
560+#. module: l10n_ar_vat_reports
561+#: field:account.invoice.vat.report,filter:0
562+msgid "Filter by"
563+msgstr ""
564+
565+#. module: l10n_ar_vat_reports
566+#: view:account.invoice.vat.report:0
567+msgid "or"
568+msgstr ""
569+
570
571=== modified file 'l10n_ar_vat_reports/report/vat_report.prpt' (properties changed: -x to +x)
572Binary files l10n_ar_vat_reports/report/vat_report.prpt 2013-10-09 12:38:17 +0000 and l10n_ar_vat_reports/report/vat_report.prpt 2013-11-18 13:24:25 +0000 differ
573=== modified file 'l10n_ar_vat_reports/wizard/report_prompt.py'
574--- l10n_ar_vat_reports/wizard/report_prompt.py 2013-10-09 12:38:17 +0000
575+++ l10n_ar_vat_reports/wizard/report_prompt.py 2013-11-18 13:24:25 +0000
576@@ -10,6 +10,8 @@
577
578 from osv import osv, fields
579
580+from dateutil.relativedelta import relativedelta
581+
582 from tools import config
583 from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
584 from tools.translate import _
585@@ -18,6 +20,8 @@
586
587 model = 'account.invoice'
588 report_name = 'account_invoice_vat_report'
589+def get_date_length(date_format=DEFAULT_SERVER_DATE_FORMAT):
590+ return len((datetime.now()).strftime(date_format))
591
592 class account_invoice_vat_report(osv.osv_memory):
593
594@@ -77,7 +81,9 @@
595 if filter == 'filter_no':
596 res['value'] = {'period_from': False, 'period_to': False, 'date_from': False ,'date_to': False}
597 if filter == 'filter_date':
598- res['value'] = {'period_from': False, 'period_to': False, 'date_from': time.strftime('%Y-01-01'), 'date_to': time.strftime('%Y-%m-%d')}
599+ # res['value'] = {'period_from': False, 'period_to': False, 'date_from': time.strftime('%Y-01-01'), 'date_to': time.strftime('%Y-%m-%d')}
600+ res['value'] = {'period_from': False, 'period_to': False, 'date_from': datetime.strftime(date.today() + relativedelta(months=-1), '%Y-%m-01'), 'date_to': datetime.strftime(date.today() + relativedelta(day=1, days=-1), '%Y-%m-%d')}
601+
602 if filter == 'filter_period' and fiscalyear_id:
603 start_period = end_period = False
604 cr.execute('''
605@@ -109,9 +115,31 @@
606 'fiscalyear_id': _get_fiscalyear,
607 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice',context=c),
608 'journal_ids': _get_all_journal,
609- 'filter': 'filter_no',
610+ 'filter': 'filter_date',
611 }
612
613+ # This function was copied from server report_sxw.py
614+ def formatLang(self, cr, uid, value, context=None):
615+ if not str(value):
616+ return ''
617+
618+ pool_lang = self.pool.get('res.lang')
619+ lang = context.get('lang', 'en_US') or 'en_US'
620+ lang_ids = pool_lang.search(cr,uid,[('code','=',lang)])[0]
621+ lang_obj = pool_lang.browse(cr,uid,lang_ids)
622+ date_format = lang_obj.date_format
623+ parse_format = DEFAULT_SERVER_DATE_FORMAT
624+
625+ if isinstance(value, basestring):
626+ # FIXME: the trimming is probably unreliable if format includes day/month names
627+ # and those would need to be translated anyway.
628+ date = datetime.strptime(value[:get_date_length(parse_format)], parse_format)
629+ elif isinstance(value, time.struct_time):
630+ date = datetime(*value[:6])
631+ else:
632+ date = datetime(*value.timetuple()[:6])
633+ return date.strftime(date_format)
634+
635 def check_report(self, cr, uid, ids, context=None):
636
637 wizard = self.browse(cr, uid, ids[0], context=context)
638@@ -123,6 +151,9 @@
639 obj_model = self.pool.get(model)
640 filters = []
641
642+ #Range label (dates or periods)
643+ range_label = ''
644+
645 # Company
646 if wizard.company_id:
647 filters.append(('company_id','=', wizard.company_id.id))
648@@ -133,10 +164,12 @@
649 # # Period From
650 if wizard.period_from:
651 filters.append(('period_id.id','>=', wizard.period_from.id))
652+ range_label = 'Periodo ' + wizard.period_from.name
653
654 # # Period From
655 if wizard.period_to:
656 filters.append(('period_id.id','<=', wizard.period_to.id))
657+ range_label += ' hasta ' + wizard.period_to.name
658
659 # Journals
660 if wizard.journal_ids:
661@@ -145,17 +178,31 @@
662 # Date From
663 if wizard.date_from:
664 filters.append(('date_invoice','>=', wizard.date_from))
665+ range_label = 'Desde ' + self.formatLang(cr, uid, wizard.date_from, context)
666
667 # Date To
668 if wizard.date_to:
669 filters.append(('date_invoice','<=', wizard.date_to))
670+ range_label += ' hasta ' + self.formatLang(cr, uid, wizard.date_to, context)
671
672 model_ids = obj_model.search(cr, uid, filters, context=context)
673 if not model_ids:
674 raise osv.except_osv(_('No Data!'),
675 _('There is no data for current filters.'))
676+
677+ # Report Description
678+ report_type = context.get('report_type', False)
679+ if report_type == 'sale':
680+ report_description = 'Diario IVA Ventas'
681+ elif report_type == 'purchase':
682+ report_description = 'Diario IVA Compras'
683+
684+
685+
686+
687 data['ids'] = model_ids
688 data['model'] = model
689+ data['variables'] = {'report_description':report_description,'range_label':range_label}
690 data['output_type'] = wizard.output_type
691
692 return self._print_report(cr, uid, ids, data, context=context)

Subscribers

People subscribed via source and target branches