openerp-l10n-ar-localization team mailing list archive
-
openerp-l10n-ar-localization team
-
Mailing list archive
-
Message #00233
[Merge] lp:~sistemas-adhoc/openerp-l10n-ar-localization/trunk into lp:openerp-l10n-ar-localization
Juan José Scarafía has proposed merging lp:~sistemas-adhoc/openerp-l10n-ar-localization/trunk into lp:openerp-l10n-ar-localization.
Requested reviews:
Cristian Sebastian Rocha (cristian-rocha)
For more details, see:
https://code.launchpad.net/~sistemas-adhoc/openerp-l10n-ar-localization/trunk/+merge/195814
Basicamente:
MOD Move document_id and document_number form partner main form to accounting page
IMP add vat_reports translations
REM l10n_ar_reports_samples folder (es basura)
REM afip accounting user groups because there is no need to have them
REF move afip configuration menu to accounting configuration menu (nos pareció más prolijo y apropiado, también por un tema de permisos ya que account manager puede acceder a esto y no hace falta que le demos permiso a configuración del sistema)
IMP General improovements for vat report
RM Se borra el menu padre de cheques para mejorar usabilidad según buenos usos y prácticas de open, se evita desplegar dicho menu. Se remueve dependencial moudlo de debit notes (queda opciónal para quien lo desee usar)
--
https://code.launchpad.net/~sistemas-adhoc/openerp-l10n-ar-localization/trunk/+merge/195814
Your team OpenERP - Team de Localización Argentina is subscribed to branch lp:openerp-l10n-ar-localization.
=== modified file 'l10n_ar_account_check_duo/__openerp__.py'
--- l10n_ar_account_check_duo/__openerp__.py 2013-11-14 19:10:35 +0000
+++ l10n_ar_account_check_duo/__openerp__.py 2013-11-19 16:06:42 +0000
@@ -42,7 +42,6 @@
'demo': [],
'depends': [ 'account',
'account_voucher',
- 'l10n_ar_account_check_debit_note',
'report_webkit'],
'description': '\n\n \n\n This module provides to manage checks (issued and third) \n\n Add models of Issued Checks and Third Checks. (Accounting/Banck ans Cash/Checks/)\n\n Add options in Jorunals for using checks in vouchers.\n\n Add range of numbers for issued check (CheckBook).Accounting/configuration/Miscellaneous/CheckBooks.\n\n Add ticket deposit for third checks. Change states from Holding to deposited.(Accounting/Banck ans Cash/Checks/)\n\n \n\n\t\t',
'installable': True,
=== modified file 'l10n_ar_account_check_duo/account.py'
--- l10n_ar_account_check_duo/account.py 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/account.py 2013-11-19 16:06:42 +0000
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import osv, fields
class account_journal(osv.osv):
_name = 'account.journal'
=== modified file 'l10n_ar_account_check_duo/account_check_duo.py'
--- l10n_ar_account_check_duo/account_check_duo.py 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/account_check_duo.py 2013-11-19 16:06:42 +0000
@@ -19,11 +19,11 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import logging
import time
_logger = logging.getLogger(__name__)
-from tools.translate import _
+from openerp.tools.translate import _
from datetime import datetime
class account_issued_check(osv.osv):
=== modified file 'l10n_ar_account_check_duo/account_check_duo_view.xml'
--- l10n_ar_account_check_duo/account_check_duo_view.xml 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/account_check_duo_view.xml 2013-11-19 16:06:42 +0000
@@ -1,12 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
- <!-- crea el menu principal-->
-
- <menuitem id="menu_account_check" name="Checks" sequence="100"
- parent="account.menu_finance_bank_and_cash" />
-
+
<!-- Issued Check -->
<record model="ir.ui.view" id="view_account_issued_check_tree">
@@ -105,7 +100,8 @@
action="action_issued_check"
id="menu_treasury_issued_check"
name="Issued Checks"
- parent="menu_account_check"/>
+ sequence="40"
+ parent="account.menu_finance_bank_and_cash"/>
@@ -213,7 +209,8 @@
action="action_third_check"
id="menu_treasury_third_check"
name="Third Checks"
- parent="menu_account_check"/>
+ sequence="50"
+ parent="account.menu_finance_bank_and_cash"/>
</data>
</openerp>
=== modified file 'l10n_ar_account_check_duo/res_partner_bank.py'
--- l10n_ar_account_check_duo/res_partner_bank.py 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/res_partner_bank.py 2013-11-19 16:06:42 +0000
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner_bank(osv.osv):
=== modified file 'l10n_ar_account_check_duo/ticket_deposit_view.xml'
--- l10n_ar_account_check_duo/ticket_deposit_view.xml 2013-10-05 18:19:06 +0000
+++ l10n_ar_account_check_duo/ticket_deposit_view.xml 2013-11-19 16:06:42 +0000
@@ -64,7 +64,8 @@
action="action_ticket_deposit_menu"
id="menu_treasury_ticket_deposit"
name="Ticket Deposit"
- parent="menu_account_check"/>
+ sequence="60"
+ parent="account.menu_finance_bank_and_cash"/>
=== modified file 'l10n_ar_account_check_duo/wizard_issued/check_issued_hreject.py'
--- l10n_ar_account_check_duo/wizard_issued/check_issued_hreject.py 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/wizard_issued/check_issued_hreject.py 2013-11-19 16:06:42 +0000
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+from openerp import netsvc
class account_issuedcheck_hreject(osv.osv_memory):
=== modified file 'l10n_ar_account_check_duo/wizard_third/check_deposit.py'
--- l10n_ar_account_check_duo/wizard_third/check_deposit.py 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/wizard_third/check_deposit.py 2013-11-19 16:06:42 +0000
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+from openerp import netsvc
class account_check_deposit(osv.osv_memory):
_name = 'account.check.deposit'
=== modified file 'l10n_ar_account_check_duo/wizard_third/check_dreject.py'
--- l10n_ar_account_check_duo/wizard_third/check_dreject.py 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/wizard_third/check_dreject.py 2013-11-19 16:06:42 +0000
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+from openerp import netsvc
class account_check_dreject(osv.osv_memory):
=== modified file 'l10n_ar_account_check_duo/wizard_third/check_hreject.py'
--- l10n_ar_account_check_duo/wizard_third/check_hreject.py 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/wizard_third/check_hreject.py 2013-11-19 16:06:42 +0000
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+from openerp import netsvc
import logging
_logger = logging.getLogger(__name__)
=== modified file 'l10n_ar_account_check_duo/wizard_third/check_sold.py'
--- l10n_ar_account_check_duo/wizard_third/check_sold.py 2013-10-07 15:16:52 +0000
+++ l10n_ar_account_check_duo/wizard_third/check_sold.py 2013-11-19 16:06:42 +0000
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+from openerp import netsvc
import time
=== modified file 'l10n_ar_invoice/security/ir.model.access.csv'
--- l10n_ar_invoice/security/ir.model.access.csv 2013-10-24 10:09:58 +0000
+++ l10n_ar_invoice/security/ir.model.access.csv 2013-11-19 16:06:42 +0000
@@ -1,17 +1,17 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_afip_responsability_manager","afip.responsability.manager","model_afip_responsability","group_l10n_ar_invoice_admin",1,1,1,1
-"access_afip_responsability_user","afip.responsability.user","model_afip_responsability","group_l10n_ar_invoice_user",1,0,0,0
-"access_afip_responsability_relation_manager","afip.responsability_relation.manager","model_afip_responsability_relation","group_l10n_ar_invoice_admin",1,1,1,1
-"access_afip_responsability_relation_user","afip.responsability_relation.user","model_afip_responsability_relation","group_l10n_ar_invoice_user",1,0,0,0
-"access_afip_journal_class_manager","afip.journal_class.manager","model_afip_journal_class","group_l10n_ar_invoice_admin",1,1,1,1
-"access_afip_journal_class_user","afip.journal_class.user","model_afip_journal_class","group_l10n_ar_invoice_user",1,0,0,0
-"access_afip_document_type_manager","afip.document_type.manager","model_afip_document_type","group_l10n_ar_invoice_admin",1,1,1,1
-"access_afip_document_type_user","afip.document_type.user","model_afip_document_type","group_l10n_ar_invoice_user",1,0,0,0
-"access_afip_concept_type_manager","afip.concept_type.manager","model_afip_concept_type","group_l10n_ar_invoice_admin",1,1,1,1
-"access_afip_concept_type_user","afip.concept_type.user","model_afip_concept_type","group_l10n_ar_invoice_user",1,0,0,0
-"access_afip_document_class_manager","afip.document_class.manager","model_afip_document_class","group_l10n_ar_invoice_admin",1,1,1,1
-"access_afip_document_class_user","afip.document_class.user","model_afip_document_class","group_l10n_ar_invoice_user",1,0,0,0
-"access_afip_journal_template_manager","afip.journal_template.manager","model_afip_journal_template","group_l10n_ar_invoice_admin",1,1,1,1
-"access_afip_journal_template_user","afip.journal_template.user","model_afip_journal_template","group_l10n_ar_invoice_user",1,0,0,0
-"access_afip_optional_type_manager","afip.optional_type.manager","model_afip_optional_type","group_l10n_ar_invoice_admin",1,1,1,1
-"access_afip_optional_type_user","afip.optional_type.user","model_afip_optional_type","group_l10n_ar_invoice_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_afip_responsability_manager,afip.responsability.manager,model_afip_responsability,account.group_account_manager,1,1,1,1
+access_afip_responsability_user,afip.responsability.user,model_afip_responsability,,1,0,0,0
+access_afip_responsability_relation_manager,afip.responsability_relation.manager,model_afip_responsability_relation,account.group_account_manager,1,1,1,1
+access_afip_responsability_relation_user,afip.responsability_relation.user,model_afip_responsability_relation,,1,0,0,0
+access_afip_journal_class_manager,afip.journal_class.manager,model_afip_journal_class,account.group_account_manager,1,1,1,1
+access_afip_journal_class_user,afip.journal_class.user,model_afip_journal_class,,1,0,0,0
+access_afip_document_type_manager,afip.document_type.manager,model_afip_document_type,account.group_account_manager,1,1,1,1
+access_afip_document_type_user,afip.document_type.user,model_afip_document_type,,1,0,0,0
+access_afip_concept_type_manager,afip.concept_type.manager,model_afip_concept_type,account.group_account_manager,1,1,1,1
+access_afip_concept_type_user,afip.concept_type.user,model_afip_concept_type,,1,0,0,0
+access_afip_document_class_manager,afip.document_class.manager,model_afip_document_class,account.group_account_manager,1,1,1,1
+access_afip_document_class_user,afip.document_class.user,model_afip_document_class,,1,0,0,0
+access_afip_journal_template_manager,afip.journal_template.manager,model_afip_journal_template,account.group_account_manager,1,1,1,1
+access_afip_journal_template_user,afip.journal_template.user,model_afip_journal_template,,1,0,0,0
+access_afip_optional_type_manager,afip.optional_type.manager,model_afip_optional_type,account.group_account_manager,1,1,1,1
+access_afip_optional_type_user,afip.optional_type.user,model_afip_optional_type,,1,0,0,0
=== modified file 'l10n_ar_invoice/security/l10n_ar_invoice_security.xml'
--- l10n_ar_invoice/security/l10n_ar_invoice_security.xml 2013-09-19 21:20:14 +0000
+++ l10n_ar_invoice/security/l10n_ar_invoice_security.xml 2013-11-19 16:06:42 +0000
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <record id="group_l10n_ar_invoice_user" model="res.groups" context="{'noadmin':True}">
- <field name="name">Argentine Invoice User</field>
- <field name="category_id" ref="base.module_category_accounting_and_finance"/>
- <field name="implied_ids" eval="[(4, ref('account.group_account_invoice'))]"/>
- </record>
-
- <record id="group_l10n_ar_invoice_admin" model="res.groups">
- <field name="name">Argentine Invoice Manager</field>
- <field name="category_id" ref="base.module_category_accounting_and_finance"/>
- <field name="implied_ids" eval="[(4,ref('base.group_user'))]"/>
- </record>
</data>
</openerp>
=== modified file 'l10n_ar_invoice/view/afip_menuitem.xml'
--- l10n_ar_invoice/view/afip_menuitem.xml 2013-09-19 21:20:14 +0000
+++ l10n_ar_invoice/view/afip_menuitem.xml 2013-11-19 16:06:42 +0000
@@ -23,7 +23,7 @@
<openerp>
<data>
- <menuitem id="menu_afip_config" name="AFIP Configuration" parent="base.menu_config" sequence="30"/>
+ <menuitem id="menu_afip_config" name="AFIP Configuration" parent="account.menu_finance_configuration" sequence="25"/>
</data>
</openerp>
=== modified file 'l10n_ar_invoice/view/partner_view.xml'
--- l10n_ar_invoice/view/partner_view.xml 2013-10-26 17:13:19 +0000
+++ l10n_ar_invoice/view/partner_view.xml 2013-11-19 16:06:42 +0000
@@ -29,20 +29,14 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<data>
- <field name="parent_id" position="before">
- <group col="2">
- <label for="document_type_id" colspan="1" class="oe_edit_only"/>
- <label for="document_number" colspan="1" class="oe_edit_only"/>
- <field name="document_type_id" nolabel="1" colspan="1"
- on_change="onchange_document(vat,document_type_id,document_number)"/>
- <field name="document_number" nolabel="1" colspan="1"
- on_change="onchange_document(vat,document_type_id,document_number)"/>
- </group>
- </field>
<field name="property_account_position" position="before">
<field name="responsability_id" widget="selection"/>
<field name="iibb"/>
<field name="start_date"/>
+ <field name="document_type_id" colspan="1"
+ on_change="onchange_document(vat,document_type_id,document_number)"/>
+ <field name="document_number" colspan="1"
+ on_change="onchange_document(vat,document_type_id,document_number)"/>
</field>
</data>
</field>
=== removed directory 'l10n_ar_reports_samples'
=== modified file 'l10n_ar_vat_reports/__openerp__.py'
--- l10n_ar_vat_reports/__openerp__.py 2013-11-14 19:10:35 +0000
+++ l10n_ar_vat_reports/__openerp__.py 2013-11-19 16:06:42 +0000
@@ -1,11 +1,22 @@
# v7.0 - Beta.
-{ 'active': False,
+{
+ "name": "Argentina VAT Reports",
+ "description": """
+Argentina VAT Reports
+=====================
+Creates Sale and Purchase VAT report menus in "accounting/reporting/taxes report"
+
+It requires pentaho_reports module, you can find it in https://github.com/WillowIT/Pentaho-reports-for-OpenERP
+ """,
+ "version": "0.1",
'author': 'Sistemas ADHOC',
- 'category': 'Reporting subsystems',
- 'data': ['wizard/report_prompt.xml', 'report/report_data.xml'],
- 'depends': ['account', 'pentaho_reports'],
- '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 ',
- 'installable': True,
- 'name': 'Pentaho res.partner report sample',
- 'version': '0.226',
- 'website': 'http://www.sistemasadhoc.com.ar'}
+ 'website': 'http://www.sistemasadhoc.com.ar',
+ "depends": ["pentaho_reports", "l10n_ar_invoice"],
+ "category": "Reporting subsystems",
+ "data": [
+ 'wizard/report_prompt.xml',
+ 'report/report_data.xml',
+ ],
+ "installable": True,
+ "active": False
+}
=== added directory 'l10n_ar_vat_reports/i18n'
=== added file 'l10n_ar_vat_reports/i18n/es.po'
--- l10n_ar_vat_reports/i18n/es.po 1970-01-01 00:00:00 +0000
+++ l10n_ar_vat_reports/i18n/es.po 2013-11-19 16:06:42 +0000
@@ -0,0 +1,173 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * l10n_ar_vat_reports
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-09 12:24+0000\n"
+"PO-Revision-Date: 2013-10-09 09:27-0300\n"
+"Last-Translator: Juan Jose Scarafia <scarafia.juanjose@xxxxxxxxx>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Plain Text (txt)"
+msgstr "Texto Pleno (txt)"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,output_type:0
+msgid "Report format"
+msgstr "Formato del reporte"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Excel Spreadsheet (xls)"
+msgstr "Hoja de cálculo Excel (xls)"
+
+#. module: l10n_ar_vat_reports
+#: help:account.invoice.vat.report,output_type:0
+msgid "Choose the format for the output"
+msgstr "Elija el formato para la salida"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_ar_vat_reports
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_taxes_reports_menu
+msgid "Taxes Report"
+msgstr "Informe Impuestos"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "HyperText (html)"
+msgstr "Hipertexto (html)"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,filter:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+#: field:account.invoice.vat.report,journal_ids:0
+msgid "Journals"
+msgstr "Diarios"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Rich Text (rtf)"
+msgstr "Texto enriquecido (RTF)"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Report Options"
+msgstr "Opciones de Informe"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+#: selection:account.invoice.vat.report,filter:0
+msgid "Periods"
+msgstr "Períodos"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,date_to:0
+msgid "End Date"
+msgstr "Fecha de Finalización"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,period_from:0
+msgid "Start Period"
+msgstr "Período inicial"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Portable Document (pdf)"
+msgstr "Documento Portable (pdf)"
+
+#. module: l10n_ar_vat_reports
+#: help:account.invoice.vat.report,fiscalyear_id:0
+msgid "Keep empty for all open fiscal year"
+msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,period_to:0
+msgid "End Period"
+msgstr "Período final"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Ejercicio Fiscal"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,filter:0
+msgid "No Filters"
+msgstr "No filtros"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Comma Separated Values (csv)"
+msgstr "Valores separados por comas (csv)"
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.report.xml,name:l10n_ar_vat_reports.account_invoice_vat_report_report
+#: model:ir.model,name:l10n_ar_vat_reports.model_account_invoice_vat_report
+msgid "Account Invoice VAT Report"
+msgstr "Reporte de Libro IVA"
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_action
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_menu
+msgid "Sales VAT Report"
+msgstr "Libro IVA Ventas"
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_action
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_menu
+msgid "Purchases VAT Report"
+msgstr "Libro IVA Compras"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,filter:0
+msgid "Filter by"
+msgstr "Filtrar por"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "or"
+msgstr "o"
+
=== added file 'l10n_ar_vat_reports/i18n/es_AR.po'
--- l10n_ar_vat_reports/i18n/es_AR.po 1970-01-01 00:00:00 +0000
+++ l10n_ar_vat_reports/i18n/es_AR.po 2013-11-19 16:06:42 +0000
@@ -0,0 +1,173 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * l10n_ar_vat_reports
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-09 12:24+0000\n"
+"PO-Revision-Date: 2013-10-09 09:27-0300\n"
+"Last-Translator: Juan Jose Scarafia <scarafia.juanjose@xxxxxxxxx>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Plain Text (txt)"
+msgstr "Texto Pleno (txt)"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,output_type:0
+msgid "Report format"
+msgstr "Formato del reporte"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Excel Spreadsheet (xls)"
+msgstr "Hoja de cálculo Excel (xls)"
+
+#. module: l10n_ar_vat_reports
+#: help:account.invoice.vat.report,output_type:0
+msgid "Choose the format for the output"
+msgstr "Elija el formato para la salida"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_ar_vat_reports
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_taxes_reports_menu
+msgid "Taxes Report"
+msgstr "Informe Impuestos"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "HyperText (html)"
+msgstr "Hipertexto (html)"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,filter:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+#: field:account.invoice.vat.report,journal_ids:0
+msgid "Journals"
+msgstr "Diarios"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Rich Text (rtf)"
+msgstr "Texto enriquecido (RTF)"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Report Options"
+msgstr "Opciones de Informe"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+#: selection:account.invoice.vat.report,filter:0
+msgid "Periods"
+msgstr "Períodos"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,date_to:0
+msgid "End Date"
+msgstr "Fecha de Finalización"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,period_from:0
+msgid "Start Period"
+msgstr "Período inicial"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Portable Document (pdf)"
+msgstr "Documento Portable (pdf)"
+
+#. module: l10n_ar_vat_reports
+#: help:account.invoice.vat.report,fiscalyear_id:0
+msgid "Keep empty for all open fiscal year"
+msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,period_to:0
+msgid "End Period"
+msgstr "Período final"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Ejercicio Fiscal"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,filter:0
+msgid "No Filters"
+msgstr "No filtros"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Comma Separated Values (csv)"
+msgstr "Valores separados por comas (csv)"
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.report.xml,name:l10n_ar_vat_reports.account_invoice_vat_report_report
+#: model:ir.model,name:l10n_ar_vat_reports.model_account_invoice_vat_report
+msgid "Account Invoice VAT Report"
+msgstr "Reporte de Libro IVA"
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_action
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_menu
+msgid "Sales VAT Report"
+msgstr "Libro IVA Ventas"
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_action
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_menu
+msgid "Purchases VAT Report"
+msgstr "Libro IVA Compras"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,filter:0
+msgid "Filter by"
+msgstr "Filtrar por"
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "or"
+msgstr "o"
+
=== added file 'l10n_ar_vat_reports/i18n/l10n_ar_vat_reports.pot'
--- l10n_ar_vat_reports/i18n/l10n_ar_vat_reports.pot 1970-01-01 00:00:00 +0000
+++ l10n_ar_vat_reports/i18n/l10n_ar_vat_reports.pot 2013-11-19 16:06:42 +0000
@@ -0,0 +1,172 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * l10n_ar_vat_reports
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-09 12:23+0000\n"
+"PO-Revision-Date: 2013-10-09 12:23+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Plain Text (txt)"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,output_type:0
+msgid "Report format"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Excel Spreadsheet (xls)"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: help:account.invoice.vat.report,output_type:0
+msgid "Choose the format for the output"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_taxes_reports_menu
+msgid "Taxes Report"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "HyperText (html)"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,filter:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+#: field:account.invoice.vat.report,journal_ids:0
+msgid "Journals"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Rich Text (rtf)"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+#: selection:account.invoice.vat.report,filter:0
+msgid "Periods"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Dates"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,period_from:0
+msgid "Start Period"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Portable Document (pdf)"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: help:account.invoice.vat.report,fiscalyear_id:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,period_to:0
+msgid "End Period"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,filter:0
+msgid "No Filters"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: selection:account.invoice.vat.report,output_type:0
+msgid "Comma Separated Values (csv)"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.report.xml,name:l10n_ar_vat_reports.account_invoice_vat_report_report
+#: model:ir.model,name:l10n_ar_vat_reports.model_account_invoice_vat_report
+msgid "Account Invoice VAT Report"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_action
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_sale_vat_report_menu
+msgid "Sales VAT Report"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: model:ir.actions.act_window,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_action
+#: model:ir.ui.menu,name:l10n_ar_vat_reports.account_invoice_purchase_vat_report_menu
+msgid "Purchases VAT Report"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Filters"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: field:account.invoice.vat.report,filter:0
+msgid "Filter by"
+msgstr ""
+
+#. module: l10n_ar_vat_reports
+#: view:account.invoice.vat.report:0
+msgid "or"
+msgstr ""
+
=== modified file 'l10n_ar_vat_reports/report/vat_report.prpt' (properties changed: -x to +x)
Binary 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-19 16:06:42 +0000 differ
=== modified file 'l10n_ar_vat_reports/wizard/report_prompt.py'
--- l10n_ar_vat_reports/wizard/report_prompt.py 2013-10-09 12:38:17 +0000
+++ l10n_ar_vat_reports/wizard/report_prompt.py 2013-11-19 16:06:42 +0000
@@ -10,6 +10,8 @@
from osv import osv, fields
+from dateutil.relativedelta import relativedelta
+
from tools import config
from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
from tools.translate import _
@@ -18,6 +20,8 @@
model = 'account.invoice'
report_name = 'account_invoice_vat_report'
+def get_date_length(date_format=DEFAULT_SERVER_DATE_FORMAT):
+ return len((datetime.now()).strftime(date_format))
class account_invoice_vat_report(osv.osv_memory):
@@ -77,7 +81,9 @@
if filter == 'filter_no':
res['value'] = {'period_from': False, 'period_to': False, 'date_from': False ,'date_to': False}
if filter == 'filter_date':
- res['value'] = {'period_from': False, 'period_to': False, 'date_from': time.strftime('%Y-01-01'), 'date_to': time.strftime('%Y-%m-%d')}
+ # res['value'] = {'period_from': False, 'period_to': False, 'date_from': time.strftime('%Y-01-01'), 'date_to': time.strftime('%Y-%m-%d')}
+ 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')}
+
if filter == 'filter_period' and fiscalyear_id:
start_period = end_period = False
cr.execute('''
@@ -109,9 +115,31 @@
'fiscalyear_id': _get_fiscalyear,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice',context=c),
'journal_ids': _get_all_journal,
- 'filter': 'filter_no',
+ 'filter': 'filter_date',
}
+ # This function was copied from server report_sxw.py
+ def formatLang(self, cr, uid, value, context=None):
+ if not str(value):
+ return ''
+
+ pool_lang = self.pool.get('res.lang')
+ lang = context.get('lang', 'en_US') or 'en_US'
+ lang_ids = pool_lang.search(cr,uid,[('code','=',lang)])[0]
+ lang_obj = pool_lang.browse(cr,uid,lang_ids)
+ date_format = lang_obj.date_format
+ parse_format = DEFAULT_SERVER_DATE_FORMAT
+
+ if isinstance(value, basestring):
+ # FIXME: the trimming is probably unreliable if format includes day/month names
+ # and those would need to be translated anyway.
+ date = datetime.strptime(value[:get_date_length(parse_format)], parse_format)
+ elif isinstance(value, time.struct_time):
+ date = datetime(*value[:6])
+ else:
+ date = datetime(*value.timetuple()[:6])
+ return date.strftime(date_format)
+
def check_report(self, cr, uid, ids, context=None):
wizard = self.browse(cr, uid, ids[0], context=context)
@@ -123,6 +151,9 @@
obj_model = self.pool.get(model)
filters = []
+ #Range label (dates or periods)
+ range_label = ''
+
# Company
if wizard.company_id:
filters.append(('company_id','=', wizard.company_id.id))
@@ -133,10 +164,12 @@
# # Period From
if wizard.period_from:
filters.append(('period_id.id','>=', wizard.period_from.id))
+ range_label = 'Periodo ' + wizard.period_from.name
# # Period From
if wizard.period_to:
filters.append(('period_id.id','<=', wizard.period_to.id))
+ range_label += ' hasta ' + wizard.period_to.name
# Journals
if wizard.journal_ids:
@@ -145,17 +178,31 @@
# Date From
if wizard.date_from:
filters.append(('date_invoice','>=', wizard.date_from))
+ range_label = 'Desde ' + self.formatLang(cr, uid, wizard.date_from, context)
# Date To
if wizard.date_to:
filters.append(('date_invoice','<=', wizard.date_to))
+ range_label += ' hasta ' + self.formatLang(cr, uid, wizard.date_to, context)
model_ids = obj_model.search(cr, uid, filters, context=context)
if not model_ids:
raise osv.except_osv(_('No Data!'),
_('There is no data for current filters.'))
+
+ # Report Description
+ report_type = context.get('report_type', False)
+ if report_type == 'sale':
+ report_description = 'Diario IVA Ventas'
+ elif report_type == 'purchase':
+ report_description = 'Diario IVA Compras'
+
+
+
+
data['ids'] = model_ids
data['model'] = model
+ data['variables'] = {'report_description':report_description,'range_label':range_label}
data['output_type'] = wizard.output_type
return self._print_report(cr, uid, ids, data, context=context)
Follow ups
