Merge lp:~katech/fiscal-module-ve/jose_moreno_fiscal_module_ve into lp:fiscal-module-ve

[[Kadima] Jose Moreno]

Merge para Actualizar código

[[Kadima] Jose Moreno (n-jmoreno)]

review: Approve

[[Kadima] Jose Moreno (n-jmoreno)]

review: Approve

[[KADIMA] Domingo Montes (dmontes)]

no se

2012/8/5 [Kadima] Jose Moreno <email address hidden>

> [Kadima] Jose Moreno has proposed merging
> lp:~katech/fiscal-module-ve/jose_moreno_fiscal_module_ve into
> lp:fiscal-module-ve.
>
> Requested reviews:
> [Kadima] Jose Moreno (n-jmoreno)
>
> For more details, see:
>
> https://code.launchpad.net/~katech/fiscal-module-ve/jose_moreno_fiscal_module_ve/+merge/118274
>
> Merge para Actualizar código
> --
>
> https://code.launchpad.net/~katech/fiscal-module-ve/jose_moreno_fiscal_module_ve/+merge/118274
> You are subscribed to branch lp:fiscal-module-ve.
>
> === removed file '__init__.py'
> --- __init__.py 2012-05-07 16:19:16 +0000
> +++ __init__.py 1970-01-01 00:00:00 +0000
> @@ -1,22 +0,0 @@
> -#!/usr/bin/python
> -# -*- encoding: utf-8 -*-
>
> -###########################################################################
> -# Module Writen to OpenERP, Open Source Management Solution
> -# All Rights Reserved
>
> -###############Credits######################################################
>
> -#############################################################################
> -# 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 model
>
> === removed file '__openerp__.py'
> --- __openerp__.py 2012-05-07 16:19:16 +0000
> +++ __openerp__.py 1970-01-01 00:00:00 +0000
> @@ -1,34 +0,0 @@
> -#!/usr/bin/python
> -# -*- encoding: utf-8 -*-
>
> -###########################################################################
> -# Module Writen to OpenERP, Open Source Management Solution
> -# All Rights Reserved
> -# 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/
> >.
>
> -##############################################################################
> -
> -{
> - "name" : "Fiscal Module Venezuela",
> - "version...

=== removed file '__init__.py'
--- __init__.py	2012-05-07 16:19:16 +0000
+++ __init__.py	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-#!/usr/bin/python
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#    All Rights Reserved
-###############Credits######################################################
-#############################################################################
-#    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 model

=== removed file '__openerp__.py'
--- __openerp__.py	2012-05-07 16:19:16 +0000
+++ __openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#!/usr/bin/python
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#    All Rights Reserved
-#    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/>.
-##############################################################################
-
-{
-    "name" : "Fiscal Module Venezuela",
-    "version" : "Beta 0.1",
-    "author" : "Kadima Technologies, C.A.",
-    "category" : "General",
-    "website": "http://",
-    "description": '''Integrated Module for Withholding IVA and ISLR''',
-    "depends" : ["account","account_voucher"],
-    "init_xml" : [],
-    "update_xml" : [
-            "view/main.xml",
-                ],
-    "active": False,
-    "installable": True
-}

=== removed directory 'images'
=== added directory 'kadima_wh_iva'
=== added file 'kadima_wh_iva/__init__.py'
--- kadima_wh_iva/__init__.py	1970-01-01 00:00:00 +0000
+++ kadima_wh_iva/__init__.py	2012-08-05 21:50:21 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    All Rights Reserved
+###############Credits######################################################
+#############################################################################
+#    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 model

=== added file 'kadima_wh_iva/__openerp__.py'
--- kadima_wh_iva/__openerp__.py	1970-01-01 00:00:00 +0000
+++ kadima_wh_iva/__openerp__.py	2012-08-05 21:50:21 +0000
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    All Rights Reserved
+#    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/>.
+##############################################################################
+
+{
+    "name" : "Fiscal Module Venezuela",
+    "version" : "Beta 0.6",
+    "author" : "Kadima Technologies, C.A.",
+    "category" : "General",
+    "website": "http://",
+    "description": '''Integrated Module for Withholding IVA''',
+    "depends" : ["account","account_voucher"],
+    "init_xml" : [],
+    "update_xml" : [
+            "view/inherits_views.xml",
+            "view/kadima_wh_iva.xml",
+            "data/sequence.xml",
+                ],
+    "active": False,
+    "installable": True
+}

=== added directory 'kadima_wh_iva/data'
=== added file 'kadima_wh_iva/data/sequence.xml'
--- kadima_wh_iva/data/sequence.xml	1970-01-01 00:00:00 +0000
+++ kadima_wh_iva/data/sequence.xml	2012-08-05 21:50:21 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Sequences type for kadima.wh.iva --> 
+
+        <record id="seq_type_account_kadima_wh_iva" model="ir.sequence.type">
+            <field name="name">Withholding IVA</field>
+            <field name="code">kadima.wh.iva</field>
+        </record>
+
+        <record id="seq_type_account_kadima_wh_iva_purchase" model="ir.sequence.type">
+            <field name="name">Withholding IVA purchase</field>
+            <field name="code">kadima.wh.iva.in_invoice</field>
+        </record>
+
+        <!-- Sequences for account.wh.iva --> 
+
+        <record id="seq_account_wh_iva" model="ir.sequence">
+            <field name="name">Withholding IVA</field>
+            <field name="code">kadima.wh.iva</field>
+            <field name="prefix">IVA:</field>
+            <field name="padding">8</field>
+            <field name="number_increment">1</field>
+        </record>
+
+        <record id="seq_account_wh_iva_purchase" model="ir.sequence">
+            <field name="name">Withholding IVA purchase</field>
+            <field name="code">kadima.wh.iva</field>
+            <field name="prefix">%(year)s-%(month)s-</field>
+            <field name="padding">8</field>
+            <field name="number_increment">1</field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'kadima_wh_iva/images'
=== added directory 'kadima_wh_iva/model'
=== added file 'kadima_wh_iva/model/__init__.py'
--- kadima_wh_iva/model/__init__.py	1970-01-01 00:00:00 +0000
+++ kadima_wh_iva/model/__init__.py	2012-08-05 21:50:21 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    All Rights Reserved
+###############Credits######################################################
+#############################################################################
+#    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 kadima_wh_iva

=== added file 'kadima_wh_iva/model/kadima_wh_iva.py'
--- kadima_wh_iva/model/kadima_wh_iva.py	1970-01-01 00:00:00 +0000
+++ kadima_wh_iva/model/kadima_wh_iva.py	2012-08-05 21:50:21 +0000
@@ -0,0 +1,244 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) Kadima Developers, C.A. (<http://www.kadima.com.ve>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: Kadima C.A.           
+#    Planified by: José Moreno
+#    Audited by: Kadima C.A.
+#############################################################################
+#    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 osv import osv
+from osv import fields
+from tools.translate import _
+import time
+from datetime import datetime
+
+
+class kadima_wh_iva(osv.osv):
+    _name = 'kadima.wh.iva'
+    
+    #~ El estado draft es cuando se genera la retencion
+    #~ El estado done es cuando se ha realizado la retencion
+    
+    STATE_WH = [ ('draft', 'Borrador'),
+        ('done', 'Retenido'),
+        ('cancel', 'Anulado')]
+    _rec_name = 'doc_number'
+    
+    _columns = {
+    #~ Aqui van las columnas
+    'period_id':fields.many2one('account.period','Periodo',help='Este es campo del periodo en el que se genero la retencion'),
+    'date_wh': fields.date('Fecha de la Retencion',help='Es la fecha en la que se pagala factura'),
+    'doc_number': fields.char('Numero de Documento',size=128, help='Es el numero de documento que posee la retencion en el sistema'),
+    'partner_id':fields.many2one('res.partner','Proveedor',required=True,help='Proveedor al que se le aplicara la retencion'),
+    'wh_number': fields.char('Numero de Retencion', size=128,help='Es el numero de la retencion en el sistema'),
+    'wh_lines': fields.one2many('kadima.wh.iva.lines','wh_header','Lineas de retencion'),
+    'invoice_id': fields.many2one('account.invoice','Facturas',required=True),
+    'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+    'company_id': fields.many2one('res.company', 'Company', required=True, help="Company"),
+    'state': fields.selection(STATE_WH, 'Estado', readonly=True, help='Estado del documento de retencion'),
+    }
+    
+    _defaults = {
+    #~ Aqui van los valores default de los campos
+    'company_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id,
+    'state': 'draft',
+    }
+    
+      
+    def create_wh_details(self, cr, uid, invoice_id, wh_iva_id,context=None):
+        #~ Aqui instancio la clase account.invoice.tax y la guardo en una variable
+        ait_obj = self.pool.get('account.invoice.tax')
+        """ En esta linea hago un search en donde le digo buscame todos los 
+        registros de account_invoice_tax donde invoice_id sea igual al que
+        te estoy dando a buscar, luego guardo esos ids en ait_ids """
+        ait_ids = ait_obj.search(cr,uid,[('invoice_id','=',invoice_id)])
+        """ Aqui hago un browse sobre los ids devueltos anteriormente
+        y saco del objecto los valores que necesito para crear el detalle
+        de la retencion """
+        ait_brw = ait_obj.browse(cr,uid,ait_ids)
+        percent_wh = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)[0].percent_wh
+        if ait_brw:
+            for lines in ait_brw:
+                kwil = {
+                'base' : lines.base,
+                'amount_iva' : lines.amount,
+                'name' : 'Retencion %s'%lines.name,
+                'percent_iva' : lines.tax_amount,
+                'percent_wh' : percent_wh,
+                'amount_wh' : (lines.amount * (percent_wh / 100)),
+                'wh_header' : wh_iva_id,
+                }
+                kwil_ids = self.pool.get('kadima.wh.iva.lines').create(cr, uid, kwil)
+        return True
+
+kadima_wh_iva()
+
+class kadima_wh_iva_lines(osv.osv):
+    _name = 'kadima.wh.iva.lines'
+    
+    STATE_WH = [ ('draft', 'Borrador'),
+        ('done', 'Retenido'),
+        ('cancel', 'Anulado')]
+    
+    #~ Si en el futuro se necesita hacer imputaciones presupuestarias
+    #~ Se debe cambiar el codigo y enlazar las retenciones por linea de factura.
+    
+    _columns = {
+    #~ Estas son las columanas de detalle
+    'name':fields.char('Descripcion',size=128),
+    'wh_header': fields.many2one('kadima.wh.iva','Retencion de IVA'),
+    'base':fields.float('Monto Base Imponible'),
+    'percent_iva':fields.float('Porcentaje de IVA'),
+    'amount_iva': fields.float('Monto IVA'),
+    'percent_wh': fields.float('Porcentaje Retencion'),
+    'amount_wh':fields.float('Monto Retencion'),
+    'state': fields.selection(STATE_WH, 'Estado', readonly=True, help='Estado del documento de retencion'),
+    }
+    
+    _defaults = {
+    #~ Aqui van los valores default de los campos
+    'state': 'draft',
+    }
+    
+kadima_wh_iva_lines()
+
+class account_invoice_tax(osv.osv):
+    _name = 'account.invoice.tax'
+    _inherit = 'account.invoice.tax'
+    
+    """ Con esta funcion calculo la retencion de iva para devolversela en
+    un diccionario al campo funcional """
+    def _amount_wh(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        #~ Hago un browse de los ids de account_invoice_tax
+        ait_brw = self.browse(cr, uid, ids)
+        #~ Aqui intero sobre el objecto que contiene los registros
+        for tax in ait_brw:
+            #~ Me traigo el porcentaje de retencion de iva de la factura
+            percent_wh = self.pool.get('account.invoice').browse(cr, uid, [tax.invoice_id.id], context=context)[0].percent_wh
+            #~ Realizo el calculo de retencion
+            amount = (tax.amount * (percent_wh / 100))
+            """ Agrego al diccionario los ids con los montos calculados
+            en donde el id del registro  es la clave del diccionario """
+            res.update({tax.id:amount})
+        #~ Retorno el diccionario
+        return res
+        
+    #~ Aqui declaro un campo funcional para mostrar las retenciones en la factura.
+    _columns = {
+        'amount_wh': fields.function(_amount_wh, method=True, type='float', string='Monto Retenido', help="Monto de la Retencion"),
+    }
+    
+account_invoice_tax()
+
+class account_invoice(osv.osv):
+    _name = 'account.invoice'
+    _inherit = 'account.invoice'
+    #~ Esta relacion se creo para enlazar la retencion con la factura
+    #~ Se agrego el percent_wh para guardar el porcentaje a retener del proveedor
+    _columns = {
+    'wh_iva_id': fields.many2one('kadima.wh.iva','Numero de Retencion',readonly=True),
+    'percent_wh':fields.float('% de Ret. IVA'),
+    }
+    
+    """ Esto lo agregue para que cuando la factura se cree. automaticamente tome el porcentaje de 
+    retencion del proveedor """
+    def create(self, cr, uid, values, context=None):
+        """ Con la funcion anonima lambda me ahorro escribir lineas
+        ya que ejecuta el browse en una sola linea y me retorna el resultado
+        este busca en res_partner el proveedor y el porcentaje de retencion
+        para luego retornarlo y guardarlo en el diccionario """
+        values.update({'percent_wh': self.pool.get('res.partner').browse(cr, uid, values['partner_id'], context=context).percent_wh,})
+        return super(account_invoice,self).create(cr, uid, values, context=context)
+            
+    #~ Esta Funcion evita que al duplicar la factura se le coloque el mismo numero de la retencion
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'wh_iva_id':0 })
+        return super(account_invoice, self).copy(cr, uid, id, default, context=context)
+        
+    #~ Se sobreescribio la funcion de action_number para generar la retencion
+    def action_number(self, cr, uid, ids, context=None):
+         """ Con el super se llama a la funcion original para no sobre escribirla
+         y guardo su resultado en la variable res que es de tipo booleano """
+         res = super(account_invoice, self).action_number(cr, uid, ids, context=context)
+         
+         """ Si res es true entonces instancio el objecto de la clase kadima.wh.iva
+         el cual es la cabecera del documento de retencion de IVA, luego creo un 
+         diccionario con los valores necesarios y creo la cabecera del documento de
+         retencion de IVA """
+         if res:
+             kwhi_obj = self.pool.get('kadima.wh.iva')
+             """ Hago un browse y busco el id del partner como se que me devolvera solo
+             un registro utilizo self.browse(cr,uid,ids)[0].partner_id.id de lo contrario
+             tendria que interar el objecto para sacar el id """
+             partner_id = self.browse(cr,uid,ids)[0].partner_id.id
+             invoice_id = self.browse(cr,uid,ids)[0].id
+             journal_id = self.pool.get('account.journal').search(cr,uid,[('type','=','purchase_iva')])
+             if not journal_id:
+                  raise osv.except_osv(('Error !'),('Debe crear un diario de tipo "Iva en Compras".'))
+             kwhi_dict = {
+             'doc_numer': '.',
+             'journal_id': journal_id[0],
+             'partner_id':partner_id,
+             'invoice_id': invoice_id,
+             'state':'draft',
+             }
+             print "Este es el Diccionario ", kwhi_dict
+             wh_iva_id = kwhi_obj.create(cr, uid, kwhi_dict)
+             #~ Con esta linea me traigo el correlativo del documento
+             doc_number = self.pool.get('ir.sequence').get(cr, uid, 'kadima.wh.iva')
+             #~ Aqui guardo el correlativo en el registro
+             res = kwhi_obj.write(cr,uid,wh_iva_id,{'doc_number':doc_number})
+             if res:
+                #~ Aqui llamo la funcion que crea las lineas de retencion
+                res = kwhi_obj.create_wh_details(cr,uid,ids,wh_iva_id,context=context)
+                if res:
+                   """ Aqui actualizo el registro y guardo el id de la cabecera de la
+                   retencion en la cabecera de la factura si no hay errores devuelve
+                   True sino devolvera False """
+                   res = self.write(cr,uid,ids,{'wh_iva_id':wh_iva_id})
+         return res
+    
+account_invoice()
+
+class res_partner(osv.osv):
+    _name = 'res.partner'
+    _inherit = 'res.partner'
+    #~ Se crea el campo para guardar el porcentaje en el registro del proveedor
+    _columns = {
+    'percent_wh':fields.float('% de Ret. IVA'),
+    }
+res_partner()
+
+class account_journal(osv.osv):
+    _name = 'account.journal'
+    _inherit = 'account.journal'
+    
+    _columns = {
+    'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation'),('purchase_iva','Iva en Compras'),('purchase_islr','ISLR en Compras')], 'Type', size=32, required=True,
+                                 help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
+                                 " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
+                                 " Select 'Cash' to be used at the time of making payment."\
+                                 " Select 'General' for miscellaneous operations."\
+                                 " Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."),
+    }
+account_journal()

=== added directory 'kadima_wh_iva/report'
=== added directory 'kadima_wh_iva/security'
=== added directory 'kadima_wh_iva/view'
=== added file 'kadima_wh_iva/view/inherits_views.xml'
--- kadima_wh_iva/view/inherits_views.xml	1970-01-01 00:00:00 +0000
+++ kadima_wh_iva/view/inherits_views.xml	2012-08-05 21:50:21 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        
+        <record id="kadima_iva_partner" model="ir.ui.view">
+            <field name="name">res.partner.iva.form</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='Notes']" position="after">
+                   <page string="Retenciones de Impuestos" >
+                        <separator colspan='4' string="Retenciones de Impuestos"/>
+                        <field name="percent_wh"/>
+                    </page> 
+                </xpath>
+            </field>
+        </record>        
+
+        <record id="view_kadima_invoice_supplier" model="ir.ui.view">
+            <field name="name">account.invoice.inherit.tax</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='Invoice']/group/field[@name='tax_line']" position="replace">
+                   <field name="tax_line" nolabel="1">
+                                    <tree editable="bottom" string="Taxes">
+                                        <field name="name"/>
+                                        <field name="account_id" groups="account.group_account_invoice"/>
+                                        <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
+                                        <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
+                                        
+                                        <field name="amount_wh"/>
+                                        <field invisible="True" name="base_amount"/>
+                                        <field invisible="True" name="tax_amount"/>
+                                        <field name="factor_base" invisible="True"/>
+                                        <field name="factor_tax" invisible="True"/>
+                                    </tree>
+                                </field>
+                </xpath>
+                <xpath expr="/form/notebook/page[@string='Invoice']" position="after">
+                   <page string="Reteciones de Impuestos" >
+                        <separator colspan='4' string="Retenciones de IVA"/>
+                        <field name="percent_wh"/>
+                    </page> 
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'kadima_wh_iva/view/kadima_wh_iva.xml'
--- kadima_wh_iva/view/kadima_wh_iva.xml	1970-01-01 00:00:00 +0000
+++ kadima_wh_iva/view/kadima_wh_iva.xml	2012-08-05 21:50:21 +0000
@@ -0,0 +1,76 @@
+<openerp>
+<data>
+
+        <record id="view_kadima_wh_iva_tree_suppliers" model="ir.ui.view">
+            <field name="name">kadima.wh.iva.tree</field>
+            <field name="model">kadima.wh.iva</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="green:state=='draft'" string="Supplier Withholding Income">
+                    <field name="doc_number"/>
+                    <field name="wh_number"/>
+                    <field name="date_wh"/>
+                    <field name="period_id"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_kadima_wh_iva_form_suppliers" model="ir.ui.view">
+            <field name="name">kadima.wh.iva.form</field>
+            <field name="model">kadima.wh.iva</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Retenciones de IVA a Proveedores">
+                    <group colspan="4" col="6">
+                        <field name="journal_id" domain="[('type','=','general')]"/>
+                        <field name="wh_number"/>
+                        <field name="doc_number"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]"/>
+                        <field name="date_wh" attrs="{'readonly': [('state','=','done')]}"/>
+                        <field name="period_id"/>
+                        <field name="invoice_id" />
+                    </group>
+                    <notebook colspan="6">
+                    <page string="Withholding Income">
+                            <field colspan="6" name="wh_lines" nolabel="1">
+                                <tree string="lineas de Retencion">
+                                    <field name="name"/>
+                                    <field name="base"/>
+                                    <field name="amount_iva"/>
+                                    <field name="percent_wh"/>
+                                    <field name="amount_wh" sum="Monto Retencion"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Other Information">
+                            <field name="company_id"/>
+                        </page>
+                    </notebook>
+                        <group colspan="6" col="6">
+                            <field name="state"/>
+                            <button name="calculate_wh" string="Calcular Retencion" states="draft" icon="gtk-execute" type="object"/>
+                            <button name="act_progress" string="Retener" states="draft"  icon="gtk-go-forward" type="object"/>
+                            <button name="act_cancel" string="Cancel" states="done"  colspan="2" icon="gtk-go-forward" type="object"/>
+                      </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_kadima_wh_iva_supplier">
+            <field name="name">Retenciones de IVA a Proveedores</field>
+            <field name="res_model">kadima.wh.iva</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="menu_action_wh_islr_supplier"
+            name="Retenciones de IVA" 
+            parent="account.menu_finance_payables"
+            action="action_kadima_wh_iva_supplier"/>
+
+    </data>
+</openerp>
+

=== added directory 'kadima_wh_iva/wizard'
=== removed directory 'report'
=== removed directory 'security'
=== removed directory 'view'
=== removed directory 'wizard'