openerp-l10n-ar-localization team mailing list archive
-
openerp-l10n-ar-localization team
-
Mailing list archive
-
Message #00269
[Merge] lp:~sistemas-adhoc/openerp-l10n-ar-localization/merge-trunk into lp:openerp-l10n-ar-localization
Juan José Scarafía has proposed merging lp:~sistemas-adhoc/openerp-l10n-ar-localization/merge-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/merge-trunk/+merge/201075
---------------
Nuevo merge proposal que reemplaza el anterior https://code.launchpad.net/~sistemas-adhoc/openerp-l10n-ar-localization/trunk/+merge/200123
MODIFICACIONES
PARTE 1
Agregado de un modulo sencillo para gestionar las debit notes. Es super simple como funciona y resolvería le necesidad.
Arreglos y mejoras al libro de iva ventas y compras (capacidad de numeración correlativa, titulos y demás)
Arreglos al plan contable
Agregados dos modulos de instalación automática (cuando las dependencias se satisfacen) que elijen el diario automáticamente según la responsbilidad del partner y de la compañía. Esto se hizo desde las ordenes de venta y desde los picking.
TODO: en account_invoice, al cambiar el partner, hay un onchange que elije el jorunal correcto según las posiciones fiscales y también cambia el dominio de journal_id para que muestre solo los diarios que podrían utilizarse. El problema es que cuando la invoice se crea mediante un método, se está eligiendo el diario correcto pero no se esta modificando el dominio de journal_id. No se como realizarlo. Intenté poner un campo function tipo m2m o o2m donde mostraba los journas correctos y luego una restricción de dominio en journal tipo domain="[('id','in', campo_con_journals)]" pero no me funcionó. Alguna idea?
PARTE 2
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/merge-trunk/+merge/201075
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 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/__openerp__.py 2014-01-09 18:49:12 +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 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/account.py 2014-01-09 18:49:12 +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 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/account_check_duo.py 2014-01-09 18:49:12 +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 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/account_check_duo_view.xml 2014-01-09 18:49:12 +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 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/res_partner_bank.py 2014-01-09 18:49:12 +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 2014-01-09 18:49:12 +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 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/wizard_issued/check_issued_hreject.py 2014-01-09 18:49:12 +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):
@@ -131,7 +131,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': wizard.reject_date,
'debit': wizard.expense_amount,
'credit': 0.0,
'ref': 'Check Rejected Hand Nr. ' + check.number,
@@ -145,7 +144,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': wizard.reject_date,
'debit': 0.0,
'credit': wizard.expense_amount,
'ref': 'Check Rejected Hand Nr. ' + check.number,
=== modified file 'l10n_ar_account_check_duo/wizard_third/check_deposit.py'
--- l10n_ar_account_check_duo/wizard_third/check_deposit.py 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/wizard_third/check_deposit.py 2014-01-09 18:49:12 +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'
@@ -81,7 +81,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': check.date,
'debit': check.amount,
'credit': 0.0,
'ref': 'Check Deposit Nr. ' + check.number,
@@ -94,7 +93,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': check.date,
'debit': 0.0,
'credit': check.amount,
'ref': 'Check Deposit Nr. ' + check.number,
=== modified file 'l10n_ar_account_check_duo/wizard_third/check_dreject.py'
--- l10n_ar_account_check_duo/wizard_third/check_dreject.py 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/wizard_third/check_dreject.py 2014-01-09 18:49:12 +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):
@@ -126,7 +126,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': wizard.reject_date,
'debit': wizard.expense_amount,
'credit': 0.0,
'ref': 'Check Dep Reject Nr. ' + check.number,
@@ -140,7 +139,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': wizard.reject_date,
'debit': 0.0,
'credit': wizard.expense_amount,
'ref': 'Check Dep Reject Nr. ' + check.number,
=== modified file 'l10n_ar_account_check_duo/wizard_third/check_hreject.py'
--- l10n_ar_account_check_duo/wizard_third/check_hreject.py 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/wizard_third/check_hreject.py 2014-01-09 18:49:12 +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__)
@@ -181,7 +181,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': wizard.reject_date,
'debit': wizard.expense_amount,
'credit': 0.0,
'ref': 'Check Rejected Hand Nr. ' + check.number,
@@ -195,7 +194,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': wizard.reject_date,
'debit': 0.0,
'credit': wizard.expense_amount,
'ref': 'Check Rejected Hand Nr. ' + check.number,
=== modified file 'l10n_ar_account_check_duo/wizard_third/check_sold.py'
--- l10n_ar_account_check_duo/wizard_third/check_sold.py 2014-01-09 15:19:22 +0000
+++ l10n_ar_account_check_duo/wizard_third/check_sold.py 2014-01-09 18:49:12 +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
@@ -102,7 +102,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': wizard.sold_date,
'debit': check.amount - wizard.expense_amount,
'credit': 0.0,
'ref': 'Check Sold Nr. ' + check.number,
@@ -116,7 +115,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': wizard.sold_date,
'debit': 0.0,
'credit':check.amount,
'ref': 'Check Sold Nr. ' + check.number,
=== modified file 'l10n_ar_account_check_duo/wizard_third/ticket_check_deposit.py'
--- l10n_ar_account_check_duo/wizard_third/ticket_check_deposit.py 2013-10-05 18:19:06 +0000
+++ l10n_ar_account_check_duo/wizard_third/ticket_check_deposit.py 2014-01-09 18:49:12 +0000
@@ -153,7 +153,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': check.date,
'debit': check.amount,
'credit': 0.0,
'ref': 'Check Deposit Nr. ' + check.number,
@@ -166,7 +165,6 @@
'move_id': move_id,
'journal_id': check.voucher_id.journal_id.id,
'period_id': period_id,
- 'date': check.date,
'debit': 0.0,
'credit': check.amount,
'ref': 'Check Deposit Nr. ' + check.number,
=== modified file 'l10n_ar_chart_generic/data/account_chart_respinsc.xml'
--- l10n_ar_chart_generic/data/account_chart_respinsc.xml 2013-11-05 18:20:01 +0000
+++ l10n_ar_chart_generic/data/account_chart_respinsc.xml 2014-01-09 18:49:12 +0000
@@ -32,7 +32,7 @@
<record model="account.account.template" id="ri_activo">
<field name="type">view</field>
- <field name="code">1*</field>
+ <field name="code">1</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">ACTIVO</field>
<field name="parent_id" ref="ri_a_root"/>
@@ -40,7 +40,7 @@
<record model="account.account.template" id="ri_activo_corriente">
<field name="type">view</field>
- <field name="code">11*</field>
+ <field name="code">11</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">ACTIVO CORRIENTE</field>
<field name="parent_id" ref="ri_activo"/>
@@ -48,184 +48,176 @@
<record model="account.account.template" id="ri_disponibilidades">
<field name="type">view</field>
- <field name="code">111*</field>
+ <field name="code">111</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">DISPONIBILIDADES</field>
<field name="parent_id" ref="ri_activo_corriente"/>
</record>
+ <record model="account.account.template" id="ri_caja">
+ <field name="type">view</field>
+ <field name="code">1111</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">CAJAS</field>
+ <field name="parent_id" ref="ri_disponibilidades"/>
+ </record>
+
<record model="account.account.template" id="ri_caja_pesos">
- <field name="type">other</field>
- <field name="code">11101</field>
+ <field name="type">liquidity</field>
+ <field name="code">1111010</field>
<field name="user_type" ref="account.data_account_type_cash"/>
<field name="name">Caja pesos</field>
- <field name="parent_id" ref="ri_disponibilidades"/>
+ <field name="parent_id" ref="ri_caja"/>
</record>
<record model="account.account.template" id="ri_caja_monex">
- <field name="type">other</field>
- <field name="code">11102</field>
+ <field name="type">liquidity</field>
+ <field name="code">1111020</field>
<field name="user_type" ref="account.data_account_type_cash"/>
<field name="name">Caja Monex</field>
- <field name="parent_id" ref="ri_disponibilidades"/>
+ <field name="parent_id" ref="ri_caja"/>
</record>
<record model="account.account.template" id="ri_fondo_fijo">
- <field name="type">other</field>
- <field name="code">11103</field>
+ <field name="type">liquidity</field>
+ <field name="code">1111030</field>
<field name="user_type" ref="account.data_account_type_cash"/>
<field name="name">Fondo fijo</field>
+ <field name="parent_id" ref="ri_caja"/>
+ </record>
+
+ <record model="account.account.template" id="ri_valores">
+ <field name="type">liquidity</field>
+ <field name="code">1111040</field>
+ <field name="user_type" ref="data_account_type_check"/>
+ <field name="name">Valores en cartera</field>
+ <field name="parent_id" ref="ri_caja"/>
+ </record>
+
+ <record model="account.account.template" id="ri_bancos">
+ <field name="type">view</field>
+ <field name="code">1112</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">BANCOS</field>
<field name="parent_id" ref="ri_disponibilidades"/>
- </record>
+ </record>
- <record model="account.account.template" id="ri_banco">
- <field name="type">other</field>
- <field name="code">11104</field>
+ <record model="account.account.template" id="ri_banco_1">
+ <field name="type">liquidity</field>
+ <field name="code">1112010</field>
<field name="user_type" ref="account.data_account_type_bank"/>
- <field name="name">Banco</field>
- <field name="parent_id" ref="ri_disponibilidades"/>
- </record>
-
- <record model="account.account.template" id="ri_valores_a_depositar">
- <field name="type">liquidity</field>
- <field name="code">11105</field>
- <field name="user_type" ref="data_account_type_check"/>
- <field name="name">Valores a depositar</field>
- <field name="parent_id" ref="ri_disponibilidades"/>
- </record>
-
- <record model="account.account.template" id="ri_creditos">
+ <field name="name">Banco x cuenta corriente xxxxx</field>
+ <field name="parent_id" ref="ri_bancos"/>
+ </record>
+
+ <record model="account.account.template" id="ri_creditos_comerciales">
<field name="type">view</field>
- <field name="code">113*</field>
+ <field name="code">112</field>
<field name="user_type" ref="account.data_account_type_view"/>
- <field name="name">CRÉDITOS</field>
+ <field name="name">CRÉDITOS COMERCIALES</field>
<field name="parent_id" ref="ri_activo_corriente"/>
</record>
<record model="account.account.template" id="ri_deudores_por_ventas">
<field name="type">receivable</field>
- <field name="code">11301</field>
+ <field name="code">1120010</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Deudores por ventas</field>
- <field name="parent_id" ref="ri_creditos"/>
- <field name="reconcile" eval="True"/>
+ <field name="parent_id" ref="ri_creditos_comerciales"/>
+ <field name="reconcile" eval="True"/>
</record>
<record model="account.account.template" id="ri_deudores_morosos">
<field name="type">receivable</field>
- <field name="code">11302</field>
+ <field name="code">1120020</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Deudores morosos</field>
- <field name="parent_id" ref="ri_creditos"/>
+ <field name="parent_id" ref="ri_creditos_comerciales"/>
</record>
<record model="account.account.template" id="ri_otros_creditos">
<field name="type">view</field>
- <field name="code">114*</field>
+ <field name="code">113</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">OTROS CRÉDITOS</field>
<field name="parent_id" ref="ri_activo_corriente"/>
</record>
+ <record model="account.account.template" id="ri_deudores_morosos">
+ <field name="type">receivable</field>
+ <field name="code">1130010</field>
+ <field name="user_type" ref="account.data_account_type_receivable"/>
+ <field name="name">Deudores varios</field>
+ <field name="parent_id" ref="ri_otros_creditos"/>
+ </record>
+
<record model="account.account.template" id="ri_creditos_impuestos">
<field name="type">view</field>
- <field name="code">1144*</field>
+ <field name="code">114</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">CRÉDITOS POR IMPUESTOS</field>
- <field name="parent_id" ref="ri_otros_creditos"/>
- </record>
-
- <record model="account.account.template" id="ri_creditos_ganancias_sociedades">
- <field name="type">view</field>
- <field name="code">11440010*</field>
- <field name="user_type" ref="account.data_account_type_view"/>
- <field name="name">GANANCIAS SOCIEDADES</field>
- <field name="parent_id" ref="ri_creditos_impuestos"/>
- </record>
-
- <record model="account.account.template" id="ri_retencion_impuestos_ganancias_sociedades">
- <field name="type">receivable</field>
- <field name="code">1144001010</field>
- <field name="user_type" ref="account.data_account_type_receivable"/>
- <field name="name">Retención impuestos a las ganancias sociedades</field>
- <field name="parent_id" ref="ri_creditos_ganancias_sociedades"/>
- </record>
-
- <record model="account.account.template" id="ri_anticipo_impuestos_ganancias_sociedades">
- <field name="type">receivable</field>
- <field name="code">1144001020</field>
- <field name="user_type" ref="account.data_account_type_receivable"/>
- <field name="name">Anticipo impuestos a las ganancias sociedades</field>
- <field name="parent_id" ref="ri_creditos_ganancias_sociedades"/>
- </record>
-
- <record model="account.account.template" id="ri_saldo_favorable_ing_ganancias_sociedades">
- <field name="type">receivable</field>
- <field name="code">1144001030</field>
- <field name="user_type" ref="account.data_account_type_receivable"/>
- <field name="name">Saldo a favor ingresos a las ganancias sociedades</field>
- <field name="parent_id" ref="ri_creditos_ganancias_sociedades"/>
- </record>
-
- <record model="account.account.template" id="ri_creditos_ganancias_personas">
- <field name="type">view</field>
- <field name="code">11440011*</field>
- <field name="user_type" ref="account.data_account_type_view"/>
- <field name="name">GANANCIAS PERSONAS FISICAS</field>
- <field name="parent_id" ref="ri_creditos_impuestos"/>
- </record>
-
- <record model="account.account.template" id="ri_retencion_impuestos_ganancias_personas">
- <field name="type">receivable</field>
- <field name="code">1144001110</field>
- <field name="user_type" ref="account.data_account_type_receivable"/>
- <field name="name">Retención impuestos a las ganancias p. fisicas</field>
- <field name="parent_id" ref="ri_creditos_ganancias_personas"/>
- </record>
-
- <record model="account.account.template" id="ri_anticipo_impuestos_ganancias_personas">
- <field name="type">receivable</field>
- <field name="code">1144001120</field>
- <field name="user_type" ref="account.data_account_type_receivable"/>
- <field name="name">Anticipo impuestos a las ganancias p. fisicas</field>
- <field name="parent_id" ref="ri_creditos_ganancias_personas"/>
- </record>
-
- <record model="account.account.template" id="ri_saldo_favorable_ing_ganancias_personas">
- <field name="type">receivable</field>
- <field name="code">1144001130</field>
- <field name="user_type" ref="account.data_account_type_receivable"/>
- <field name="name">Saldo a favor ingresos a las ganancias sociedades</field>
- <field name="parent_id" ref="ri_creditos_ganancias_personas"/>
- </record>
-
- <record model="account.account.template" id="ri_credito_iva">
- <field name="type">view</field>
- <field name="code">11440030*</field>
- <field name="user_type" ref="account.data_account_type_view"/>
- <field name="name">IMPUESTO AL VALOR AGREGADO</field>
- <field name="parent_id" ref="ri_creditos_impuestos"/>
- </record>
+ <field name="parent_id" ref="ri_activo_corriente"/>
+ </record>
+
+ <record model="account.account.template" id="ri_creditos_impuestos_ganancias">
+ <field name="type">view</field>
+ <field name="code">1141</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">GANANCIAS</field>
+ <field name="parent_id" ref="ri_creditos_impuestos"/>
+ </record>
+
+ <record model="account.account.template" id="ri_retencion_impuestos_ganancias">
+ <field name="type">other</field>
+ <field name="code">1141010</field>
+ <field name="user_type" ref="account.data_account_type_receivable"/>
+ <field name="name">Retención impuestos a las ganancias</field>
+ <field name="parent_id" ref="ri_creditos_impuestos_ganancias"/>
+ </record>
+
+ <record model="account.account.template" id="ri_anticipo_impuestos_ganancias">
+ <field name="type">other</field>
+ <field name="code">1141020</field>
+ <field name="user_type" ref="account.data_account_type_receivable"/>
+ <field name="name">Anticipo impuestos a las ganancias</field>
+ <field name="parent_id" ref="ri_creditos_impuestos_ganancias"/>
+ </record>
+
+ <record model="account.account.template" id="ri_creditos_impuestos_iva">
+ <field name="type">view</field>
+ <field name="code">1142</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">IVA</field>
+ <field name="parent_id" ref="ri_creditos_impuestos"/>
+ </record>
<record model="account.account.template" id="ri_iva_credito_fiscal">
<field name="type">other</field>
- <field name="code">1144003040</field>
+ <field name="code">1142010</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">IVA crédito fiscal</field>
- <field name="parent_id" ref="ri_credito_iva"/>
+ <field name="parent_id" ref="ri_creditos_impuestos_iva"/>
+ </record>
+
+ <record model="account.account.template" id="ri_iva_percepcion">
+ <field name="type">other</field>
+ <field name="code">1142020</field>
+ <field name="user_type" ref="account.data_account_type_receivable"/>
+ <field name="name">Percepciones IVA</field>
+ <field name="parent_id" ref="ri_creditos_impuestos_iva"/>
</record>
<record model="account.account.template" id="ri_iva_retencion">
- <field name="type">receivable</field>
- <field name="code">1144003099</field>
+ <field name="type">other</field>
+ <field name="code">1142030</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Retención IVA</field>
- <field name="parent_id" ref="ri_credito_iva"/>
+ <field name="parent_id" ref="ri_creditos_impuestos_iva"/>
</record>
<record model="account.account.template" id="ri_creditos_iibb">
<field name="type">view</field>
- <field name="code">11440099*</field>
+ <field name="code">1143</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">INGRESOS BRUTOS</field>
<field name="parent_id" ref="ri_creditos_impuestos"/>
@@ -233,23 +225,23 @@
<record model="account.account.template" id="ri_creditos_iibb_cf">
<field name="type">view</field>
- <field name="code">1144009900*</field>
+ <field name="code">114310</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">INGRESOS BRUTOS CAPITAL FEDERAL</field>
<field name="parent_id" ref="ri_creditos_iibb"/>
</record>
<record model="account.account.template" id="ri_percepcion_iibb_cf">
- <field name="type">receivable</field>
- <field name="code">114400990010</field>
+ <field name="type">other</field>
+ <field name="code">1143101</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Percepciones ingresos brutos capital federal</field>
<field name="parent_id" ref="ri_creditos_iibb_cf"/>
</record>
<record model="account.account.template" id="ri_retencion_iibb_cf">
- <field name="type">receivable</field>
- <field name="code">114400990020</field>
+ <field name="type">other</field>
+ <field name="code">1143102</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Retención ingresos brutos capital federal</field>
<field name="parent_id" ref="ri_creditos_iibb_cf"/>
@@ -257,15 +249,15 @@
<record model="account.account.template" id="ri_creditos_iibb_ba">
<field name="type">view</field>
- <field name="code">1144009901*</field>
+ <field name="code">114320</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">INGRESOS BRUTOS PROV. BUENOS AIRES</field>
<field name="parent_id" ref="ri_creditos_iibb"/>
</record>
<record model="account.account.template" id="ri_percepcion_iibb_ba">
- <field name="type">receivable</field>
- <field name="code">114400990110</field>
+ <field name="type">other</field>
+ <field name="code">1143201</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Percepciones ingresos brutos p. buenos aires</field>
<field name="parent_id" ref="ri_creditos_iibb_ba"/>
@@ -273,7 +265,7 @@
<record model="account.account.template" id="ri_retencion_iibb_ba">
<field name="type">other</field>
- <field name="code">114400990120</field>
+ <field name="code">1143202</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Retención ingresos brutos p. buenos aires</field>
<field name="parent_id" ref="ri_creditos_iibb_ba"/>
@@ -281,47 +273,47 @@
<record model="account.account.template" id="ri_creditos_iibb_co">
<field name="type">view</field>
- <field name="code">1144009903*</field>
+ <field name="code">114330</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">INGRESOS BRUTOS PROV. CORDOBA</field>
<field name="parent_id" ref="ri_creditos_iibb"/>
</record>
<record model="account.account.template" id="ri_percepcion_iibb_co">
- <field name="type">receivable</field>
- <field name="code">114400990310</field>
+ <field name="type">other</field>
+ <field name="code">1143301</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Percepciones ingresos brutos p. córdoba</field>
<field name="parent_id" ref="ri_creditos_iibb_co"/>
</record>
<record model="account.account.template" id="ri_retencion_iibb_co">
- <field name="type">receivable</field>
- <field name="code">114400990320</field>
+ <field name="type">other</field>
+ <field name="code">1143302</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Retención ingresos brutos p. córdoba</field>
<field name="parent_id" ref="ri_creditos_iibb_co"/>
</record>
<record model="account.account.template" id="ri_creditos_iibb_sf">
- <field name="type">view</field>
- <field name="code">1144009912*</field>
+ <field name="type">other</field>
+ <field name="code">114340</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">INGRESOS BRUTOS PROV. SANTA FÉ</field>
<field name="parent_id" ref="ri_creditos_iibb"/>
</record>
<record model="account.account.template" id="ri_percepcion_iibb_sf">
- <field name="type">receivable</field>
- <field name="code">114400991210</field>
+ <field name="type">other</field>
+ <field name="code">1143401</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Percepciones ingresos brutos p. santa fé</field>
<field name="parent_id" ref="ri_creditos_iibb_sf"/>
</record>
<record model="account.account.template" id="ri_retencion_iibb_sf">
- <field name="type">receivable</field>
- <field name="code">114400991220</field>
+ <field name="type">other</field>
+ <field name="code">1143402</field>
<field name="user_type" ref="account.data_account_type_receivable"/>
<field name="name">Retención ingresos brutos p. santa fé</field>
<field name="parent_id" ref="ri_creditos_iibb_sf"/>
@@ -329,31 +321,23 @@
<record model="account.account.template" id="ri_bienes_de_cambio">
<field name="type">view</field>
- <field name="code">115*</field>
+ <field name="code">115</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">BIENES DE CAMBIO</field>
<field name="parent_id" ref="ri_activo_corriente"/>
</record>
- <record model="account.account.template" id="ri_equipos">
- <field name="type">receivable</field>
- <field name="code">11501</field>
- <field name="user_type" ref="account.data_account_type_receivable"/>
- <field name="name">Equipos</field>
- <field name="parent_id" ref="ri_bienes_de_cambio"/>
- </record>
-
- <record model="account.account.template" id="ri_equipos_en_demo">
- <field name="type">receivable</field>
- <field name="code">11502</field>
- <field name="user_type" ref="account.data_account_type_receivable"/>
- <field name="name">Equipos en Demo</field>
+ <record model="account.account.template" id="ri_mercaderia">
+ <field name="type">other</field>
+ <field name="code">1150010</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Mercaderia</field>
<field name="parent_id" ref="ri_bienes_de_cambio"/>
</record>
<record model="account.account.template" id="ri_activo_no_corriente">
<field name="type">view</field>
- <field name="code">12*</field>
+ <field name="code">12</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">ACTIVO NO CORRIENTE</field>
<field name="parent_id" ref="ri_activo"/>
@@ -361,71 +345,71 @@
<record model="account.account.template" id="ri_bienes_de_uso">
<field name="type">view</field>
- <field name="code">124*</field>
+ <field name="code">121</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">BIENES DE USO</field>
<field name="parent_id" ref="ri_activo_no_corriente"/>
</record>
- <record model="account.account.template" id="ri_equipos_de_computacion">
- <field name="type">other</field>
- <field name="code">12401</field>
+ <record model="account.account.template" id="ri_bienes_de_uso_2">
+ <field name="type">view</field>
+ <field name="code">1211</field>
<field name="user_type" ref="account.data_account_type_view"/>
- <field name="name">Equipos computación</field>
+ <field name="name">BIENES DE USO</field>
<field name="parent_id" ref="ri_bienes_de_uso"/>
- </record>
+ </record>
- <record model="account.account.template" id="ri_software">
+ <record model="account.account.template" id="ri_maq_y_equipos">
<field name="type">other</field>
- <field name="code">12402</field>
- <field name="user_type" ref="account.data_account_type_asset"/>
- <field name="name">Software</field>
- <field name="parent_id" ref="ri_bienes_de_uso"/>
+ <field name="code">1211010</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">Maquinarias y equipos</field>
+ <field name="parent_id" ref="ri_bienes_de_uso_2"/>
</record>
<record model="account.account.template" id="ri_instalaciones">
<field name="type">other</field>
- <field name="code">12403</field>
+ <field name="code">1211020</field>
<field name="user_type" ref="account.data_account_type_asset"/>
<field name="name">Instalaciones</field>
- <field name="parent_id" ref="ri_bienes_de_uso"/>
+ <field name="parent_id" ref="ri_bienes_de_uso_2"/>
</record>
<record model="account.account.template" id="ri_muebles_y_utiles">
<field name="type">other</field>
- <field name="code">12404</field>
+ <field name="code">1211030</field>
<field name="user_type" ref="account.data_account_type_asset"/>
<field name="name">Muebles y útiles</field>
- <field name="parent_id" ref="ri_bienes_de_uso"/>
+ <field name="parent_id" ref="ri_bienes_de_uso_2"/>
+ </record>
+
+ <record model="account.account.template" id="ri_rodados">
+ <field name="type">other</field>
+ <field name="code">1211040</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Rodados</field>
+ <field name="parent_id" ref="ri_bienes_de_uso_2"/>
</record>
<record model="account.account.template" id="ri_amortizacion_acumulada_bs_uso">
<field name="type">view</field>
- <field name="code">125*</field>
+ <field name="code">1212</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">AMORTIZACIONES ACUMULADAS BIENES DE USO</field>
- <field name="parent_id" ref="ri_activo_no_corriente"/>
- </record>
-
- <record model="account.account.template" id="ri_amortizacion_acumulada_computacion">
- <field name="type">other</field>
- <field name="code">12501</field>
- <field name="user_type" ref="account.data_account_type_asset"/>
- <field name="name">Amortización acumulada equipos computación</field>
- <field name="parent_id" ref="ri_amortizacion_acumulada_bs_uso"/>
- </record>
-
- <record model="account.account.template" id="ri_amortizacion_acumulada_software">
- <field name="type">other</field>
- <field name="code">12502</field>
- <field name="user_type" ref="account.data_account_type_asset"/>
- <field name="name">Amortización acumulada software</field>
+ <field name="parent_id" ref="ri_bienes_de_uso"/>
+ </record>
+
+ <record model="account.account.template" id="ri_amortizacion_acumulada_maq_y_equipos">
+ <field name="type">other</field>
+ <field name="code">1212010</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Amortización acumulada maquinarias y equipos</field>
<field name="parent_id" ref="ri_amortizacion_acumulada_bs_uso"/>
</record>
<record model="account.account.template" id="ri_amortizacion_acumulada_instalaciones">
<field name="type">other</field>
- <field name="code">12503</field>
+ <field name="code">1212020</field>
<field name="user_type" ref="account.data_account_type_asset"/>
<field name="name">Amortización acumulada instalaciones</field>
<field name="parent_id" ref="ri_amortizacion_acumulada_bs_uso"/>
@@ -433,15 +417,47 @@
<record model="account.account.template" id="ri_amortizacion_acumulada_muebles_utiles">
<field name="type">other</field>
- <field name="code">12504</field>
+ <field name="code">1212030</field>
<field name="user_type" ref="account.data_account_type_asset"/>
<field name="name">Amortización acumulada muebles y útiles</field>
<field name="parent_id" ref="ri_amortizacion_acumulada_bs_uso"/>
</record>
+ <record model="account.account.template" id="ri_amortizacion_acumulada_rodados">
+ <field name="type">other</field>
+ <field name="code">1212040</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Amortización rodados</field>
+ <field name="parent_id" ref="ri_amortizacion_acumulada_bs_uso"/>
+ </record>
+
+ <record model="account.account.template" id="ri_intangibles">
+ <field name="type">view</field>
+ <field name="code">122</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">INTANGIBLES</field>
+ <field name="parent_id" ref="ri_activo_no_corriente"/>
+ </record>
+
+ <record model="account.account.template" id="ri_software">
+ <field name="type">other</field>
+ <field name="code">1221010</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Software</field>
+ <field name="parent_id" ref="ri_intangibles"/>
+ </record>
+
+ <record model="account.account.template" id="ri_gastos_de_construccion">
+ <field name="type">other</field>
+ <field name="code">1221020</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Gastos de construccion</field>
+ <field name="parent_id" ref="ri_intangibles"/>
+ </record>
+
<record model="account.account.template" id="ri_pasivo">
<field name="type">view</field>
- <field name="code">2*</field>
+ <field name="code">2</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PASIVO</field>
<field name="parent_id" ref="ri_a_root"/>
@@ -449,7 +465,7 @@
<record model="account.account.template" id="ri_pasivo_corriente">
<field name="type">view</field>
- <field name="code">21*</field>
+ <field name="code">21</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PASIVO CORRIENTE</field>
<field name="parent_id" ref="ri_pasivo"/>
@@ -457,7 +473,7 @@
<record model="account.account.template" id="ri_deudas_sociales">
<field name="type">view</field>
- <field name="code">211*</field>
+ <field name="code">211</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">DEUDAS SOCIALES</field>
<field name="parent_id" ref="ri_pasivo_corriente"/>
@@ -465,47 +481,55 @@
<record model="account.account.template" id="ri_sueldos_a_pagar">
<field name="type">payable</field>
- <field name="code">21101</field>
+ <field name="code">2110010</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">Sueldos a pagar</field>
<field name="parent_id" ref="ri_deudas_sociales"/>
</record>
<record model="account.account.template" id="ri_cargas_sociales_a_pagar">
- <field name="type">payable</field>
- <field name="code">21102</field>
+ <field name="type">other</field>
+ <field name="code">2110020</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">Cargas sociales a pagar</field>
<field name="parent_id" ref="ri_deudas_sociales"/>
</record>
<record model="account.account.template" id="ri_provision_sac_a_pagar">
- <field name="type">payable</field>
- <field name="code">21103</field>
+ <field name="type">other</field>
+ <field name="code">2110030</field>
<field name="user_type" ref="account.data_account_type_payable"/>
- <field name="name">Provision SAC a pagar</field>
+ <field name="name">Prevision SAC a pagar</field>
<field name="parent_id" ref="ri_deudas_sociales"/>
</record>
<record model="account.account.template" id="ri_provision_sac_cargas_sociales">
+ <field name="type">other</field>
+ <field name="code">2110040</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Prevision cargas sociales a pagar</field>
+ <field name="parent_id" ref="ri_deudas_sociales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_comisiones_a_pagar">
<field name="type">payable</field>
- <field name="code">21104</field>
+ <field name="code">2110050</field>
<field name="user_type" ref="account.data_account_type_payable"/>
- <field name="name">Provision SAC cargas sociales a pagar</field>
+ <field name="name">Comisiones a pagar</field>
<field name="parent_id" ref="ri_deudas_sociales"/>
- </record>
+ </record>
<record model="account.account.template" id="ri_beneficios_al_personal">
- <field name="type">payable</field>
- <field name="code">21105</field>
+ <field name="type">other</field>
+ <field name="code">2110060</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">Beneficios al personal</field>
<field name="parent_id" ref="ri_deudas_sociales"/>
</record>
<record model="account.account.template" id="ri_prevision_despidos">
- <field name="type">payable</field>
- <field name="code">21106</field>
+ <field name="type">other</field>
+ <field name="code">2110070</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">Previsión Despidos</field>
<field name="parent_id" ref="ri_deudas_sociales"/>
@@ -513,7 +537,7 @@
<record model="account.account.template" id="ri_deudas_fiscales">
<field name="type">view</field>
- <field name="code">212*</field>
+ <field name="code">212</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">DEUDAS FISCALES</field>
<field name="parent_id" ref="ri_pasivo_corriente"/>
@@ -521,7 +545,7 @@
<record model="account.account.template" id="ri_iibb_a_pagar">
<field name="type">other</field>
- <field name="code">21201</field>
+ <field name="code">2120010</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">Ingresos brutos a pagar</field>
<field name="parent_id" ref="ri_deudas_fiscales"/>
@@ -529,7 +553,7 @@
<record model="account.account.template" id="ri_iva_debito_fiscal">
<field name="type">other</field>
- <field name="code">21202</field>
+ <field name="code">2120020</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">IVA débito fiscal</field>
<field name="parent_id" ref="ri_deudas_fiscales"/>
@@ -537,71 +561,184 @@
<record model="account.account.template" id="ri_iva_a_pagar">
<field name="type">other</field>
- <field name="code">21203</field>
- <field name="user_type" ref="account.data_account_type_payable"/>
- <field name="name">IVA a pagar</field>
- <field name="parent_id" ref="ri_deudas_fiscales"/>
- </record>
-
- <record model="account.account.template" id="ri_retencion_ganancias_a_depositar">
- <field name="type">other</field>
- <field name="code">21204</field>
- <field name="user_type" ref="account.data_account_type_payable"/>
- <field name="name">Retención ganancias a depositar</field>
- <field name="parent_id" ref="ri_deudas_fiscales"/>
- </record>
-
- <record model="account.account.template" id="ri_provision_impuesto_a_las_ganancias">
- <field name="type">other</field>
- <field name="code">21205</field>
- <field name="user_type" ref="account.data_account_type_payable"/>
- <field name="name">Provision impuesto a las ganancias</field>
+ <field name="code">2120030</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">IVA saldo a pagar</field>
+ <field name="parent_id" ref="ri_deudas_fiscales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_impuesto_ganancias_a_pagar">
+ <field name="type">other</field>
+ <field name="code">2120040</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Impuesto a las ganancias a pagar</field>
+ <field name="parent_id" ref="ri_deudas_fiscales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_retencion_ganancias_a_pagar">
+ <field name="type">other</field>
+ <field name="code">2120050</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Retención ganancias a pagar</field>
+ <field name="parent_id" ref="ri_deudas_fiscales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_autonomos_a_pagar">
+ <field name="type">other</field>
+ <field name="code">2120060</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Autonomos a pagar</field>
+ <field name="parent_id" ref="ri_deudas_fiscales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_retenciones_varias_a_pagar">
+ <field name="type">other</field>
+ <field name="code">2120070</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Retenciones varias a pagar</field>
+ <field name="parent_id" ref="ri_deudas_fiscales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_drei_a_pagar">
+ <field name="type">other</field>
+ <field name="code">2120080</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">DREI a pagar</field>
<field name="parent_id" ref="ri_deudas_fiscales"/>
</record>
<record model="account.account.template" id="ri_deudas_comerciales">
<field name="type">view</field>
- <field name="code">213*</field>
+ <field name="code">213</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">DEUDAS COMERCIALES</field>
<field name="parent_id" ref="ri_pasivo_corriente"/>
</record>
+ <record model="account.account.template" id="ri_comunes">
+ <field name="type">view</field>
+ <field name="code">2131</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">COMUNES</field>
+ <field name="parent_id" ref="ri_deudas_comerciales"/>
+ </record>
+
<record model="account.account.template" id="ri_pago_proveedores">
<field name="type">payable</field>
- <field name="code">21301</field>
+ <field name="code">2131010</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">Proveedores</field>
- <field name="parent_id" ref="ri_deudas_comerciales"/>
- </record>
-
- <record model="account.account.template" id="ri_anticipos_de_clientes">
- <field name="type">payable</field>
- <field name="code">21302</field>
- <field name="user_type" ref="account.data_account_type_payable"/>
- <field name="name">Anticipos de clientes</field>
- <field name="parent_id" ref="ri_deudas_comerciales"/>
+ <field name="parent_id" ref="ri_comunes"/>
+ <field name="reconcile" eval="True"/>
+ </record>
+
+ <record model="account.account.template" id="ri_alquileres_a_pagar">
+ <field name="type">payable</field>
+ <field name="code">2131020</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Alquileres a pagar</field>
+ <field name="parent_id" ref="ri_comunes"/>
+ </record>
+
+ <record model="account.account.template" id="ri_pago_proveedores">
+ <field name="type">payable</field>
+ <field name="code">2131010</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Acreedores varios</field>
+ <field name="parent_id" ref="ri_comunes"/>
+ </record>
+
+ <record model="account.account.template" id="ri_documentadas">
+ <field name="type">view</field>
+ <field name="code">2132</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">DOCUMENTADAS</field>
+ <field name="parent_id" ref="ri_deudas_comerciales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_cheques_diferidos">
+ <field name="type">other</field>
+ <field name="code">2132010</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Cheques diferidos</field>
+ <field name="parent_id" ref="ri_documentadas"/>
+ </record>
+
+ <record model="account.account.template" id="ri_otras_deudas_documentadas">
+ <field name="type">other</field>
+ <field name="code">2132020</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Otras deudas documentadas</field>
+ <field name="parent_id" ref="ri_documentadas"/>
+ </record>
+
+ <record model="account.account.template" id="ri_bancarias">
+ <field name="type">view</field>
+ <field name="code">214</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">BANCARIAS</field>
+ <field name="parent_id" ref="ri_pasivo_corriente"/>
+ </record>
+
+ <record model="account.account.template" id="ri_tarjetas_de_credito">
+ <field name="type">other</field>
+ <field name="code">2140010</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Tarjetas de crédito</field>
+ <field name="parent_id" ref="ri_bancarias"/>
+ </record>
+
+ <record model="account.account.template" id="ri_prestamos">
+ <field name="type">other</field>
+ <field name="code">2140020</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Prestamos</field>
+ <field name="parent_id" ref="ri_bancarias"/>
+ </record>
+
+ <record model="account.account.template" id="ri_giro_en_descubierto">
+ <field name="type">other</field>
+ <field name="code">2140030</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Giro en descubierto</field>
+ <field name="parent_id" ref="ri_bancarias"/>
</record>
<record model="account.account.template" id="ri_provisiones_varias">
<field name="type">view</field>
- <field name="code">214*</field>
+ <field name="code">215</field>
<field name="user_type" ref="account.data_account_type_view"/>
- <field name="name">PROVISIONES VARIAS</field>
+ <field name="name">PREVISIONES VARIAS</field>
<field name="parent_id" ref="ri_pasivo_corriente"/>
</record>
<record model="account.account.template" id="ri_provision_gastos">
- <field name="type">payable</field>
- <field name="code">21401</field>
+ <field name="type">other</field>
+ <field name="code">2150010</field>
<field name="user_type" ref="account.data_account_type_payable"/>
- <field name="name">Provision gastos</field>
+ <field name="name">Prevision gastos</field>
+ <field name="parent_id" ref="ri_provisiones_varias"/>
+ </record>
+
+ <record model="account.account.template" id="ri_cuentas_particulares">
+ <field name="type">view</field>
+ <field name="code">216</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">CUENTAS PARTICULARES</field>
<field name="parent_id" ref="ri_pasivo_corriente"/>
</record>
+ <record model="account.account.template" id="ri_cta_particular_socio_x">
+ <field name="type">other</field>
+ <field name="code">2160010</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Cta particular socio x</field>
+ <field name="parent_id" ref="ri_cuentas_particulares"/>
+ </record>
+
<record model="account.account.template" id="ri_pasivo_no_corriente">
<field name="type">view</field>
- <field name="code">22*</field>
+ <field name="code">22</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PASIVO NO CORRIENTE</field>
<field name="parent_id" ref="ri_pasivo"/>
@@ -609,15 +746,15 @@
<record model="account.account.template" id="ri_deudas_comerciales_largo_plazo">
<field name="type">view</field>
- <field name="code">221*</field>
+ <field name="code">221</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">DEUDAS COMERCIALES A LARGO PLAZO</field>
<field name="parent_id" ref="ri_pasivo_no_corriente"/>
</record>
<record model="account.account.template" id="ri_proveedores_largo_plazo">
- <field name="type">payable</field>
- <field name="code">22101</field>
+ <field name="type">other</field>
+ <field name="code">2210010</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">Deudas proveedores a largo plazo</field>
<field name="parent_id" ref="ri_deudas_comerciales_largo_plazo"/>
@@ -625,15 +762,31 @@
<record model="account.account.template" id="ri_otras_deudas">
<field name="type">view</field>
- <field name="code">222*</field>
+ <field name="code">222</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">OTRAS DEUDAS</field>
<field name="parent_id" ref="ri_pasivo_no_corriente"/>
</record>
+ <record model="account.account.template" id="ri_seguros_a_pagar">
+ <field name="type">other</field>
+ <field name="code">2220010</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Seguros a pagar</field>
+ <field name="parent_id" ref="ri_otras_deudas"/>
+ </record>
+
+ <record model="account.account.template" id="ri_gastos_a_pagar">
+ <field name="type">other</field>
+ <field name="code">2220020</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="name">Gastos a pagar</field>
+ <field name="parent_id" ref="ri_otras_deudas"/>
+ </record>
+
<record model="account.account.template" id="ri_deudas_misc">
- <field name="type">payable</field>
- <field name="code">22201</field>
+ <field name="type">other</field>
+ <field name="code">2220030</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="name">Deudas misc</field>
<field name="parent_id" ref="ri_otras_deudas"/>
@@ -641,55 +794,135 @@
<record model="account.account.template" id="ri_patrimonio_neto">
<field name="type">view</field>
- <field name="code">3*</field>
+ <field name="code">3</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PATRIMONIO NETO</field>
<field name="parent_id" ref="ri_a_root"/>
</record>
+ <record model="account.account.template" id="ri_aportes_de_los_propietarios">
+ <field name="type">view</field>
+ <field name="code">31</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">APORTES DE LOS PROPIETARIOS</field>
+ <field name="parent_id" ref="ri_patrimonio_neto"/>
+ </record>
+
+ <record model="account.account.template" id="ri_capital_social">
+ <field name="type">view</field>
+ <field name="code">311</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">CAPITAL SOCIAL</field>
+ <field name="parent_id" ref="ri_aportes_de_los_propietarios"/>
+ </record>
+
<record model="account.account.template" id="ri_capital">
<field name="type">other</field>
- <field name="code">31000</field>
- <field name="user_type" ref="account.data_account_type_cash"/>
- <field name="name">Capital</field>
- <field name="parent_id" ref="ri_patrimonio_neto"/>
- </record>
-
- <record model="account.account.template" id="ri_aporte_irrevocable">
- <field name="type">other</field>
- <field name="code">32000</field>
- <field name="user_type" ref="account.data_account_type_cash"/>
- <field name="name">Aporte irrevocable </field>
- <field name="parent_id" ref="ri_patrimonio_neto"/>
- </record>
+ <field name="code">3110010</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
+ <field name="name">Capital susctipto</field>
+ <field name="parent_id" ref="ri_capital_social"/>
+ </record>
+
+ <record model="account.account.template" id="ri_ajustes_de_capital">
+ <field name="type">view</field>
+ <field name="code">312</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">AJUSTES DE CAPITAL</field>
+ <field name="parent_id" ref="ri_aportes_de_los_propietarios"/>
+ </record>
+
+ <record model="account.account.template" id="ri_ajustes_de_capital_2">
+ <field name="type">other</field>
+ <field name="code">3120010</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
+ <field name="name">Capital susctipto</field>
+ <field name="parent_id" ref="ri_ajustes_de_capital"/>
+ </record>
+
+ <record model="account.account.template" id="ri_aportes_no_capitalizados">
+ <field name="type">view</field>
+ <field name="code">313</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">APORTES NO CAPITALIZADOS</field>
+ <field name="parent_id" ref="ri_aportes_de_los_propietarios"/>
+ </record>
+
+ <record model="account.account.template" id="ri_aportes_no_capitalizados_2">
+ <field name="type">other</field>
+ <field name="code">3130010</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
+ <field name="name">Aportes no capitalizados</field>
+ <field name="parent_id" ref="ri_aportes_no_capitalizados"/>
+ </record>
+
+ <record model="account.account.template" id="ri_ganancias_reservadas">
+ <field name="type">view</field>
+ <field name="code">32</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">GANANCIAS RESERVADAS</field>
+ <field name="parent_id" ref="ri_patrimonio_neto"/>
+ </record>
<record model="account.account.template" id="ri_reserva_legal">
<field name="type">other</field>
- <field name="code">33000</field>
- <field name="user_type" ref="account.data_account_type_cash"/>
+ <field name="code">3200010</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
<field name="name">Reserva legal</field>
+ <field name="parent_id" ref="ri_ganancias_reservadas"/>
+ </record>
+
+ <record model="account.account.template" id="ri_reserva_legal">
+ <field name="type">other</field>
+ <field name="code">3200020</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
+ <field name="name">Reserva estatuitaria</field>
+ <field name="parent_id" ref="ri_ganancias_reservadas"/>
+ </record>
+
+ <record model="account.account.template" id="ri_reserva_legal">
+ <field name="type">other</field>
+ <field name="code">3200030</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
+ <field name="name">Reserva futuras inversiones</field>
+ <field name="parent_id" ref="ri_ganancias_reservadas"/>
+ </record>
+
+ <record model="account.account.template" id="ri_resultados">
+ <field name="type">view</field>
+ <field name="code">33</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">RESULTADOS</field>
<field name="parent_id" ref="ri_patrimonio_neto"/>
+ </record>
+
+ <record model="account.account.template" id="ri_resultado_del_ejercicio">
+ <field name="type">other</field>
+ <field name="code">3300010</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
+ <field name="name">Resultado del ejercicio</field>
+ <field name="parent_id" ref="ri_resultados"/>
+ </record>
+
+ <record model="account.account.template" id="ri_resultado_del_ejercicio">
+ <field name="type">other</field>
+ <field name="code">3300020</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
+ <field name="name">Resultado acumlados</field>
+ <field name="parent_id" ref="ri_resultados"/>
</record>
<record model="account.account.template" id="ri_resultados_no_asignados">
<field name="type">other</field>
- <field name="code">34000</field>
- <field name="user_type" ref="account.data_account_type_cash"/>
- <field name="name">Resultados no asignados</field>
- <field name="parent_id" ref="ri_patrimonio_neto"/>
- </record>
-
- <record model="account.account.template" id="ri_resultado_del_ejercicio">
- <field name="type">other</field>
- <field name="code">35000</field>
- <field name="user_type" ref="account.data_account_type_cash"/>
- <field name="name">Resultado del ejercicio</field>
- <field name="parent_id" ref="ri_patrimonio_neto"/>
+ <field name="code">3300030</field>
+ <field name="user_type" ref="account.conf_account_type_equity"/>
+ <field name="name">Ajuste resultados ejercicios anteriores</field>
+ <field name="parent_id" ref="ri_resultados"/>
</record>
<record model="account.account.template" id='ri_ingresos'>
<field name="type">view</field>
- <field name="code">4*</field>
+ <field name="code">4</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">INGRESOS</field>
<field name="parent_id" ref="ri_a_root"/>
@@ -697,7 +930,7 @@
<record model="account.account.template" id="ri_ingresos_operativos">
<field name="type">view</field>
- <field name="code">41*</field>
+ <field name="code">41</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">INGRESOS OPERATIVOS</field>
<field name="parent_id" ref="ri_ingresos"/>
@@ -705,31 +938,23 @@
<record model="account.account.template" id="ri_ventas">
<field name="type">view</field>
- <field name="code">411*</field>
+ <field name="code">411</field>
<field name="user_type" ref="account.data_account_type_view"/>
- <field name="name">VENTAS</field>
+ <field name="name">INGRESOS POR VENTAS</field>
<field name="parent_id" ref="ri_ingresos_operativos"/>
</record>
- <record model="account.account.template" id="ri_ingresos_ventas">
- <field name="type">other</field>
- <field name="code">41100</field>
- <field name="user_type" ref="account.data_account_type_income"/>
- <field name="name">Ingresos por ventas</field>
- <field name="parent_id" ref="ri_ventas"/>
- </record>
-
- <record model="account.account.template" id="ri_venta_de_equipos">
- <field name="type">other</field>
- <field name="code">41101</field>
- <field name="user_type" ref="account.data_account_type_income"/>
- <field name="name">Venta de equipos</field>
+ <record model="account.account.template" id="ri_venta_de_mercaderia">
+ <field name="type">other</field>
+ <field name="code">4110010</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Venta de mercaderia</field>
<field name="parent_id" ref="ri_ventas"/>
</record>
<record model="account.account.template" id="ri_venta_de_servicios_misc">
<field name="type">other</field>
- <field name="code">41102</field>
+ <field name="code">4110020</field>
<field name="user_type" ref="account.data_account_type_income"/>
<field name="name">Venta servicios misc</field>
<field name="parent_id" ref="ri_ventas"/>
@@ -737,7 +962,7 @@
<record model="account.account.template" id="ri_otros_ingresos">
<field name="type">view</field>
- <field name="code">42*</field>
+ <field name="code">42</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">OTROS INGRESOS</field>
<field name="parent_id" ref="ri_ingresos"/>
@@ -745,7 +970,7 @@
<record model="account.account.template" id="ri_ingresos_financieros">
<field name="type">view</field>
- <field name="code">421*</field>
+ <field name="code">421</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">INGRESOS FINANCIEROS</field>
<field name="parent_id" ref="ri_otros_ingresos"/>
@@ -753,15 +978,71 @@
<record model="account.account.template" id="ri_resultado_invesiones_financieras">
<field name="type">other</field>
- <field name="code">42110</field>
+ <field name="code">4210010</field>
<field name="user_type" ref="account.data_account_type_income"/>
<field name="name">Resultado de inversiones financieras</field>
<field name="parent_id" ref="ri_ingresos_financieros"/>
</record>
+ <record model="account.account.template" id="ri_resultado_invesiones_financieras">
+ <field name="type">other</field>
+ <field name="code">4210020</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Intereses ganados</field>
+ <field name="parent_id" ref="ri_ingresos_financieros"/>
+ </record>
+
+ <record model="account.account.template" id="ri_diferencias_de_cambio">
+ <field name="type">other</field>
+ <field name="code">4210030</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Diferencias de cambio</field>
+ <field name="parent_id" ref="ri_ingresos_financieros"/>
+ </record>
+
+ <record model="account.account.template" id="ri_otros_ingresos_2">
+ <field name="type">view</field>
+ <field name="code">422</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">OTROS INGRESOS</field>
+ <field name="parent_id" ref="ri_otros_ingresos"/>
+ </record>
+
+ <record model="account.account.template" id="ri_resultado_venta_bienes_de_uso">
+ <field name="type">other</field>
+ <field name="code">4220010</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Resultado venta bienes de uso</field>
+ <field name="parent_id" ref="ri_otros_ingresos_2"/>
+ </record>
+
+ <record model="account.account.template" id="ri_ajuste_por_redondeo">
+ <field name="type">other</field>
+ <field name="code">4220020</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Ajuste por redondeo</field>
+ <field name="parent_id" ref="ri_otros_ingresos_2"/>
+ </record>
+
+ <record model="account.account.template" id="ri_descuentos_obtenidos">
+ <field name="type">other</field>
+ <field name="code">4220030</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Descuentos obtenidos</field>
+ <field name="parent_id" ref="ri_otros_ingresos_2"/>
+ </record>
+
+ <record model="account.account.template" id="ri_recupero_de_gastos">
+ <field name="type">other</field>
+ <field name="code">4220040</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Recupero de gastos</field>
+ <field name="parent_id" ref="ri_otros_ingresos_2"/>
+ </record>
+
<record model="account.account.template" id="ri_gastos">
<field name="type">view</field>
- <field name="code">5*</field>
+ <field name="code">5</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">GASTOS</field>
<field name="parent_id" ref="ri_a_root"/>
@@ -769,7 +1050,7 @@
<record model="account.account.template" id="ri_gastos_operativos">
<field name="type">view</field>
- <field name="code">51*</field>
+ <field name="code">51</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">GASTOS OPERATIVOS</field>
<field name="parent_id" ref="ri_gastos"/>
@@ -777,55 +1058,71 @@
<record model="account.account.template" id="ri_gastos_de_produccion">
<field name="type">view</field>
- <field name="code">511*</field>
+ <field name="code">511</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">GASTOS DE PRODUCCION</field>
<field name="parent_id" ref="ri_gastos_operativos"/>
</record>
- <record model="account.account.template" id="ri_gastos_operativos_generales">
- <field name="type">other</field>
- <field name="code">51100</field>
- <field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Gastos operativos general</field>
- <field name="parent_id" ref="ri_gastos_de_produccion"/>
- </record>
-
- <record model="account.account.template" id="ri_haberes">
- <field name="type">other</field>
- <field name="code">51101</field>
- <field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Haberes</field>
- <field name="parent_id" ref="ri_gastos_de_produccion"/>
- </record>
-
- <record model="account.account.template" id="ri_cargas_sociales">
- <field name="type">other</field>
- <field name="code">51102</field>
+ <record model="account.account.template" id="ri_haberes_produccion">
+ <field name="type">other</field>
+ <field name="code">5110010</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Sueldos y SAC operativos</field>
+ <field name="parent_id" ref="ri_gastos_de_produccion"/>
+ </record>
+
+ <record model="account.account.template" id="ri_cargas_sociales_produccion">
+ <field name="type">other</field>
+ <field name="code">5110020</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Cargas Sociales</field>
<field name="parent_id" ref="ri_gastos_de_produccion"/>
</record>
- <record model="account.account.template" id="ri_costo_de_equipos">
+ <record model="account.account.template" id="ri_costo_de_mercaderia_vendida">
<field name="type">other</field>
- <field name="code">51103</field>
+ <field name="code">5110030</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Costo de equipos</field>
+ <field name="name">Costo de mercadería vendida</field>
<field name="parent_id" ref="ri_gastos_de_produccion"/>
</record>
<record model="account.account.template" id="ri_materiales">
<field name="type">other</field>
- <field name="code">51104</field>
+ <field name="code">5110040</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Materiales</field>
<field name="parent_id" ref="ri_gastos_de_produccion"/>
</record>
+ <record model="account.account.template" id="ri_gastos_operativos_generales">
+ <field name="type">other</field>
+ <field name="code">5110050</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Gastos varios produccion</field>
+ <field name="parent_id" ref="ri_gastos_de_produccion"/>
+ </record>
+
+ <record model="account.account.template" id="ri_alquileres_produccion">
+ <field name="type">other</field>
+ <field name="code">5110060</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Alquileres produccion</field>
+ <field name="parent_id" ref="ri_gastos_de_produccion"/>
+ </record>
+
+ <record model="account.account.template" id="ri_servicios_agua_luz_etc_produccion">
+ <field name="type">other</field>
+ <field name="code">5110070</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Servicios de luz, agua, etc. produccion</field>
+ <field name="parent_id" ref="ri_gastos_de_produccion"/>
+ </record>
+
<record model="account.account.template" id="ri_gastos_comerciales">
<field name="type">view</field>
- <field name="code">512*</field>
+ <field name="code">512</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">GASTOS COMERCIALES</field>
<field name="parent_id" ref="ri_gastos_operativos"/>
@@ -833,15 +1130,15 @@
<record model="account.account.template" id="ri_haberes_comerciales">
<field name="type">other</field>
- <field name="code">51201</field>
+ <field name="code">5120010</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Haberes comerciales</field>
+ <field name="name">Sueldos y SAC comerciales</field>
<field name="parent_id" ref="ri_gastos_comerciales"/>
</record>
<record model="account.account.template" id="ri_cargas_sociales_comerciales">
<field name="type">other</field>
- <field name="code">51202</field>
+ <field name="code">5120020</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Cargas sociales comerciales</field>
<field name="parent_id" ref="ri_gastos_comerciales"/>
@@ -849,7 +1146,7 @@
<record model="account.account.template" id="ri_comisiones_comerciales">
<field name="type">other</field>
- <field name="code">51203</field>
+ <field name="code">5120030</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Comisiones</field>
<field name="parent_id" ref="ri_gastos_comerciales"/>
@@ -857,15 +1154,55 @@
<record model="account.account.template" id="ri_publicidad">
<field name="type">other</field>
- <field name="code">51204</field>
+ <field name="code">5120040</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Publicidad</field>
<field name="parent_id" ref="ri_gastos_comerciales"/>
</record>
+ <record model="account.account.template" id="ri_movilidad_y_viaticos_comerciales">
+ <field name="type">other</field>
+ <field name="code">5120050</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Movilidad y viáticos comerciales</field>
+ <field name="parent_id" ref="ri_gastos_comerciales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_gastos_de_eventos_comerciales">
+ <field name="type">other</field>
+ <field name="code">5120060</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Gastos de eventos comerciales</field>
+ <field name="parent_id" ref="ri_gastos_comerciales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_gastos_varios_comerciales">
+ <field name="type">other</field>
+ <field name="code">5120070</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Gastos varios comerciales</field>
+ <field name="parent_id" ref="ri_gastos_comerciales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_alquileres_comerciales">
+ <field name="type">other</field>
+ <field name="code">5120080</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Alquileres comerciales</field>
+ <field name="parent_id" ref="ri_gastos_comerciales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_servicios_agua_luz_etc_comerciales">
+ <field name="type">other</field>
+ <field name="code">5120090</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Servicios de luz, agua, etc. comerciales</field>
+ <field name="parent_id" ref="ri_gastos_comerciales"/>
+ </record>
+
<record model="account.account.template" id="ri_gastos_de_administracion">
<field name="type">view</field>
- <field name="code">513*</field>
+ <field name="code">513</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">GASTOS DE ADMINISTRACION</field>
<field name="parent_id" ref="ri_gastos_operativos"/>
@@ -873,78 +1210,87 @@
<record model="account.account.template" id="ri_haberes_administrativos">
<field name="type">other</field>
- <field name="code">51301</field>
+ <field name="code">5130010</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Haberes administrativos</field>
+ <field name="name">Sueldos y SAC administrativos</field>
<field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
<record model="account.account.template" id="ri_cargas_sociales_administrativas">
<field name="type">other</field>
- <field name="code">51302</field>
+ <field name="code">5130020</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Cargas sociales administrativas</field>
<field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
- <record model="account.account.template" id="ri_honorarios">
+ <record model="account.account.template" id="ri_honorarios_administrativas">
<field name="type">other</field>
- <field name="code">51303</field>
+ <field name="code">5130030</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Honorarios</field>
+ <field name="name">Honorarios profesionales administracion</field>
<field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
- <record model="account.account.template" id="ri_alquileres">
- <field name="type">other</field>
- <field name="code">51304</field>
- <field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Alquileres</field>
+ <record model="account.account.template" id="ri_gastos_varios_administrativas">
+ <field name="type">other</field>
+ <field name="code">5130040</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Gastos varios administracion</field>
+ <field name="parent_id" ref="ri_gastos_de_administracion"/>
+ </record>
+
+ <record model="account.account.template" id="ri_alquileres_administrativas">
+ <field name="type">other</field>
+ <field name="code">5130050</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Alquileres administracion</field>
<field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
<record model="account.account.template" id="ri_servicios_agua_luz_etc">
<field name="type">other</field>
- <field name="code">51305</field>
+ <field name="code">5130060</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Servicios de luz, agua, etc</field>
+ <field name="name">Servicios de luz, agua, etc. administracion</field>
<field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
<record model="account.account.template" id="ri_mantenimiento_y_limpieza">
<field name="type">other</field>
- <field name="code">51306</field>
+ <field name="code">5130070</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Mantenimiento y limpieza</field>
+ <field name="name">Mantenimiento y limpieza adminsitracion</field>
<field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
<record model="account.account.template" id="ri_articulos_libreria">
<field name="type">other</field>
- <field name="code">51307</field>
+ <field name="code">5130080</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Artículos librería</field>
+ <field name="name">Artículos librería administracion</field>
+ <field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
<record model="account.account.template" id="ri_cadeteria_y_correo">
<field name="type">other</field>
- <field name="code">51308</field>
+ <field name="code">5130090</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Cadetería y correo</field>
+ <field name="name">Cadetería y correo adminsitracion</field>
<field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
<record model="account.account.template" id="ri_seguros">
<field name="type">other</field>
- <field name="code">51309</field>
+ <field name="code">5130110</field>
<field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Seguros</field>
+ <field name="name">Seguros adminsitracion</field>
<field name="parent_id" ref="ri_gastos_de_administracion"/>
</record>
<record model="account.account.template" id="ri_gastos_fiscales">
<field name="type">view</field>
- <field name="code">514*</field>
+ <field name="code">514</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">GASTOS FISCALES</field>
<field name="parent_id" ref="ri_gastos_operativos"/>
@@ -952,7 +1298,7 @@
<record model="account.account.template" id="ri_impuestos_iibb_cf">
<field name="type">other</field>
- <field name="code">5149999</field>
+ <field name="code">5140010</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Impuestos ingresos brutos CABA</field>
<field name="parent_id" ref="ri_gastos_fiscales"/>
@@ -960,7 +1306,7 @@
<record model="account.account.template" id="ri_impuestos_iibb_ba">
<field name="type">other</field>
- <field name="code">5142429</field>
+ <field name="code">5140020</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Impuestos ingresos brutos Prov. Bs. As.</field>
<field name="parent_id" ref="ri_gastos_fiscales"/>
@@ -968,7 +1314,7 @@
<record model="account.account.template" id="ri_impuestos_iibb_co">
<field name="type">other</field>
- <field name="code">5142452</field>
+ <field name="code">5140030</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Impuestos ingresos brutos Prov. Córdoba</field>
<field name="parent_id" ref="ri_gastos_fiscales"/>
@@ -976,7 +1322,7 @@
<record model="account.account.template" id="ri_impuestos_iibb_sf">
<field name="type">other</field>
- <field name="code">5149998</field>
+ <field name="code">5140040</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Impuestos ingresos brutos Prov. Santa Fé</field>
<field name="parent_id" ref="ri_gastos_fiscales"/>
@@ -984,7 +1330,7 @@
<record model="account.account.template" id="ri_impuestos_a_las_ganancias">
<field name="type">other</field>
- <field name="code">5142424</field>
+ <field name="code">5140050</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Impuestos a las ganancias</field>
<field name="parent_id" ref="ri_gastos_fiscales"/>
@@ -992,22 +1338,31 @@
<record model="account.account.template" id="ri_impuestos_transacciones_bancarias">
<field name="type">other</field>
- <field name="code">5149980</field>
- <field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Impuestos transacciones bancarias</field>
+ <field name="code">5140060</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Impuestos a los créditos bancarios</field>
+ <field name="parent_id" ref="ri_gastos_fiscales"/>
+ </record>
+
+ <record model="account.account.template" id="ri_impuestos_transacciones_bancarias">
+ <field name="type">other</field>
+ <field name="code">5140070</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Impuestos a los débitos bancarios</field>
<field name="parent_id" ref="ri_gastos_fiscales"/>
</record>
<record model="account.account.template" id="ri_otros_gastos">
<field name="type">view</field>
- <field name="code">515*</field>
+ <field name="code">515</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">OTROS GASTOS </field>
+ <field name="parent_id" ref="ri_gastos_operativos"/>
</record>
<record model="account.account.template" id="ri_intereses_y_recargos">
<field name="type">other</field>
- <field name="code">51501</field>
+ <field name="code">5150010</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Intereses y recargos</field>
<field name="parent_id" ref="ri_otros_gastos"/>
@@ -1015,7 +1370,7 @@
<record model="account.account.template" id="ri_gastos_no_operativos">
<field name="type">view</field>
- <field name="code">52*</field>
+ <field name="code">52</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">GASTOS NO OPERATIVOS</field>
<field name="parent_id" ref="ri_gastos"/>
@@ -1023,44 +1378,45 @@
<record model="account.account.template" id="ri_amortizaciones">
<field name="type">view</field>
- <field name="code">521*</field>
+ <field name="code">521</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">AMORTIZACIONES</field>
<field name="parent_id" ref="ri_gastos_no_operativos"/>
</record>
+ <record model="account.account.template" id="ri_amortizaciones_equipos_computacion">
+ <field name="type">other</field>
+ <field name="code">5210010</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Amortizaciones maquinaria y equipos</field>
+ <field name="parent_id" ref="ri_amortizaciones"/>
+ </record>
+
<record model="account.account.template" id="ri_amortizaciones_instalaciones">
<field name="type">other</field>
- <field name="code">52101</field>
+ <field name="code">5210020</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Amortizaciones instalaciones</field>
<field name="parent_id" ref="ri_amortizaciones"/>
</record>
- <record model="account.account.template" id="ri_amortizaciones_equipos_computacion">
- <field name="type">other</field>
- <field name="code">52102</field>
- <field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Amortizaciones equipos de computación</field>
- <field name="parent_id" ref="ri_amortizaciones"/>
- </record>
-
- <record model="account.account.template" id="ri_amortizacion_software">
- <field name="type">other</field>
- <field name="code">52103</field>
- <field name="user_type" ref="account.data_account_type_expense"/>
- <field name="name">Amortizacion software</field>
- <field name="parent_id" ref="ri_amortizaciones"/>
- </record>
-
<record model="account.account.template" id="ri_amortizacion_muebles_y_utiles">
<field name="type">other</field>
- <field name="code">52104</field>
+ <field name="code">5210030</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Amortizacion muebles y útiles</field>
<field name="parent_id" ref="ri_amortizaciones"/>
</record>
+ <record model="account.account.template" id="ri_amortizacion_rodados">
+ <field name="type">other</field>
+ <field name="code">5210040</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Amortizacion rodados</field>
+ <field name="parent_id" ref="ri_amortizaciones"/>
+ </record>
+
+
#
# Tax Code Templates
#
@@ -1276,12 +1632,13 @@
<record id="ri_l10nAR_chart_template" model="account.chart.template">
<field name="name">Plan Contable Genérico de Argentina para Responsables Inscriptos</field>
<field name="account_root_id" ref="ri_a_root"/>
+ <field name="code_digits">7</field>
<field name="tax_code_root_id" ref="ri_tax_code_chart_root"/>
- <field name="bank_account_view_id" ref="ri_banco"/>
+ <field name="bank_account_view_id" ref="ri_bancos"/>
<field name="property_account_receivable" ref="ri_deudores_por_ventas"/>
<field name="property_account_payable" ref="ri_pago_proveedores"/>
- <field name="property_account_expense_categ" ref="ri_gastos_operativos_generales"/>
- <field name="property_account_income_categ" ref="ri_ingresos_ventas"/>
+ <field name="property_account_expense_categ" ref="ri_mercaderia"/>
+ <field name="property_account_income_categ" ref="ri_venta_de_mercaderia"/>
</record>
#
=== modified file 'l10n_ar_chart_generic/data/res_partner.xml'
--- l10n_ar_chart_generic/data/res_partner.xml 2013-10-15 22:33:53 +0000
+++ l10n_ar_chart_generic/data/res_partner.xml 2014-01-09 18:49:12 +0000
@@ -23,8 +23,9 @@
<field name="is_company" eval="True"/>
<field name="customer" eval="True"/>
<field name="supplier" eval="True"/>
- <field name="property_account_receivable" ref="ri_iva_retencion"/>
- <field name="property_account_payable" ref="ri_iva_a_pagar"/>
+ <!-- Esta configuracion hace que no quede una property predeterminada de manera correcta -->
+<!-- <field name="property_account_receivable" ref="ri_iva_retencion"/>
+ <field name="property_account_payable" ref="ri_iva_a_pagar"/> -->
</record>
</data>
</openerp>
=== added directory 'l10n_ar_debit_note'
=== added file 'l10n_ar_debit_note/__init__.py'
--- l10n_ar_debit_note/__init__.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_debit_note/__init__.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+#
+# Insert all includes necesary for this module
+
+import account_journal
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== added file 'l10n_ar_debit_note/__openerp__.py'
--- l10n_ar_debit_note/__openerp__.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_debit_note/__openerp__.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{ 'active': False,
+ 'author': 'Sistemas ADHOC',
+ 'category': 'Accounting & Finance',
+ 'demo_xml': [],
+ 'depends': ['account_voucher'],
+ 'description': 'Extends Account Journal and adds a field on Sale and Purchase journals to indicate if they are a Debit Note Journal. It also adds filters on search of invoices',
+ 'init_xml': [],
+ 'installable': True,
+ 'name': 'Account Journal Debit Notes',
+ 'test': [],
+ 'update_xml': [
+ 'account_journal_view.xml',
+ 'account_invoice_view.xml',
+ ],
+ 'version': '0.0',
+ 'website': 'http://www.sistemasadhoc.com.ar/'}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== added file 'l10n_ar_debit_note/account_invoice_view.xml'
--- l10n_ar_debit_note/account_invoice_view.xml 1970-01-01 00:00:00 +0000
+++ l10n_ar_debit_note/account_invoice_view.xml 2014-01-09 18:49:12 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ <!-- Invoices -->
+ <record id="view_account_invoice_filter" model="ir.ui.view">
+ <field name="name">account.invoice.select</field>
+ <field name="model">account.invoice</field>
+ <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+ <field name="arch" type="xml">
+ <field name="period_id" position="after">
+ <separator/>
+ <filter domain="[('journal_id.is_debit_note','=',False)]" help="Invoices"/>
+ <filter domain="[('journal_id.is_debit_note','=',True)]" help="Debit Notes"/>
+ </field>
+ </field>
+ </record>
+
+
+ </data>
+</openerp>
=== added file 'l10n_ar_debit_note/account_journal.py'
--- l10n_ar_debit_note/account_journal.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_debit_note/account_journal.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import logging
+
+from openerp import SUPERUSER_ID
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
+
+class account_journal(osv.osv):
+ _name = "account.journal"
+ _inherit = "account.journal"
+ _columns = {
+ 'is_debit_note': fields.boolean('Is Debit Note?',),
+ }
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'l10n_ar_debit_note/account_journal_view.xml'
--- l10n_ar_debit_note/account_journal_view.xml 1970-01-01 00:00:00 +0000
+++ l10n_ar_debit_note/account_journal_view.xml 2014-01-09 18:49:12 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+
+ <!-- Account Journal -->
+
+ <record id="view_account_journal_form" model="ir.ui.view">
+ <field name="name">account.journal.form</field>
+ <field name="model">account.journal</field>
+ <field name="inherit_id" ref="account.view_account_journal_form"/>
+ <field name="arch" type="xml">
+ <field name="type" position="after">
+ <field name="is_debit_note" attrs="{'invisible':[('type','not in', ('sale', 'purchase'))]}"/>
+ </field>
+ </field>
+ </record>
+
+ </data>
+</openerp>
=== added directory 'l10n_ar_debit_note/i18n'
=== modified file 'l10n_ar_invoice/__openerp__.py'
--- l10n_ar_invoice/__openerp__.py 2014-01-09 15:19:22 +0000
+++ l10n_ar_invoice/__openerp__.py 2014-01-09 18:49:12 +0000
@@ -26,7 +26,8 @@
'account_voucher',
'l10n_ar_base_vat',
'l10n_ar_chart_generic',
- 'l10n_ar_states'],
+ 'l10n_ar_states'
+ ],
'description': '\n\nM\xc3\xb3dulo de Facturaci\xc3\xb3n de la localizaci\xc3\xb3n Argentina\n\n\n\nIncluye:\n\n\n\n - Configuraci\xc3\xb3n de libros, diarios y otros detalles para facturaci\xc3\xb3n argentina.\n\n - Wizard para configurar los talonarios necesarios para facturar.\n\n\n\nFalta:\n\n - Terminar de completar la lista de codigos del AFIP de monedas (http://www.afip.gob.ar/fe/documentos/TABLA%20MONEDAS%20V.0%20%2025082010.xls)\n\n',
'init_xml': [],
'installable': True,
@@ -48,7 +49,8 @@
'data/document_type.xml',
'data/partner.xml',
'data/invoice_workflow.xml',
- 'data/reports.xml',
+ # Disable reports
+ # 'data/reports.xml',
'data/country.xml',
'data/res.currency.csv',
'data/afip.journal_template.csv',
=== modified file 'l10n_ar_invoice/invoice.py'
--- l10n_ar_invoice/invoice.py 2013-12-05 21:01:41 +0000
+++ l10n_ar_invoice/invoice.py 2014-01-09 18:49:12 +0000
@@ -98,7 +98,6 @@
def afip_validation(self, cr, uid, ids, context={}):
obj_resp_class = self.pool.get('afip.responsability_relation')
-
for invoice in self.browse(cr, uid, ids):
# If parter is not in Argentina, ignore it.
if invoice.partner_id.country_id.name != 'Argentina':
@@ -111,6 +110,9 @@
# Take responsability classes for this journal
invoice_class = invoice.journal_id.journal_class_id.document_class_id
+ if not invoice_class:
+ raise osv.except_osv(_('No document class for journal'),
+ _('This journal have not a document class configured. Assign one please.'))
resp_class_ids = obj_resp_class.search(cr, uid, [('document_class_id','=', invoice_class.id)])
# You can emmit this document?
@@ -121,7 +123,7 @@
# Partner can receive this document?
resp_class = [ rc.receptor_id.code for rc in obj_resp_class.browse(cr, uid, resp_class_ids) ]
- if False and invoice.partner_id.responsability_id.code not in resp_class:
+ if invoice.partner_id.responsability_id.code not in resp_class:
raise osv.except_osv(_('Invalid receptor'),
_('Your partner cant recive this document. Check AFIP responsability of the partner, or Journal Account of the invoice.'))
@@ -156,78 +158,131 @@
def onchange_partner_id(self, cr, uid, ids, type, partner_id,
date_invoice=False, payment_term=False,
- partner_bank_id=False, company_id=False):
+ partner_bank_id=False, company_id=False, context=None):
result = super(account_invoice,self).onchange_partner_id(cr, uid, ids,
type, partner_id, date_invoice, payment_term,
- partner_bank_id, company_id)
+ partner_bank_id, company_id,)
+
+ # if is_debit_note == None:
+ # is_debit_note = False
+
+ if type == 'in_invoice':
+ journal_type = 'purchase'
+ elif type == 'in_refund':
+ journal_type = 'purchase_refund'
+ elif type == 'out_invoice':
+ journal_type = 'sale'
+ elif type == 'out_refund':
+ journal_type = 'sale_refund'
+ journal_id = False
+ journal_ids = False
+ normal_journal_ids = False
+
if company_id and partner_id:
- # Set list of valid journals by partner responsability
- partner_obj = self.pool.get('res.partner')
- company_obj = self.pool.get('res.company')
- partner = partner_obj.browse(cr, uid, partner_id)
- company = company_obj.browse(cr, uid, company_id)
- responsability = partner.responsability_id
- if responsability.issuer_relation_ids is None:
- return result
-
- document_class_set = set([ i.document_class_id.id for i in responsability.issuer_relation_ids ])
-
- type_map = {
- 'out_invoice': ['sale'],
- 'out_refund': ['sale_refund'],
- 'in_invoice': ['purchase'],
- 'in_refund': ['purchase_refund'],
- }
-
- if not company.partner_id:
- result['warning']={'title': _('Your company has not setted any partner'),
- 'message': _('That\'s is really strange. You must have a partner associated to your company.')}
- _logger.warning('Your company "%s" has not setted any partner.' % company.name)
- return result
-
- if not company.partner_id.responsability_id.id:
- result['warning']={'title': _('Your company has not setted any responsability'),
- 'message': _('Please, set your company responsability in the company partner before continue.')}
- _logger.warning('Your company "%s" has not setted any responsability.' % company.name)
- return result
-
- cr.execute("""
- SELECT DISTINCT J.id, J.name, IRSEQ.number_next
- FROM account_journal J
- LEFT join ir_sequence IRSEQ on (J.sequence_id = IRSEQ.id)
- LEFT join afip_journal_class JC on (J.journal_class_id = JC.id)
- LEFT join afip_document_class DC on (JC.document_class_id = DC.id)
- LEFT join afip_responsability_relation RR on (DC.id = RR.document_class_id)
- WHERE
- (RR.id is Null OR (RR.id is not Null AND RR.issuer_id = %s AND RR.receptor_id = %s)) AND
- J.type in %s AND
- J.id is not NULL AND
- J.sequence_id is not NULL
- AND IRSEQ.number_next is not NULL
- ORDER BY IRSEQ.number_next DESC;
- """, (company.partner_id.responsability_id.id, partner.responsability_id.id, tuple(type_map[type])))
- accepted_journal_ids = [ x[0] for x in cr.fetchall() ]
-
- if 'domain' not in result: result['domain'] = {}
- if 'value' not in result: result['value'] = {}
-
- if accepted_journal_ids:
- result['domain'].update({
- 'journal_id': [('id','in', accepted_journal_ids)],
- })
- #result['value'].update({
- # 'journal_id': accepted_journal_ids[0],
- #})
- else:
- result['domain'].update({
- 'journal_id': [('id','in',[])],
- })
- #result['value'].update({
- # 'journal_id': False,
- #})
-
+ normal_journal_ids = self.get_valid_journals(cr, uid, partner_id, journal_type, is_debit_note=False, company_id=company_id)
+ journal_ids = self.get_valid_journals(cr, uid, partner_id, journal_type, company_id=company_id)
+
+ if normal_journal_ids:
+ journal_id = normal_journal_ids[0]
+
+ if 'value' not in result: result['value'] = {}
+ result['value'].update({
+ 'journal_id': journal_id,
+ })
+
+ if 'domain' not in result: result['domain'] = {}
+ result['domain'].update({
+ 'journal_id': [('id', 'in', journal_ids)],
+ })
return result
+ # return {'value': {}, 'domain':{'journal_id':[('id', 'in', journal_ids)]}}
+
+ def get_valid_journals(self, cr, uid, partner_id, journal_type, is_debit_note=None, company_id=False, context=None):
+ # Type could be purchase or sale
+ journal_obj = self.pool.get('account.journal')
+ resp_relation_obj = self.pool.get('afip.responsability_relation')
+ responsability_obj = self.pool.get('afip.responsability')
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+
+ if context is None:
+ context = {}
+ if company_id == False:
+ company_id = context.get('company_id', user.company_id.id)
+ company = self.pool.get('res.company').browse(cr, uid, company_id, context)
+
+ if not company.partner_id.responsability_id.id:
+ raise orm.except_orm(_('Your company has not setted any responsability'),
+ _('Please, set your company responsability in the company partner before continue.'))
+ _logger.warning('Your company "%s" has not setted any responsability.' % company.name)
+
+ if journal_type == 'sale' or 'sale_refund':
+ issuer_responsability_id = company.partner_id.responsability_id.id
+ receptor_responsability_id = partner.responsability_id.id
+ elif journal_type == 'purchase' or 'purchase_refund':
+ issuer_responsability_id = partner.responsability_id.id
+ receptor_responsability_id = company.partner_id.responsability_id.id
+ else:
+ raise orm.except_orm(_('Journal Type Error'),
+ _('Journal Type Not defined)'))
+
+ document_class_ids = []
+ journal_ids = []
+ journal_filter = []
+ journal_filter.append(('company_id','=',company_id))
+
+ if journal_type:
+ journal_filter.append(('type','=',journal_type))
+ if is_debit_note != None:
+ journal_filter.append(('is_debit_note','=',is_debit_note))
+
+ resp_relation_ids = resp_relation_obj.search(cr, uid, [('issuer_id', '=', issuer_responsability_id),('receptor_id', '=', receptor_responsability_id)], context=context)
+
+ for resp_relation in resp_relation_obj.browse(cr, uid, resp_relation_ids, context):
+ if resp_relation.document_class_id not in document_class_ids:
+ document_class_ids.append(resp_relation.document_class_id.id)
+ journal_filter.append(('journal_class_id.document_class_id','in',document_class_ids))
+ journal_ids = journal_obj.search(cr, uid, journal_filter, context)
+ return journal_ids
+
+
+ def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id):
+ result = super(account_invoice,self).onchange_partner_id(cr, uid, ids,
+ company_id, part_id, type, invoice_line, currency_id)
+ partner_id = part_id
+
+ if type == 'in_invoice':
+ journal_type = 'purchase'
+ elif type == 'in_refund':
+ journal_type = 'purchase_refund'
+ elif type == 'out_invoice':
+ journal_type = 'sale'
+ elif type == 'out_refund':
+ journal_type = 'sale_refund'
+
+ journal_id = False
+ journal_ids = False
+ normal_journal_ids = False
+
+ if company_id and partner_id:
+ normal_journal_ids = self.get_valid_journals(cr, uid, partner_id, journal_type, is_debit_note=False, company_id=company_id)
+ journal_ids = self.get_valid_journals(cr, uid, partner_id, journal_type, company_id=company_id)
+
+ if normal_journal_ids:
+ journal_id = normal_journal_ids[0]
+
+ if 'value' not in result: result['value'] = {}
+ result['value'].update({
+ 'journal_id': journal_id,
+ })
+
+ if 'domain' not in result: result['domain'] = {}
+ result['domain'].update({
+ 'journal_id': [('id', 'in', journal_ids)],
+ })
+
+ return result
account_invoice()
=== modified file 'l10n_ar_invoice/report/__init__.py'
--- l10n_ar_invoice/report/__init__.py 2014-01-09 15:19:22 +0000
+++ l10n_ar_invoice/report/__init__.py 2014-01-09 18:49:12 +0000
@@ -19,6 +19,6 @@
#
##############################################################################
-import invoice
+# import invoice
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'l10n_ar_invoice/security/ir.model.access.csv'
--- l10n_ar_invoice/security/ir.model.access.csv 2014-01-09 15:19:22 +0000
+++ l10n_ar_invoice/security/ir.model.access.csv 2014-01-09 18:49:12 +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 2014-01-09 15:19:22 +0000
+++ l10n_ar_invoice/security/l10n_ar_invoice_security.xml 2014-01-09 18:49:12 +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 2014-01-09 15:19:22 +0000
+++ l10n_ar_invoice/view/afip_menuitem.xml 2014-01-09 18:49:12 +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/invoice_view.xml'
--- l10n_ar_invoice/view/invoice_view.xml 2013-09-30 15:07:23 +0000
+++ l10n_ar_invoice/view/invoice_view.xml 2014-01-09 18:49:12 +0000
@@ -30,7 +30,7 @@
<field name="arch" type="xml">
<data>
<field name="journal_id" position="replace">
- <field name="journal_id" groups="account.group_account_user" on_change="onchange_journal_id(journal_id, context)" widget="many2one"/>
+ <field name="journal_id" groups="account.group_account_user" on_change="onchange_journal_id(journal_id, context)" widget="many2one"/>
</field>
</data>
</field>
=== modified file 'l10n_ar_invoice/view/partner_view.xml'
--- l10n_ar_invoice/view/partner_view.xml 2014-01-09 15:19:22 +0000
+++ l10n_ar_invoice/view/partner_view.xml 2014-01-09 18:49:12 +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>
=== added directory 'l10n_ar_invoice_sale'
=== added file 'l10n_ar_invoice_sale/AUTHORS'
--- l10n_ar_invoice_sale/AUTHORS 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_sale/AUTHORS 2014-01-09 18:49:12 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) 2012 OpenERP - Team de Localización Argentina.
+# https://launchpad.net/~openerp-l10n-ar-localization
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+#
+# En este archivo encontrará la lista de contribuyentes al código del
+# presente módulo de la localización argentina.
+#
+# Si usted ha contribuido debe indicar su nombre y correo electrónico tal
+# como se presenta a continuación.
+#
+# El órden de contribución será determinado en forma alfabética. Si quiere
+# saber como ha contribuido cada autor en el módulo le recomendamos ver la
+# página de launchpad
+#
+# http://bazaar.launchpad.net/~openerp-l10n-ar-localization/openerp-l10n-ar-localization/6.0/changes
+#
+##############################################################################
+
+Juan José Scarafía <scarafia.juanjose@xxxxxxxxx>
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'l10n_ar_invoice_sale/LICENSE'
--- l10n_ar_invoice_sale/LICENSE 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_sale/LICENSE 2014-01-09 18:49:12 +0000
@@ -0,0 +1,661 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
=== added file 'l10n_ar_invoice_sale/__init__.py'
--- l10n_ar_invoice_sale/__init__.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_sale/__init__.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) 2012 OpenERP - Team de Localización Argentina.
+# https://launchpad.net/~openerp-l10n-ar-localization
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import sale
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'l10n_ar_invoice_sale/__openerp__.py'
--- l10n_ar_invoice_sale/__openerp__.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_sale/__openerp__.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) 2012 OpenERP - Team de Localización Argentina.
+# https://launchpad.net/~openerp-l10n-ar-localization
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{ 'active': False,
+ 'author': 'OpenERP - Team de Localizaci\xc3\xb3n Argentina',
+ 'category': 'Localization/Argentina',
+ 'demo_xml': [],
+ 'depends': [
+ 'l10n_ar_invoice',
+ 'sale'],
+ 'description': '''
+Modulo que integra l10n_ar_invoice y sale. Permite asignación automatica de diario al crear una factura desde una orden de venta
+TODO: ver si ya se hizo el merge del procedimiento de sale/wizard/sale_line_invoice.py, en ese caso no habria que hacer nada mas, si no hay que sobreescribir dicho procedimiento para elegir el jorunal correcto.
+''',
+ 'init_xml': [],
+ 'installable': True,
+ 'auto_install': True,
+ 'license': 'AGPL-3',
+ 'name': 'Argentina - Asignación automática de Diarios',
+ 'test': [
+ ],
+ 'update_xml': [
+ ],
+ 'version': '2.7.232',
+ 'website': 'https://launchpad.net/~openerp-l10n-ar-localization'}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added directory 'l10n_ar_invoice_sale/data'
=== added directory 'l10n_ar_invoice_sale/i18n'
=== added directory 'l10n_ar_invoice_sale/report'
=== added file 'l10n_ar_invoice_sale/sale.py'
--- l10n_ar_invoice_sale/sale.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_sale/sale.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta
+import time
+from openerp import pooler
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
+import openerp.addons.decimal_precision as dp
+from openerp import netsvc
+
+
+class sale_order(osv.osv):
+ _inherit = "sale.order"
+
+ def _prepare_invoice(self, cr, uid, order, lines, context=None):
+ if context is None:
+ context = {}
+
+ invoice_obj = self.pool.get('account.invoice')
+
+ result = super(sale_order,self)._prepare_invoice(cr, uid, order, lines, context=context)
+ journal_ids = self.pool.get('account.journal').search(cr, uid,
+ [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)],
+ limit=1)
+
+ partner_id = result.get('partner_id' or False)
+ company_id = result.get('company_id' or False)
+ journal_type = 'sale'
+
+ journal_ids = False
+ journal_id = False
+
+ if company_id and partner_id:
+ journal_ids = invoice_obj.get_valid_journals(cr, uid, partner_id, journal_type, is_debit_note=False, company_id=company_id)
+
+ if journal_ids:
+ journal_id = journal_ids[0]
+
+ result['journal_id'] = journal_id
+
+ return result
+
\ No newline at end of file
=== added directory 'l10n_ar_invoice_sale/security'
=== added directory 'l10n_ar_invoice_sale/test'
=== added directory 'l10n_ar_invoice_sale/view'
=== added directory 'l10n_ar_invoice_sale/wizard'
=== added directory 'l10n_ar_invoice_stock'
=== added file 'l10n_ar_invoice_stock/AUTHORS'
--- l10n_ar_invoice_stock/AUTHORS 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_stock/AUTHORS 2014-01-09 18:49:12 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) 2012 OpenERP - Team de Localización Argentina.
+# https://launchpad.net/~openerp-l10n-ar-localization
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+#
+# En este archivo encontrará la lista de contribuyentes al código del
+# presente módulo de la localización argentina.
+#
+# Si usted ha contribuido debe indicar su nombre y correo electrónico tal
+# como se presenta a continuación.
+#
+# El órden de contribución será determinado en forma alfabética. Si quiere
+# saber como ha contribuido cada autor en el módulo le recomendamos ver la
+# página de launchpad
+#
+# http://bazaar.launchpad.net/~openerp-l10n-ar-localization/openerp-l10n-ar-localization/6.0/changes
+#
+##############################################################################
+
+Juan José Scarafía <scarafia.juanjose@xxxxxxxxx>
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'l10n_ar_invoice_stock/LICENSE'
--- l10n_ar_invoice_stock/LICENSE 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_stock/LICENSE 2014-01-09 18:49:12 +0000
@@ -0,0 +1,661 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
=== added file 'l10n_ar_invoice_stock/__init__.py'
--- l10n_ar_invoice_stock/__init__.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_stock/__init__.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) 2012 OpenERP - Team de Localización Argentina.
+# https://launchpad.net/~openerp-l10n-ar-localization
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import stock
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'l10n_ar_invoice_stock/__openerp__.py'
--- l10n_ar_invoice_stock/__openerp__.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_stock/__openerp__.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) 2012 OpenERP - Team de Localización Argentina.
+# https://launchpad.net/~openerp-l10n-ar-localization
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{ 'active': False,
+ 'author': 'OpenERP - Team de Localizaci\xc3\xb3n Argentina',
+ 'category': 'Localization/Argentina',
+ 'demo_xml': [],
+ 'depends': [
+ 'l10n_ar_invoice',
+ 'stock'],
+ 'description': 'Modulo que integra l10n_ar_invoice y stock. Permite asignación automatica de diario al crear una factura desde un picking',
+ 'init_xml': [],
+ 'installable': True,
+ 'auto_install': True,
+ 'license': 'AGPL-3',
+ 'name': 'Argentina - Asignación automática de Diarios desde Picking',
+ 'test': [
+ ],
+ 'update_xml': [
+ 'wizard/stock_inventory_merge_view.xml',
+ ],
+ 'version': '2.7.232',
+ 'website': 'https://launchpad.net/~openerp-l10n-ar-localization'}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added directory 'l10n_ar_invoice_stock/data'
=== added directory 'l10n_ar_invoice_stock/i18n'
=== added directory 'l10n_ar_invoice_stock/report'
=== added directory 'l10n_ar_invoice_stock/security'
=== added file 'l10n_ar_invoice_stock/stock.py'
--- l10n_ar_invoice_stock/stock.py 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_stock/stock.py 2014-01-09 18:49:12 +0000
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+import time
+from operator import itemgetter
+from itertools import groupby
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+from openerp import netsvc
+from openerp import tools
+from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT
+import openerp.addons.decimal_precision as dp
+import logging
+_logger = logging.getLogger(__name__)
+
+class stock_picking(osv.osv):
+ _inherit = "stock.picking"
+
+ def _prepare_invoice(self, cr, uid, picking, partner, inv_type, journal_id, context=None):
+ """ Builds the dict containing the values for the invoice
+ @param picking: picking object
+ @param partner: object of the partner to invoice
+ @param inv_type: type of the invoice ('out_invoice', 'in_invoice', ...)
+ @param journal_id: ID of the accounting journal
+ @return: dict that will be used to create the invoice object
+ """
+
+ if context is None:
+ context = {}
+
+ invoice_obj = self.pool.get('account.invoice')
+
+ invoice_vals = super(stock_picking,self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
+
+ if inv_type == 'in_invoice':
+ journal_type = 'purchase'
+ elif inv_type == 'in_refund':
+ journal_type = 'purchase_refund'
+ elif inv_type == 'out_invoice':
+ journal_type = 'sale'
+ elif inv_type == 'out_refund':
+ journal_type = 'sale_refund'
+
+ partner_id = invoice_vals.get('partner_id' or False)
+ company_id = invoice_vals.get('company_id' or False)
+ journal_type = 'sale'
+
+ journal_ids = False
+ journal_id = False
+
+ if company_id and partner_id:
+ journal_ids = invoice_obj.get_valid_journals(cr, uid, partner_id, journal_type, is_debit_note=False, company_id=company_id)
+
+ if journal_ids:
+ journal_id = journal_ids[0]
+
+ invoice_vals['journal_id'] = journal_id
+
+ return invoice_vals
+
=== added directory 'l10n_ar_invoice_stock/test'
=== added directory 'l10n_ar_invoice_stock/view'
=== added directory 'l10n_ar_invoice_stock/wizard'
=== added file 'l10n_ar_invoice_stock/wizard/__init__.py'
=== added file 'l10n_ar_invoice_stock/wizard/stock_inventory_merge_view.xml'
--- l10n_ar_invoice_stock/wizard/stock_inventory_merge_view.xml 1970-01-01 00:00:00 +0000
+++ l10n_ar_invoice_stock/wizard/stock_inventory_merge_view.xml 2014-01-09 18:49:12 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+ <record id="view_stock_invoice_onshipping" model="ir.ui.view">
+ <field name="name">Stock Invoice Onshipping</field>
+ <field name="model">stock.invoice.onshipping</field>
+ <field name="inherit_id" ref="stock.view_stock_invoice_onshipping"/>
+ <field name="arch" type="xml">
+ <!-- We hide this field because it is choosen accordly the partner -->
+ <field name="journal_id" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </field>
+ </field>
+ </record>
+ </data>
+</openerp>
=== removed directory 'l10n_ar_reports_samples'
=== modified file 'l10n_ar_vat_reports/__openerp__.py'
--- l10n_ar_vat_reports/__openerp__.py 2014-01-09 15:19:22 +0000
+++ l10n_ar_vat_reports/__openerp__.py 2014-01-09 18:49:12 +0000
@@ -1,6 +1,16 @@
# 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',
+<<<<<<< TREE
'category': 'Reporting subsystems',
'data': ['wizard/report_prompt.xml', 'report/report_data.xml'],
'depends': ['account', 'pentaho_reports'],
@@ -9,3 +19,15 @@
'name': 'Pentaho res.partner report sample',
'version': '0.243',
'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
+}
+>>>>>>> MERGE-SOURCE
=== 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 2014-01-09 18:49:12 +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 2014-01-09 18:49:12 +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 2014-01-09 18:49:12 +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/report_data.xml'
--- l10n_ar_vat_reports/report/report_data.xml 2014-01-09 15:19:22 +0000
+++ l10n_ar_vat_reports/report/report_data.xml 2014-01-09 18:49:12 +0000
@@ -7,8 +7,7 @@
<field name='pentaho_report_output_type'>pdf</field>
<field name='model'>account.invoice</field>
<field name='pentaho_filename'>l10n_ar_vat_reports/report/vat_report.prpt</field>
- <field name='attachement'></field>
- <field name='attachement_use' eval="False"/>
+ <field name="pentaho_report_model_id" ref="account.model_account_invoice"/>
<field name='is_pentaho_report' eval="True"/>
<field name='pentaho_load_file' eval="True"/>
</record>
=== 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 2014-01-09 18:49:12 +0000 differ
=== modified file 'l10n_ar_vat_reports/wizard/report_prompt.py'
--- l10n_ar_vat_reports/wizard/report_prompt.py 2014-01-09 15:19:22 +0000
+++ l10n_ar_vat_reports/wizard/report_prompt.py 2014-01-09 18:49:12 +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):
@@ -36,6 +40,9 @@
'journal_ids': fields.many2many('account.journal', string='Journals', required=True),
'date_from': fields.date("Start Date"),
'date_to': fields.date("End Date"),
+ # TODO add group by month functinality, that would be printing different reports for each month, the issue is that we can only reutrn one print. And calling different reports doesn't works
+ # 'group_by_month': fields.boolean("Group by Month"),
+ 'starting_page': fields.integer("Starting Page", required=True),
}
def _get_output_type(self, cr, uid, context=None):
@@ -77,7 +84,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 +118,32 @@
'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',
+ 'starting_page': 1,
}
+ # 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 +155,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 +168,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 +182,35 @@
# 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)
+
+ # 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'
+
+ no_data_description = ''
if not model_ids:
- raise osv.except_osv(_('No Data!'),
- _('There is no data for current filters.'))
+ # We remove this as we want to print it the same way but with a new message
+ # raise osv.except_osv(_('No Data!'),
+ # _('There is no data for current filters.'))
+ no_data_description = 'Sin Movimientos'
+
+ company_vat = wizard.company_id.partner_id.printed_vat
+ company_name = wizard.company_id.name
+
data['ids'] = model_ids
data['model'] = model
+ data['variables'] = {'report_description':report_description,'range_label':range_label, 'starting_page' :wizard.starting_page, 'no_data_description': no_data_description, 'company_name': company_name,'company_vat': company_vat}
data['output_type'] = wizard.output_type
return self._print_report(cr, uid, ids, data, context=context)
=== modified file 'l10n_ar_vat_reports/wizard/report_prompt.xml'
--- l10n_ar_vat_reports/wizard/report_prompt.xml 2014-01-09 15:19:22 +0000
+++ l10n_ar_vat_reports/wizard/report_prompt.xml 2014-01-09 18:49:12 +0000
@@ -7,8 +7,11 @@
<field name='arch' type='xml'>
<form string="Report Options" version="7.0">
<group col="4">
- <field name="company_id" invisible="1"/>
- <field name="fiscalyear_id" domain="[('company_id','=',company_id)]"/>
+ <field name="output_type" colspan='2'/>
+ <newline/>
+ <field name="company_id" invisible="1"/>
+ <field name="fiscalyear_id" domain="[('company_id','=',company_id)]"/>
+ <field name="starting_page" />
</group>
<notebook tabpos="up" colspan="4">
<page string="Filters" name="filters">
Follow ups
