diff --git a/addons/l10n_gt/__init__.py b/addons/l10n_gt/__init__.py
index c00dcc54498..3b91466a312 100644
--- a/addons/l10n_gt/__init__.py
+++ b/addons/l10n_gt/__init__.py
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
-# Copyright (c) 2004-2010 Soluciones Tecnologócias Prisma S.A. All Rights Reserved.
+# Copyright (c) 2009-2010 Soluciones Tecnologócias Prisma S.A. All Rights Reserved.
# José Rodrigo Fernández Menegazzo, Soluciones Tecnologócias Prisma S.A.
# (http://www.solucionesprisma.com)
#
@@ -20,6 +20,5 @@
#
##############################################################################
-import partner
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index 6cb30f6c7bb..e8b5bcdd0dc 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
-# Copyright (c) 2004-2010 Soluciones Tecnologócias Prisma S.A. All Rights Reserved.
+# Copyright (c) 2009-2010 Soluciones Tecnologócias Prisma S.A. All Rights Reserved.
# José Rodrigo Fernández Menegazzo, Soluciones Tecnologócias Prisma S.A.
# (http://www.solucionesprisma.com)
#
@@ -21,35 +21,31 @@
##############################################################################
#
-# This module provides a minimal Guatemalan chart of accounts for building upon further
-# Open ERP's default currency and accounts are remapped to this chart
+# This module provides a minimal Guatemalan chart of accounts that can be use
+# to build upon a more complex one. It also includes a chart of taxes and
+# the Quetzal currency.
#
# This module is based on the UK minimal chart of accounts:
# Copyright (c) 2004-2009 Seath Solutions Ltd. All Rights Reserved.
# Geoff Gardiner, Seath Solutions Ltd (http://www.seathsolutions.com/)
#
-# This module works for Open ERP 4.1.0 (and, assumed, onwards).
-# This module does not work for Open ERP 4.0.2 and before.
-#
-# Cash tax accounting can be accommodated with further processing in Open ERP
-#
-# Status 2.0 - tested on Open ERP 5.0.6
+# This module works with OpenERP 6.0
#
{
- 'name': 'Guatemala - minimal',
- 'version': '2.0',
+ 'name': 'Guatemala - Plan contable general',
+ 'version': '3.0',
'category': 'Localisation/Account Charts',
- 'description': """This is the base module to manage a minimal accounting chart for Guatemala in Open ERP.""",
+ 'description': """Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency""",
'author': 'José Rodrigo Fernández Menegazzo',
'website': 'http://solucionesprisma.com/',
- 'depends': ['base', 'base_vat', 'account', 'account_chart'],
+ 'depends': ['base', 'account', 'account_chart'],
'init_xml': [],
'update_xml': [
'account_types.xml',
'account_chart.xml',
'account_tax.xml',
- 'l10n_gt_wizard.xml'
+ 'l10n_gt_base.xml',
],
'demo_xml': [],
'installable': True,
diff --git a/addons/l10n_gt/account_chart.xml b/addons/l10n_gt/account_chart.xml
index 8e7615b8b86..ffb4177d743 100644
--- a/addons/l10n_gt/account_chart.xml
+++ b/addons/l10n_gt/account_chart.xml
@@ -1,7 +1,6 @@
-
-
+
@@ -51,8 +50,8 @@
1.1.01.01
Caja Chica
- other
-
+ liquidity
+
@@ -112,7 +111,7 @@
IVA por Cobrar
other
-
+
@@ -120,7 +119,7 @@
Retenciones de IVA recibidas
other
-
+
@@ -289,7 +288,7 @@
IVA por Pagar
other
-
+
@@ -305,7 +304,7 @@
Impuestos
other
-
+
@@ -329,7 +328,7 @@
Provisión para Indemnizaciones
other
-
+
@@ -353,7 +352,7 @@
Anticipos
other
-
+
@@ -390,9 +389,9 @@
3.1.01.02
- other
+ Reservas
- view
+ other
@@ -640,7 +639,7 @@
7.1.01.02
- Otros Productos Financieros
+ Intereses
other
diff --git a/addons/l10n_gt/account_tax.xml b/addons/l10n_gt/account_tax.xml
index 8d25dafa77e..ef34910cb1a 100644
--- a/addons/l10n_gt/account_tax.xml
+++ b/addons/l10n_gt/account_tax.xml
@@ -71,50 +71,5 @@
-
-
-
- Plantilla de cuentas de Guatemala (sencilla)
-
-
-
-
-
-
-
-
-
-
-
-
-
- IVA por Cobrar
-
- percent
-
-
-
-
-
-
- purchase
-
-
-
-
-
-
- IVA por Pagar
-
- percent
-
-
-
-
-
-
- sale
-
-
diff --git a/addons/l10n_gt/account_types.xml b/addons/l10n_gt/account_types.xml
index 001b7fd2eb0..4e3e308578b 100644
--- a/addons/l10n_gt/account_types.xml
+++ b/addons/l10n_gt/account_types.xml
@@ -1,19 +1,6 @@
-
-
-
-
- Cuentas por Cobrar
- cxc
- unreconciled
-
-
-
- Cuentas por Pagar
- cxp
- unreconciled
-
+
Vista
@@ -21,40 +8,60 @@
none
-
- Ingresos
- ingresos
- none
-
-
-
- Gastos
- gastos
- none
-
-
-
- Impuestos
- Impuestos
- unreconciled
-
-
-
- Efectivo
- Efectivo
- balance
-
-
Activo
Activo
balance
+ asset
+
+
+
+ Cuentas por Cobrar
+ cxc
+ unreconciled
+ asset
+
+
+
+ Pasivo
+ Pasivo
+ balance
+ liability
+
+
+
+ Cuentas por Pagar
+ cxp
+ unreconciled
+ liability
Capital
capital
balance
+ asset
+
+
+
+ Ingresos
+ ingresos
+ none
+ income
+
+
+
+ Gastos
+ gastos
+ none
+ expense
+
+
+
+ Efectivo
+ Efectivo
+ asset
+ balance
diff --git a/addons/l10n_gt/i18n/es_ES.po b/addons/l10n_gt/i18n/es_ES.po
deleted file mode 100644
index 1486a5c4fc9..00000000000
--- a/addons/l10n_gt/i18n/es_ES.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * l10n_gt
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:31:42+0000\n"
-"PO-Revision-Date: 2009-05-20 10:31:42+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_gt
-#: model:account.account.type,name:l10n_gt.account_type_receivable
-msgid "Receivable"
-msgstr "Cuentas por Cobrar"
-
-#. module: l10n_gt
-#: model:ir.module.module,description:l10n_gt.module_meta_information
-msgid "This is the base module to manage the accounting chart for Guatemala in Open ERP."
-msgstr "Este es el módulo base para manejar una contabilidad mínima para Guatemala"
-
-#. module: l10n_gt
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Error, no puede crear machotes de cuentas recursivas"
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_income
-msgid "Income"
-msgstr "Ingreso"
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_tax
-msgid "Tax"
-msgstr "Impuesto"
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_cash
-msgid "Cash"
-msgstr "Efectivo"
-
-#. module: l10n_gt
-#: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr "Genera la numenclatura contable a partir de un machote. Se le preguntará por el nombre de la empresa, el machote a usar, el número de digitos para generar en los códigos de las cuentas, una o más cuentas de banco, la moneda a usar para los libros. Este es el mismo asistente que se ejecuta al correr: Gestión Financiera/Configuración/Contabilidad Financiera/Plantillas/Generar plan contable a partir de una plantilla de plan contable
-"
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_payable
-msgid "Payable"
-msgstr "Cuentas por Pagar"
-
-#. module: l10n_gt
-#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
-msgid "Guatemala - minimal"
-msgstr "Guatemala - mínima"
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_equity
-msgid "Equity"
-msgstr "Patrimonio"
-
-#. module: l10n_gt
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Error, no puede crear códigos de impuestos recursivos"
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_expense
-msgid "Expense"
-msgstr "Gasto"
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_view
-msgid "View"
-msgstr "Vista"
-
-#. module: l10n_gt
-#: field:res.partner,vat:0
-msgid "VAT"
-msgstr "NIT"
diff --git a/addons/l10n_gt/i18n/l10n_gt.pot b/addons/l10n_gt/i18n/l10n_gt.pot
index c1f386a76fb..e9e95bf6ec6 100644
--- a/addons/l10n_gt/i18n/l10n_gt.pot
+++ b/addons/l10n_gt/i18n/l10n_gt.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:36:37+0000\n"
-"PO-Revision-Date: 2009-05-20 10:36:37+0000\n"
+"POT-Creation-Date: 2010-11-04 01:35:54+0000\n"
+"PO-Revision-Date: 2010-11-04 01:35:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_receivable
-msgid "Receivable"
+#: model:account.account.type,name:l10n_gt.cuenta_cxp
+msgid "Cuentas por Pagar"
msgstr ""
#. module: l10n_gt
-#: model:ir.module.module,description:l10n_gt.module_meta_information
-msgid "This is the base module to manage the accounting chart for Guatemala in Open ERP."
+#: model:account.account.type,name:l10n_gt.cuenta_cxc
+msgid "Cuentas por Cobrar"
msgstr ""
#. module: l10n_gt
@@ -31,39 +31,8 @@ msgid "Error ! You can not create recursive account templates."
msgstr ""
#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_gt
-#: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_gt
-#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
-msgid "Guatemala - minimal"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_equity
-msgid "Equity"
+#: model:ir.module.module,description:l10n_gt.module_meta_information
+msgid "Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency"
msgstr ""
#. module: l10n_gt
@@ -72,12 +41,46 @@ msgid "Error ! You can not create recursive Tax Codes."
msgstr ""
#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_expense
-msgid "Expense"
+#: model:account.account.type,name:l10n_gt.cuenta_gastos
+msgid "Gastos"
msgstr ""
#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.account_type_view
-msgid "View"
+#: model:account.account.type,name:l10n_gt.cuenta_vista
+msgid "Vista"
msgstr ""
+#. module: l10n_gt
+#: model:account.account.type,name:l10n_gt.cuenta_pasivo
+msgid "Pasivo"
+msgstr ""
+
+#. module: l10n_gt
+#: model:account.account.type,name:l10n_gt.cuenta_ingresos
+msgid "Ingresos"
+msgstr ""
+
+#. module: l10n_gt
+#: model:account.account.type,name:l10n_gt.cuenta_activo
+msgid "Activo"
+msgstr ""
+
+#. module: l10n_gt
+#: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
+msgid "Generar la nomenclatura contable a partir de un modelo. Deberá seleccionar una compañía, el modelo a utilizar, el número de digitos a usar en la nomenclatura, la moneda para crear los diarios."
+msgstr ""
+
+#. module: l10n_gt
+#: model:account.account.type,name:l10n_gt.cuenta_capital
+msgid "Capital"
+msgstr ""
+
+#. module: l10n_gt
+#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
+msgid "Guatemala - minimal"
+msgstr ""
+
+#. module: l10n_gt
+#: model:account.account.type,name:l10n_gt.cuenta_efectivo
+msgid "Efectivo"
+msgstr ""
diff --git a/addons/l10n_gt/l10n_gt_wizard.xml b/addons/l10n_gt/l10n_gt_wizard.xml
deleted file mode 100644
index ae3c48a2431..00000000000
--- a/addons/l10n_gt/l10n_gt_wizard.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- Generate Chart of Accounts from a Chart Template
- Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus, the pure copy of chart Template is generated.
- This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
-
- open
-
-
-
-
diff --git a/addons/l10n_gt/partner.py b/addons/l10n_gt/partner.py
deleted file mode 100644
index 9d9971a7228..00000000000
--- a/addons/l10n_gt/partner.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-from osv import osv
-import netsvc
-
-class res_partner(osv.osv):
- _inherit='res.partner'
-
- def __getattr__(self, attr):
- if not attr.startswith('check_vat_'):
- super(res_partner, self).__getattr__(attr)
-
- def validar_nit(numero):
- return True
- return validar_nit
-
-res_partner()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: