Merge lp:~vauxoo/openerp-venezuela-localization/israel_nro-ctrl-wiz-integration into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Israel Fermin Montilla]

Changed v5 old style wizard to osv_memory wizard system, adapted the logic to comply osv_memory standards, translated texts in spanish to english and re-translated the module.

=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
--- l10n_ve_fiscal_requirements/__openerp__.py	2011-09-30 18:31:58 +0000
+++ l10n_ve_fiscal_requirements/__openerp__.py	2011-10-01 01:45:28 +0000
@@ -32,22 +32,24 @@
     - Required address invoice
     - Unique address invoice.
     - VAT verification for Venezuela rules.
-    - Damaged invoices justification.
+    - Damaged "free forms" justification.
     ---------------------------------------------------------------------------
-    For damaged invoices, you must go to the company and, under the configuration section,
+    For damaged invoices (Free form formats), you must go to the company and, under the configuration section,
     create the corresponding journal and account.
 
+    If you install this module with invoice data on the database, the concept_id will be 
+    Empty for all those invoices, so, when you try to modify them you have to add a value on
+    that field
     ------------------------TECH INFO-------------------------------------------
     CHANGELOG:
        - For the migration to the l10n_ve on OpenERP:
+         - Added the functionality to change the control number on an invoice (free form format)
          - Changed the Invoice Ref label to Control Number
          - Integrated the l10n_ve_nro_ctrl module functionality on this one
          - Since the concept_id field is added by the l10n_ve_islr_withholding, an
            error es rised if it's not installed and it is necesary to withhold
          - If you need to withhold ISLR, you must install the module mentioned abofe
 
-    FURTHER DEVELOPMENT:
-       - Find a way to decouple this module and l10n_ve_islr_withholding
     """,
     'init_xml': [],
     "depends" : ["base", "base_vat", "purchase", "stock", "account"],
@@ -55,7 +57,8 @@
         'view/stock_view.xml',
         'view/account_invoice_view.xml',
         'view/res_company_view.xml',
-        'wizard/wizard_invoice_nro_ctrl_view.xml'
+        'wizard/wizard_invoice_nro_ctrl_view.xml',
+        'wizard/wizard_nro_ctrl_view.xml'
     ],
     'demo_xml': [],
     'test': [],

=== modified file 'l10n_ve_fiscal_requirements/i18n/es_VE.po'
--- l10n_ve_fiscal_requirements/i18n/es_VE.po	2011-09-30 19:01:27 +0000
+++ l10n_ve_fiscal_requirements/i18n/es_VE.po	2011-10-01 01:45:28 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.3\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-09-30 18:40+0000\n"
-"PO-Revision-Date: 2011-09-30 18:40+0000\n"
+"POT-Creation-Date: 2011-09-30 23:50+0000\n"
+"PO-Revision-Date: 2011-09-30 23:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -29,12 +29,12 @@
 #. module: l10n_ve_fiscal_requirements
 #: field:account.invoice,sin_cred:0
 msgid "Tax-exempt?"
-msgstr "Libre de impuesto?"
+msgstr "¿Libre de impuesto?"
 
 #. module: l10n_ve_fiscal_requirements
-#: view:wizard.invoice.nro.ctrl:0
-msgid "Create an invoice to justify the damaged one"
-msgstr "Crear una factura para justificar otra dañada"
+#: view:wiz.nroctrl:0
+msgid "Confirm"
+msgstr "Confirm"
 
 #. module: l10n_ve_fiscal_requirements
 #: view:res.company:0
@@ -48,9 +48,15 @@
 msgstr "Por favor, confirme que está seguro de que desea hacer esto!"
 
 #. module: l10n_ve_fiscal_requirements
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! no puede crear compañías recursivas."
+#: model:ir.actions.act_window,name:l10n_ve_fiscal_requirements.wizard_invoice_nro_control
+msgid "Create null paper"
+msgstr "Crear papel dañado"
+
+#. module: l10n_ve_fiscal_requirements
+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl.py:42
+#, python-format
+msgid "Please confirm that you want to do this by checking the option"
+msgstr "Por favor, confirme que desea hacer esto marcando la opción"
 
 #. module: l10n_ve_fiscal_requirements
 #: view:wizard.invoice.nro.ctrl:0
@@ -58,6 +64,12 @@
 msgstr "Crear Factura"
 
 #. module: l10n_ve_fiscal_requirements
+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl.py:48
+#, python-format
+msgid "You cannot change the state of a Draft invoice"
+msgstr "No puede cambiar una factura en Borrador"
+
+#. module: l10n_ve_fiscal_requirements
 #: model:ir.module.module,shortdesc:l10n_ve_fiscal_requirements.module_meta_information
 msgid "Fiscal requirements Venezuelan laws"
 msgstr "Requerimientos fiscales de las Leyes Venezolanas"
@@ -65,7 +77,12 @@
 #. module: l10n_ve_fiscal_requirements
 #: model:ir.model,name:l10n_ve_fiscal_requirements.model_stock_picking
 msgid "Picking List"
-msgstr "Lista de picking"
+msgstr "Albarán"
+
+#. module: l10n_ve_fiscal_requirements
+#: field:wiz.nroctrl,sure:0
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
 
 #. module: l10n_ve_fiscal_requirements
 #: constraint:res.partner.address:0
@@ -95,6 +112,11 @@
 msgstr "ERROR !"
 
 #. module: l10n_ve_fiscal_requirements
+#: view:wiz.nroctrl:0
+msgid "Changing the Control Number"
+msgstr "Cambio de número de control"
+
+#. module: l10n_ve_fiscal_requirements
 #: field:res.company,journal_id:0
 msgid "Journal"
 msgstr "Diario"
@@ -106,11 +128,22 @@
 
 #. module: l10n_ve_fiscal_requirements
 #: field:account.invoice,nro_ctrl:0
+#: field:wiz.nroctrl,name:0
 #: field:wizard.invoice.nro.ctrl,nro_ctrl:0
 msgid "Control Number"
 msgstr "Número de control"
 
 #. module: l10n_ve_fiscal_requirements
+#: model:ir.model,name:l10n_ve_fiscal_requirements.model_wiz_nroctrl
+msgid "Wizard that changes the invoice control number"
+msgstr "Asistemte para cambiar el número de control"
+
+#. module: l10n_ve_fiscal_requirements
+#: model:ir.actions.act_window,name:l10n_ve_fiscal_requirements.change_nro_ctrl_act
+msgid "Change Control Number"
+msgstr "Cambiar el número de control"
+
+#. module: l10n_ve_fiscal_requirements
 #: view:res.company:0
 msgid "Configuration"
 msgstr "Configuración"
@@ -126,14 +159,14 @@
 msgstr "Cuenta"
 
 #. module: l10n_ve_fiscal_requirements
-#: constraint:res.partner:0
-msgid "Error ! The partner does not have an invoice address. "
-msgstr "Error ! Este cliente no posée una dirección fiscal. "
+#: model:ir.model,name:l10n_ve_fiscal_requirements.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
 
 #. module: l10n_ve_fiscal_requirements
-#: model:ir.actions.act_window,name:l10n_ve_fiscal_requirements.wizard_invoice_nro_control
-msgid "Create null paper"
-msgstr "Crear papel dañado"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! no puede crear compañías recursivas."
 
 #. module: l10n_ve_fiscal_requirements
 #: model:ir.model,name:l10n_ve_fiscal_requirements.model_res_company
@@ -149,11 +182,13 @@
 #. module: l10n_ve_fiscal_requirements
 #: model:ir.model,name:l10n_ve_fiscal_requirements.model_purchase_order
 msgid "Purchase Order"
-msgstr "Orden de compra"
+msgstr "Pedido de compra"
 
 #. module: l10n_ve_fiscal_requirements
 #: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:113
 #: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:117
+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl.py:42
+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl.py:48
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -164,9 +199,15 @@
 msgstr "wizard.invoice.nro.ctrl"
 
 #. module: l10n_ve_fiscal_requirements
+#: view:wiz.nroctrl:0
 #: view:wizard.invoice.nro.ctrl:0
 msgid "Are you sure you want to do this?"
-msgstr "¿Está seguro de que desea hacer esto?"
+msgstr "¿Está seguro que desea hacer esto?"
+
+#. module: l10n_ve_fiscal_requirements
+#: view:wizard.invoice.nro.ctrl:0
+msgid "Create an invoice to justify the damaged one"
+msgstr "Crear una factura para justificar otra dañada"
 
 #. module: l10n_ve_fiscal_requirements
 #: help:account.invoice,sin_cred:0
@@ -195,9 +236,9 @@
 msgstr "Debe ir a la compañía y configurar un diario y una cuenta para facturas dañadas"
 
 #. module: l10n_ve_fiscal_requirements
-#: model:ir.model,name:l10n_ve_fiscal_requirements.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
+#: constraint:res.partner:0
+msgid "Error ! The partner does not have an invoice address. "
+msgstr "Error ! Este cliente no posée una dirección fiscal. "
 
 #. module: l10n_ve_fiscal_requirements
 #: model:ir.module.module,description:l10n_ve_fiscal_requirements.module_meta_information
@@ -224,31 +265,32 @@
 "    FURTHER DEVELOPMENT:\n"
 "       - Find a way to decouple this module and l10n_ve_islr_withholding\n"
 "    "
-msgstr "Requerimientos fiscales de las Leyes Venezolanas:\n"
-"    - Número de control para facturas\n"
-"    - Excento de impuesto\n"
-"    - Se requiere de una dirección fiscal\n"
-"    - Dirección de facturación única.\n"
-"    - Verificación de RIF.\n"
-"    - Justificación de facturas dañadas.\n"
+msgstr "Venezuelan Tax Laws Requirements:\n"
+"    - Invoice Control Number\n"
+"    - Tax-except\n"
+"    - Required address invoice\n"
+"    - Unique address invoice.\n"
+"    - VAT verification for Venezuela rules.\n"
+"    - Damaged invoices justification.\n"
 "    ---------------------------------------------------------------------------\n"
-"    Para justificar facturas dañadas, debe ir a la compañía y, en la pestaña de Configuración,\n"
-"    crear el diario y la cuenta cosrrespondiente.\n"
+"    For damaged invoices, you must go to the company and, under the configuration section,\n"
+"    create the corresponding journal and account.\n"
 "\n"
-"    ------------------------Info Técnica-------------------------------------------\n"
+"    ------------------------TECH INFO-------------------------------------------\n"
 "    CHANGELOG:\n"
-"       - Para la migración de la localización a la versión 6:\n"
-"         - Se cambió la etiqueta de referencia de factura a Número de Control\n"
-"         - Se integró la funcionalidad del módulo l10n_invoice_nro_ctrl\n"
-"         - Debido a que el campo concept_id es agregado por el módulo l10n_ve_islr_withholding, se genera un\n"
-"           error si dicho módulo no está instalado, es decir, si el campo no existe\n"
-"         - Si necesita retener ISLR, debe instalar el módulo mencionado anteriormente\n"
+"       - For the migration to the l10n_ve on OpenERP:\n"
+"         - Changed the Invoice Ref label to Control Number\n"
+"         - Integrated the l10n_ve_nro_ctrl module functionality on this one\n"
+"         - Since the concept_id field is added by the l10n_ve_islr_withholding, an\n"
+"           error es rised if it's not installed and it is necesary to withhold\n"
+"         - If you need to withhold ISLR, you must install the module mentioned abofe\n"
 "\n"
-"    Desarrollos futuros:\n"
-"       - Desacoplar este módulo y el de retención de ISLR\n"
+"    FURTHER DEVELOPMENT:\n"
+"       - Find a way to decouple this module and l10n_ve_islr_withholding\n"
 "    "
 
 #. module: l10n_ve_fiscal_requirements
+#: view:wiz.nroctrl:0
 #: view:wizard.invoice.nro.ctrl:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -256,10 +298,10 @@
 #. module: l10n_ve_fiscal_requirements
 #: model:ir.model,name:l10n_ve_fiscal_requirements.model_res_partner
 msgid "Partner"
-msgstr "Cliente"
+msgstr "Empresa"
 
 #. module: l10n_ve_fiscal_requirements
 #: model:ir.model,name:l10n_ve_fiscal_requirements.model_res_partner_address
 msgid "Partner Addresses"
-msgstr "Direcciones de Clientes"
+msgstr "Direcciones de empresa"
 

=== modified file 'l10n_ve_fiscal_requirements/wizard/__init__.py'
--- l10n_ve_fiscal_requirements/wizard/__init__.py	2011-09-29 22:40:49 +0000
+++ l10n_ve_fiscal_requirements/wizard/__init__.py	2011-10-01 01:45:28 +0000
@@ -23,5 +23,5 @@
 #    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 wizard_nro_ctrl
 import wizard_invoice_nro_ctrl

=== added file 'l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl.py'
--- l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl.py	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl.py	2011-10-01 01:45:28 +0000
@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2009 Vauxoo C.A. (http://openerp.com.ve/) All Rights Reserved.
+#                    Javier Duran <[e-mail]>
+# 
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+class wiz_nroctrl(osv.osv_memory):
+    _name = 'wiz.nroctrl'
+    _description = "Wizard that changes the invoice control number"
+
+    def set_noctrl(self, cr, uid, ids, context):
+        data = self.pool.get('wiz.nroctrl').read(cr, uid, ids)[0]
+        if not data['sure']:
+            raise osv.except_osv(_("Error!"), _("Please confirm that you want to do this by checking the option"))
+        inv_obj = self.pool.get('account.invoice')
+        n_ctrl = data['name']
+        
+        invoice = inv_obj.browse(cr, uid, context['active_id'])
+        if invoice.state == 'draft':
+            raise osv.except_osv(_("Error!"), _("You cannot change the state of a Draft invoice"))
+
+        inv_obj.write(cr, uid, context['active_id'], {'nro_ctrl': n_ctrl}, context=context)
+        return {}
+
+    _columns = {
+        'name': fields.char('Control Number', 32, required=True),
+        'sure': fields.boolean('Are you sure?'),
+    }
+wiz_nroctrl()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml'
--- l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml	2011-10-01 01:45:28 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="wizard_nro_ctrl_form">
+            <field name="name">wizard.nro.ctrl.form</field>
+            <field name="model">wiz.nroctrl</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Changing the Control Number">
+                    <field name="name" />
+                    <separator string="Are you sure you want to do this?" colspan="4" />
+                    <field name="sure" />
+                    <button special='cancel' string="Cancel" icon="terp-gtk-stop" />
+                    <button name="set_noctrl" string="Confirm" type="object" icon="terp-check" />
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="change_nro_ctrl_act">
+            <field name="name">Change Control Number</field>
+            <field name="res_model">wiz.nroctrl</field>
+            <field name="src_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <act_window
+            id="change_nro_ctrl_act"
+            res_model="wiz.nroctrl"
+            src_model="account.invoice"
+            name="Change Control Number" />
+    </data>
+</openerp>
+