Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-wh-rev-kty into lp:~vauxoo/openerp-venezuela-localization/ovl70-wh-rev-hbto

[Katherine Zaoral (Vauxoo)]

[FIX] First revision of wh module

=== modified file 'l10n_ve_fiscal_requirements/model/__init__.py'
--- l10n_ve_fiscal_requirements/model/__init__.py	2012-12-04 10:35:10 +0000
+++ l10n_ve_fiscal_requirements/model/__init__.py	2013-01-14 19:15:27 +0000
@@ -25,6 +25,7 @@
 import account 
 import invoice
 import partner
+import res_users
 import res_company
 import seniat_url
 import l10n_ut
 
=== modified file 'l10n_ve_fiscal_requirements/model/invoice.py'
--- l10n_ve_fiscal_requirements/model/invoice.py	2012-12-04 21:56:01 +0000
+++ l10n_ve_fiscal_requirements/model/invoice.py	2013-01-14 19:15:27 +0000
@@ -79,22 +79,6 @@
     _constraints = [
           (_unique_invoice_per_partner, _('The Document you have been entering for this Partner has already been recorded'),['Control Number (nro_ctrl)','Reference (reference)']),
          ]
-     
-    def _refund_cleanup_lines(self, cr, uid, lines):
-        """
-        Method created to clean invoice lines
-        """
-        for line in lines:
-            del line['id']
-            del line['invoice_id']
-            #TODO Verify one more elegant way to do this
-            for field in ('company_id', 'partner_id', 'account_id', 'product_id',
-                          'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id',
-                          "concept_id","tax_id"):
-                line[field] = line.get(field, False) and line[field][0]
-            if 'invoice_line_tax_id' in line:
-                line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
-        return map(lambda x: (0,0,x), lines)
 
     def copy(self, cr, uid, id, default={}, context=None):
         if context is None:
@@ -108,4 +92,13 @@
 account_invoice()
 
 
+class account_invoice_tax(osv.osv):
+    _inherit = 'account.invoice.tax'
+    _columns = {
+        'tax_id': fields.many2one('account.tax', 'Tax', required=False, ondelete='set null', 
+        help="Tax relation to original tax, to be able to take off all data from invoices."),
+    }
+
+account_invoice_tax()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'l10n_ve_fiscal_requirements/model/res_users.py'
--- l10n_ve_fiscal_requirements/model/res_users.py	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/model/res_users.py	2013-01-14 19:15:27 +0000
@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: Humberto Arocha           <[e-mail]>
+#              María Gabriela Quilarque  <[e-mail]>
+#              Nhomar Hernandez          <[e-mail]>
+#    Planified by: Humberto Arocha
+#    Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
+#    Audited by: Humberto Arocha [e-mail]
+#############################################################################
+#    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 fields, osv
+import tools
+from tools.translate import _
+from tools import config
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+        
+    def create(self, cr, uid, vals, context=None):
+        if context is None: context = {}
+        context.update({'create_company':True})
+        return super(res_users, self).create(cr, uid, vals, context=context)
+        
+    def write(self, cr, uid, ids, values, context=None):
+        context = context or {}
+        context.update({'create_company':True})
+        return super(res_users, self).write(cr, uid, ids, values, context=context)
+
+res_users()
 
=== modified file 'l10n_ve_fiscal_requirements/test/fr_damaged.yml'
--- l10n_ve_fiscal_requirements/test/fr_damaged.yml	2012-09-26 16:20:44 +0000
+++ l10n_ve_fiscal_requirements/test/fr_damaged.yml	2013-01-14 19:15:27 +0000
@@ -19,11 +19,9 @@
     company_id: base.main_company
     currency_id: base.EUR
     date_invoice: !eval time.strftime('%Y-%m-%d')
-    address_contact_id: base.res_partner_address_3
-    address_invoice_id: base.res_partner_address_3
     account_id: account.a_recv
     invoice_line:
-      - product_id: product.product_product_pc2
+      - product_id: product.product_product_3
         quantity: 5
         uos_id: product.product_uom_unit
         price_unit: 20
 
=== modified file 'l10n_ve_fiscal_requirements/test/fr_purchase_test.yml'
--- l10n_ve_fiscal_requirements/test/fr_purchase_test.yml	2012-09-26 16:20:44 +0000
+++ l10n_ve_fiscal_requirements/test/fr_purchase_test.yml	2013-01-14 19:15:27 +0000
@@ -10,7 +10,7 @@
     date_invoice: !eval time.strftime('%Y-%m-%d')
     account_id: account.a_recv
     invoice_line:
-      - product_id: product.product_product_pc1
+      - product_id: product.product_product_4
         quantity: 3
         uos_id: product.product_uom_unit
         price_unit: 3
@@ -18,7 +18,7 @@
         account_id: account.a_sale
         invoice_line_tax_id:
         - iva_purchase1
-      - product_id: product.product_product_pc2
+      - product_id: product.product_product_3
         quantity: 5
         uos_id: product.product_uom_unit
         price_unit: 2
 
=== modified file 'l10n_ve_fiscal_requirements/test/fr_refund_note.yml'
--- l10n_ve_fiscal_requirements/test/fr_refund_note.yml	2012-09-26 16:20:44 +0000
+++ l10n_ve_fiscal_requirements/test/fr_refund_note.yml	2013-01-14 19:15:27 +0000
@@ -8,11 +8,9 @@
     company_id: base.main_company
     currency_id: base.EUR
     date_invoice: !eval time.strftime('%Y-%m-%d')
-    address_contact_id: base.res_partner_address_3
-    address_invoice_id: base.res_partner_address_3
     account_id: account.a_recv
     invoice_line:
-      - product_id: product.product_product_pc2
+      - product_id: product.product_product_3
         quantity: 5
         uos_id: product.product_uom_unit
         price_unit: 20
@@ -105,10 +103,10 @@
     for line in rf_brw.invoice_line:
       for tax in line.invoice_line_tax_id:
         tax1.append(tax.id)
-    rf_brw = self.browse(cr, uid, ai_id[0])
+    rf_brw = ai_id and self.browse(cr, uid, ai_id[0])
     tax2 = []
     whc2 = []
-    for line in rf_brw.invoice_line:
+    for line in rf_brw and rf_brw.invoice_line:
       for tax in line.invoice_line_tax_id:
         tax2.append(tax.id)
     tax1 = set(tax1)
@@ -126,11 +124,9 @@
     company_id: base.main_company
     currency_id: base.EUR
     date_invoice: !eval time.strftime('%Y-%m-%d')
-    address_contact_id: base.res_partner_address_3
-    address_invoice_id: base.res_partner_address_3
     account_id: account.a_recv
     invoice_line:
-      - product_id: product.product_product_pc2
+      - product_id: product.product_product_3
         quantity: 5
         uos_id: product.product_uom_unit
         price_unit: 20
@@ -232,11 +228,9 @@
     company_id: base.main_company
     currency_id: base.EUR
     date_invoice: !eval time.strftime('%Y-%m-%d')
-    address_contact_id: base.res_partner_address_3
-    address_invoice_id: base.res_partner_address_3
     account_id: account.a_recv
     invoice_line:
-      - product_id: product.product_product_pc2
+      - product_id: product.product_product_4
         quantity: 5
         uos_id: product.product_uom_unit
         price_unit: 20
 
=== modified file 'l10n_ve_fiscal_requirements/test/fr_sale_test.yml'
--- l10n_ve_fiscal_requirements/test/fr_sale_test.yml	2012-09-26 16:20:44 +0000
+++ l10n_ve_fiscal_requirements/test/fr_sale_test.yml	2013-01-14 19:15:27 +0000
@@ -8,11 +8,9 @@
     company_id: base.main_company
     currency_id: base.EUR
     date_invoice: !eval time.strftime('%Y-%m-%d')
-    address_contact_id: base.res_partner_address_3
-    address_invoice_id: base.res_partner_address_3
     account_id: account.a_recv
     invoice_line:
-      - product_id: product.product_product_pc2
+      - product_id: product.product_product_3
         quantity: 5
         uos_id: product.product_uom_unit
         price_unit: 20
 
=== modified file 'l10n_ve_fiscal_requirements/test/fr_vat_test.yml'
--- l10n_ve_fiscal_requirements/test/fr_vat_test.yml	2012-09-26 21:08:18 +0000
+++ l10n_ve_fiscal_requirements/test/fr_vat_test.yml	2013-01-14 19:15:27 +0000
@@ -1,15 +1,6 @@
 -
   5. Fiscal requirements Vat tests
 -
-  5.1 Add address
--
-  !record {model: res.partner.address, id: test_fr_add01}:
-    type: invoice
-    street: Av Siempre Viva
-    phone: "(555) 5555555"
-    fax: "(555) 1111111"
-    email: [e-mail]
--
   5.2 I try to create a partner with wrong vat
 -
   !python {model: res.partner}: |
@@ -19,7 +10,11 @@
       'supplier': True,
       'customer': True,
       'vat': 'VEV333',
-      'address':[(6, 0, [ref("test_fr_add01")])]
+      'type': 'invoice',
+      'street': 'Av Siempre Viva',
+      'phone': "(555) 5555555",
+      'fax': "(555) 1111111",
+      'email': '[e-mail]',
       }
     part_id = False
     try:
@@ -46,7 +41,11 @@
       'supplier': True,
       'customer': True,
       'vat': 'VEJ112223330',
-      'address': [(6, 0, [ref("test_fr_add01")])],
+      'type': 'invoice',
+      'street': 'Av Siempre Viva',
+      'phone': "(555) 5555555",
+      'fax': "(555) 1111111",
+      'email': '[e-mail]',
       }
     part_id = self.create(cr, uid, part)
     assert part_id, 'Partner should be created'
@@ -60,7 +59,11 @@
       'supplier': True,
       'customer': True,
       'vat': 'VEJ112223330',
-      'address': [(6, 0, [ref("test_fr_add01")])],
+      'type': 'invoice',
+      'street': 'Av Siempre Viva',
+      'phone': "(555) 5555555",
+      'fax': "(555) 1111111",
+      'email': '[e-mail]',
       }
     try:
       rollback = cr.rollback
@@ -86,7 +89,11 @@
       'supplier': True,
       'customer': True,
       'vat': 'VEJ223334445',
-      'address': [(6, 0, [ref("test_fr_add01")])],
+      'type': 'invoice',
+      'street': 'Av Siempre Viva',
+      'phone': "(555) 5555555",
+      'fax': "(555) 1111111",
+      'email': '[e-mail]',
       }
     try:
       rollback = cr.rollback
 
=== modified file 'l10n_ve_fiscal_requirements/view/account_inv_refund_nctrl_view.xml'
--- l10n_ve_fiscal_requirements/view/account_inv_refund_nctrl_view.xml	2012-11-06 22:01:07 +0000
+++ l10n_ve_fiscal_requirements/view/account_inv_refund_nctrl_view.xml	2013-01-14 19:15:27 +0000
@@ -5,7 +5,6 @@
         <record id="view_account_inv_nctrl_refund" model="ir.ui.view">
             <field name="name">account.inv.nctrl.refund.form</field>
             <field name="model">account.invoice.refund</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_invoice_refund"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='period']" position="after">
 
=== modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
--- l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2012-12-04 22:37:47 +0000
+++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2013-01-14 19:15:27 +0000
@@ -10,7 +10,6 @@
         <record id="account_invoice_ext_view_form_loc_ve" model="ir.ui.view">
             <field name="name">invoice_extended.account.invoice.form.loc_ve</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='date_invoice']" position="replace">
@@ -91,7 +90,6 @@
         <record id="account_inv_ext_view_tree_crdr" model="ir.ui.view">
             <field name="name">invoice_extended.tree.crdr</field>
             <field name="model">account.invoice</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="account.invoice_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='origin']" position="after">
@@ -109,7 +107,6 @@
         <record id="account_invoice_ext_view_supp_form_loc_ve" model="ir.ui.view">
             <field name="name">invoice_extended.account.invoice.supplier.form.loc_ve</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="//field[@name='date_invoice']" position="replace">
 
=== modified file 'l10n_ve_fiscal_requirements/view/account_tax_view.xml'
--- l10n_ve_fiscal_requirements/view/account_tax_view.xml	2012-11-07 21:33:58 +0000
+++ l10n_ve_fiscal_requirements/view/account_tax_view.xml	2013-01-14 19:15:27 +0000
@@ -13,7 +13,6 @@
         <record id="account_tax_applicability_2" model="ir.ui.view">
             <field name="name">account.tax.applicability</field>
             <field name="model">account.tax</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_tax_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='active']" position="after">
 
=== modified file 'l10n_ve_fiscal_requirements/view/l10n_ut_view.xml'
--- l10n_ve_fiscal_requirements/view/l10n_ut_view.xml	2012-11-06 22:01:07 +0000
+++ l10n_ve_fiscal_requirements/view/l10n_ut_view.xml	2013-01-14 19:15:27 +0000
@@ -5,7 +5,6 @@
         <record id="view_l10n_ut_filter" model="ir.ui.view">
             <field name="name">l10n.ut.search</field>
             <field name="model">l10n.ut</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Tax Unit" version="7.0">
                    <group col="10" colspan="4">
@@ -24,7 +23,6 @@
         <record model="ir.ui.view" id="view_l10n_ut_form">
             <field name="name">l10n.ut.form</field>
             <field name="model">l10n.ut</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Tax Unit" version="7.0">
                     <group col="6" colspan="4">
@@ -39,7 +37,6 @@
         <record model="ir.ui.view" id="view_l10n_ut_tree">
             <field name="name">l10n.ut.tree</field>
             <field name="model">l10n.ut</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tax Unit per date" editable="top">
                     <field name="name"/>
 
=== modified file 'l10n_ve_fiscal_requirements/view/partner_view.xml'
--- l10n_ve_fiscal_requirements/view/partner_view.xml	2012-12-09 23:00:04 +0000
+++ l10n_ve_fiscal_requirements/view/partner_view.xml	2013-01-14 19:15:27 +0000
@@ -5,7 +5,6 @@
     <record id="view_partner_form2" model="ir.ui.view">
         <field name="name">res.partner.vat.inherit2</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">
 
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_debit.py'
--- l10n_ve_fiscal_requirements/wizard/account_invoice_debit.py	2012-12-04 19:17:53 +0000
+++ l10n_ve_fiscal_requirements/wizard/account_invoice_debit.py	2013-01-14 19:15:27 +0000
@@ -81,19 +81,6 @@
                 res['fields'][field]['selection'] = journal_select
         return res
 
-    def _get_period(self, cr, uid, context=None):
-        """
-        Return  default account period value
-        """
-        if context is None:
-            context = {}
-        account_period_obj = self.pool.get('account.period')
-        ids = account_period_obj.find(cr, uid, context=context)
-        period_id = False
-        if ids:
-            period_id = ids[0]
-        return period_id
-
     def _get_orig(self, cr, uid, inv, ref, context=None):
         """
         Return  default origin value
@@ -130,45 +117,39 @@
         date = False
         period = False
         description = False
-        company = res_users_obj.browse(cr, uid, uid, context=context).company_id
+
         journal_id = form.journal_id and  form.journal_id.id or False
         inv = inv_obj.browse(cr, uid, context.get('active_ids')[0], context=context)
+        #~ TODOK: no seria mejor ids=context.get(active_id)
+
+        company_id = inv.company_id.id
+        context.update({'company_id':company_id})
+
         if inv.state in ['draft', 'proforma2', 'cancel']:
             raise osv.except_osv(_('Error !'), _('Can not create a debit note from draft/proforma/cancel invoice.'))
         if inv.reconciled in ('cancel', 'modify'):
             raise osv.except_osv(_('Error !'), _('Can not create a debit note from invoice which is already reconciled, invoice should be unreconciled first. You can only Refund or Debit this invoice'))
         if inv.type not in ['in_invoice', 'out_invoice']:
             raise osv.except_osv(_('Error !'), _('Can not make a debit note on a refund invoice.'))
+
+        #Check for the form fields
+
         if form.period:
             period = form.period.id
         else:
             #Take period from the current date
-            #period = inv.period_id and inv.period_id.id or False
-            period = self._get_period(cr, uid, context)
+            period = self.pool.get('account.period').find(cr, uid, context=context)
+            period = period and period[0] or False
+            if not period:
+                raise osv.except_osv(_('No Pediod Defined'), \
+                                        _('You have been left empty the period field that automatically fill with the current period. However there is not period defined for the current company. Please check in Accounting/Configuration/Periods'))
+            self.write(cr, uid, ids, {'period': period }, context=context) 
 
         if not journal_id:
             journal_id = inv.journal_id.id
 
         if form.date:
             date = form.date
-            if not form.period.id:
-                    cr.execute("select name from ir_model_fields \
-                                    where model = 'account.period' \
-                                    and name = 'company_id'")
-                    result_query = cr.fetchone()
-                    if result_query:
-                        #in multi company mode
-                        cr.execute("""select p.id from account_fiscalyear y, account_period p where y.id=p.fiscalyear_id \
-                            and date(%s) between p.date_start AND p.date_stop and y.company_id = %s limit 1""", (date, company.id,))
-                    else:
-                        #in mono company mode
-                        cr.execute("""SELECT id
-                                from account_period where date(%s)
-                                between date_start AND  date_stop  \
-                                limit 1 """, (date,))
-                    res = cr.fetchone()
-                    if res:
-                        period = res[0]
         else:
             #Take current date
             #date = inv.date_invoice
@@ -178,10 +159,6 @@
         else:
             description = inv.name
 
-        if not period:
-            raise osv.except_osv(_('Data Insufficient !'), \
-                                    _('No Period found on Invoice!'))
-
         #we get original data of invoice to create a new invoice that is the copy of the original
         invoice = inv_obj.read(cr, uid, [inv.id],
                     ['name', 'type', 'number', 'reference',
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_debit_view.xml'
--- l10n_ve_fiscal_requirements/wizard/account_invoice_debit_view.xml	2012-11-06 22:01:07 +0000
+++ l10n_ve_fiscal_requirements/wizard/account_invoice_debit_view.xml	2013-01-14 19:15:27 +0000
@@ -5,7 +5,6 @@
         <record id="view_account_invoice_debit" model="ir.ui.view">
             <field name="name">account.invoice.debit.form</field>
             <field name="model">account.invoice.debit</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Debit Note" version="7.0">
                     <separator string="Debit Note Options" colspan="4"/>
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_parent_view.xml'
--- l10n_ve_fiscal_requirements/wizard/account_invoice_parent_view.xml	2011-11-10 15:21:35 +0000
+++ l10n_ve_fiscal_requirements/wizard/account_invoice_parent_view.xml	2013-01-14 19:15:27 +0000
@@ -5,7 +5,6 @@
         <record id="view_account_invoice_parent" model="ir.ui.view">
             <field name="name">account.invoice.parent.form</field>
             <field name="model">account.invoice.parent</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Debit Note">
                     <separator string="Debit Note Options" colspan="4"/>
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py'
--- l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py	2012-11-07 15:19:17 +0000
+++ l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py	2013-01-14 19:15:27 +0000
@@ -79,21 +79,6 @@
                 res['fields'][field]['selection'] = journal_select
         return res
 
-    def _get_period(self, cr, uid, context={}):
-        """
-        Return  default account period value
-        """
-        period_id= False
-        if context.get('active_id',False):
-            invo_obj = self.pool.get('account.invoice')
-            invo_brw = invo_obj.browse(cr,uid,context.get('active_id'),{})
-            period_id = invo_brw and invo_brw.period_id and invo_brw.period_id.id
-        return period_id
-        
-        
-        
-        return period_id
-
     def _get_orig(self, cr, uid, inv, ref, context={}):
         """
         Return  default origin value
@@ -165,8 +150,15 @@
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
                 if inv.reconciled and mode in ('cancel', 'modify'):
                     raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode))
-                #Take period from the current date
-                period = form.get('period') and form.get('period')[0] or self._get_period(cr, uid, context)
+                period = form.get('period') and form.get('period')[0] or False
+                if not period:
+	                #Take period from the current date
+                    period = self.pool.get('account.period').find(cr, uid, context=context)
+                    period = period and period[0] or False
+                    if not period:
+                        raise osv.except_osv(_('No Pediod Defined'), \
+                                _('You have been left empty the period field that automatically fill with the current period. However there is not period defined for the current company. Please check in Accounting/Configuration/Periods'))
+                    self.write(cr, uid, ids, {'period': period }, context=context)
 
                 if not journal_brw:
                     journal_id = inv.journal_id.id
@@ -253,9 +245,10 @@
                                     'journal_id', 'period_id'], context=context)
                         invoice = invoice[0]
                         del invoice['id']
-                        invoice_lines = inv_line_obj.read(cr, uid, invoice['invoice_line'], context=context)
+                        invoice_lines = inv_line_obj.browse(cr, uid, invoice['invoice_line'], context=context)
+
                         invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines)
-                        tax_lines = inv_tax_obj.read(cr, uid, invoice['tax_line'], context=context)
+                        tax_lines = inv_tax_obj.browse(cr, uid, invoice['tax_line'], context=context)
                         tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines)
                         #Add origin value
                         orig = self._get_orig(cr, uid, inv, invoice['reference'], context)
@@ -283,12 +276,12 @@
                         
                         new_inv_brw = inv_obj.browse(cr,uid,created_inv[1],context=context)
                         inv_obj.write(cr,uid,created_inv[0],{'name':wzd_brw.description,'origin':new_inv_brw.origin},context=context)
-                        inv_obj.write(cr,uid,created_inv[1],{'origin':inv.origin,'description':''},context=context)
+                        inv_obj.write(cr,uid,created_inv[1],{'origin':inv.origin,'name':wzd_brw.description},context=context)
             if inv.type in ('out_invoice', 'out_refund'):
                 xml_id = 'action_invoice_tree3'
-                if hasattr(inv, 'sale_ids'):
-                    for i in inv.sale_ids:
-                        cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (i.id, refund_id[0]))
+                #~ if hasattr(inv, 'sale_ids'):
+                    #~ for i in inv.sale_ids:
+                        #~ cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (i.id, refund_id[0]))
             else:
                 xml_id = 'action_invoice_tree4'
             result = mod_obj.get_object_reference(cr, uid, 'account', xml_id)
@@ -300,11 +293,11 @@
             
             if wzd_brw.filter_refund == 'cancel':
                 orig = self._get_orig(cr, uid, inv, inv.reference, context)
-                inv_obj.write(cr,uid,created_inv[0],{'origin':orig,'description':wzd_brw.description},context=context)
+                inv_obj.write(cr,uid,created_inv[0],{'origin':orig,'name':wzd_brw.description},context=context)
             
             if wzd_brw.filter_refund == 'refund':
                 orig = self._get_orig(cr, uid, inv, inv.reference, context)
-                inv_obj.write(cr,uid,created_inv[0],{'origin':inv.origin,'description':wzd_brw.description},context=context)
+                inv_obj.write(cr,uid,created_inv[0],{'origin':inv.origin,'name':wzd_brw.description},context=context)
             return result
 
     def validate_total_payment_inv(self, cr, uid, ids, context=None):
@@ -354,7 +347,7 @@
                     if moveline.reconcile_partial_id:
                         rec += [moveline.reconcile_partial_id.id]
                 movelines = moveline_obj.search(cr, uid, [('|'),('reconcile_id','in',rec),('reconcile_partial_id','in',rec)],context=context)
-                for mids in moveline_obj.browse(cr, uid, movelines, ['move_id']):
+                for mids in moveline_obj.browse(cr, uid, movelines, context=context):
                     mid +=[mids.move_id.id]
                 voucherids = voucher_pool.search(cr, uid,[('move_id','in',mid)])
             if voucherids:
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py'
--- l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py	2012-12-02 17:44:27 +0000
+++ l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py	2013-01-14 19:15:27 +0000
@@ -19,7 +19,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
 import pooler
 from osv import osv, fields
 from tools.translate import _
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml'
--- l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml	2012-09-26 21:07:02 +0000
+++ l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml	2013-01-14 19:15:27 +0000
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_vat_search">
             <field name="name">search.info.partner.seniat.form</field>
             <field name="model">search.info.partner.seniat</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Wizard to search partner on SENIAT">
                     <group colspan="4">
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/update_info_partner.py'
--- l10n_ve_fiscal_requirements/wizard/update_info_partner.py	2012-12-02 18:34:29 +0000
+++ l10n_ve_fiscal_requirements/wizard/update_info_partner.py	2013-01-14 19:15:27 +0000
@@ -19,7 +19,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
 import pooler
 from osv import osv, fields
 from tools.translate import _
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/update_info_partner.xml'
--- l10n_ve_fiscal_requirements/wizard/update_info_partner.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_fiscal_requirements/wizard/update_info_partner.xml	2013-01-14 19:15:27 +0000
@@ -7,7 +7,6 @@
         <record id="view_wizard_update_info_partner" model="ir.ui.view">
             <field name="name">view.update.info.partner</field>
             <field name="model">update.info.partner</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="">
                     <separator string="Are you sure you want to do this?" colspan="4"/>
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml'
--- l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml	2012-04-11 21:48:15 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml	2013-01-14 19:15:27 +0000
@@ -4,7 +4,6 @@
         <record id="view_wizard_invoice_nro_ctrl" model="ir.ui.view">
             <field name="name">view.wizard.invoice.nro.ctrl</field>
             <field name="model">wizard.invoice.nro.ctrl</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create an invoice to justify the damaged one">
                     <group colspan="8" col="8">
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml'
--- l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml	2012-02-09 21:33:03 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml	2013-01-14 19:15:27 +0000
@@ -4,7 +4,6 @@
         <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" />
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_url_seniat_view.xml'
--- l10n_ve_fiscal_requirements/wizard/wizard_url_seniat_view.xml	2012-07-16 18:55:40 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_url_seniat_view.xml	2013-01-14 19:15:27 +0000
@@ -4,7 +4,6 @@
         <record id="view_wizard_url_seniat" model="ir.ui.view">
             <field name="name">view.wizard.seniat.url</field>
             <field name="model">wizard.seniat.url</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Update Url From Seniat">
                     <separator string="URL Seniat for Partner Information" colspan="4"/>
 
=== modified file 'l10n_ve_withholding/test/wh_pay_invoice.yml'
--- l10n_ve_withholding/test/wh_pay_invoice.yml	2012-09-27 21:43:13 +0000
+++ l10n_ve_withholding/test/wh_pay_invoice.yml	2013-01-14 19:15:27 +0000
@@ -14,14 +14,14 @@
     journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
     res = self.onchange_partner_id(cr, uid, [], inv_brw.partner_id.id, journal_id, 0.0, 1, ttype='receipt', date=False)
     ap_obj = self.pool.get('account.period')
-    period = ap_obj.find(cr, uid, time.strftime('%Y/%m/%d'), context={'company_id':ref("base.main_company")})
+    period = ap_obj.find(cr, uid, time.strftime('%Y/%m/%d'), context={'company_id':ref("base.main_company")})[0]
     vals = {
         'account_id': ref('account.cash'),
-        'amount': inv_brw.amount,
+        'amount': inv_brw.amount_total,
         'company_id': ref('base.main_company'),
         'currency_id': ref('base.EUR'),
         'journal_id': ref('account.bank_journal'),
-        'partner_id': ref('inv_brw.partner_id.id'),
+        'partner_id': inv_brw.partner_id.id,
         'period_id': period,
         'type': 'receipt',
     }
@@ -39,9 +39,10 @@
   1.2 I check that the invoice state is "Open"
 -
   !python {model: account.voucher}: |
+    import time
     inv_obj = self.pool.get("account.invoice")
     inv_brw = inv_obj.browse(cr, uid, ref("l10n_ve_fiscal_requirements.test_fr01"))
     lines = inv_brw.invoice_line
     data = self.onchange_journal(cr, uid, [ref("l10n_ve_fiscal_requirements.test_fr01")], 5, lines, False, 
-                                inv_brw.partner_id, time.strftime('%Y-%m-%d'), 
-                                inv_brw.amount, ttype, base.main_company, context=None)
+                                inv_brw.partner_id.id, time.strftime('%Y-%m-%d'), 
+                                inv_brw.amount_total, 'receipt', ref('base.main_company'), context=None)
 
=== modified file 'l10n_ve_withholding/view/account_view.xml'
--- l10n_ve_withholding/view/account_view.xml	2012-12-10 12:16:26 +0000
+++ l10n_ve_withholding/view/account_view.xml	2013-01-14 19:15:27 +0000
@@ -24,6 +24,7 @@
             </field>
         </record>
 
+<!--
         <record id="view_move_line_tax_tree_iva" model="ir.ui.view">
             <field name="name">account.move.line.tax.tree.iva</field>
             <field name="model">account.move.line</field>
@@ -36,6 +37,7 @@
                 </field>
             </field>
         </record>
+-->
 
         
         <record id="view_move_form_iva" model="ir.ui.view">
 
=== modified file 'l10n_ve_withholding_islr/__init__.py'
--- l10n_ve_withholding_islr/__init__.py	2012-12-09 23:55:45 +0000
+++ l10n_ve_withholding_islr/__init__.py	2013-01-14 19:15:27 +0000
@@ -28,4 +28,4 @@
 import model 
 import report
 import wizard
-import edi
+#import edi
 
=== modified file 'l10n_ve_withholding_islr/__openerp__.py'
--- l10n_ve_withholding_islr/__openerp__.py	2012-12-18 17:46:39 +0000
+++ l10n_ve_withholding_islr/__openerp__.py	2013-01-14 19:15:27 +0000
@@ -27,16 +27,16 @@
 ##############################################################################
 
 {
-    "name" : "Automatically Calculation Withholding Income",
+    "name" : "Automatically Calculation Income Withholding",
     "version" : "0.1",
     "author" : "Vauxoo",
     "category" : "General",
     "website": "http://wiki.openerp.org.ve/",
-    "description": ''' - Generate the voucher of withholding income to validate the invoice.
- - Generate the report of voucher of withholding income.
- - Generate the file .xml required by the Venezuelan laws, for agent of withholding income specials.
+    "description": ''' - Generate the voucher of income withholding to validate the invoice.
+ - Generate the report of voucher of income withholding.
+ - Generate the file .xml required by the Venezuelan laws, for agent of income withholding specials.
  - Generate view for load the concepts of wittholding whith their rates.
- - Generate view for visualize the withholding income for suppilers and customers.
+ - Generate view for visualize the income withholding for suppilers and customers.
  - Load data of the 86 concepts of wittholdings whith their rates.
  - Send an email to supplier with approved withholdings, if not opt_out in the partner
 If you want be able to propose withholding concepts from sales and purchases you must install extra module @section{l10n_ve_sale_purchase}.
@@ -63,7 +63,7 @@
             "view/islr_xml_wh.xml",
             "workflow/islr_wh_workflow.xml",
             "workflow/account_workflow.xml",
-            "edi/islr_wh_doc_action_data.xml",
+            #"edi/islr_wh_doc_action_data.xml",
             
     ],
     'test': [
 
=== modified file 'l10n_ve_withholding_islr/demo/retencion_islr_sequence.xml'
--- l10n_ve_withholding_islr/demo/retencion_islr_sequence.xml	2012-12-19 18:17:09 +0000
+++ l10n_ve_withholding_islr/demo/retencion_islr_sequence.xml	2013-01-14 19:15:27 +0000
@@ -4,12 +4,12 @@
 
         <!-- Sequences type for account.retention --> 
         <record id="seq_type_islr_wh" model="ir.sequence.type">
-            <field name="name">Withholding Income</field>
+            <field name="name">Income Withholding</field>
             <field name="code">islr.wh.doc</field>
         </record>
 
         <record id="seq_account_wh_islr" model="ir.sequence">
-            <field name="name">Withholding Income</field>
+            <field name="name">Income Withholding</field>
             <field name="code">islr.wh.doc</field>
             <field name="prefix">RE:</field>
             <field name="padding">8</field>
@@ -17,12 +17,12 @@
         </record>
 
         <record id="seq_type_wh_islr_purchase" model="ir.sequence.type">
-            <field name="name">Purchase Withholding Income</field>
+            <field name="name">Purchase Income Withholding</field>
             <field name="code">islr.wh.doc.in_invoice</field>
         </record>
 
         <record id="seq_wh_islr_purchase" model="ir.sequence">
-            <field name="name">Purchase Withholding Income</field>
+            <field name="name">Purchase Income Withholding</field>
             <field name="code">islr.wh.doc.in_invoice</field>
             <field name="prefix">%(year)s-%(month)s-</field>
             <field name="padding">8</field>
@@ -30,12 +30,12 @@
         </record>
 
         <record id="seq_type_wh_islr_sales" model="ir.sequence.type">
-            <field name="name">Sale Withholding Income</field>
+            <field name="name">Sale Income Withholding</field>
             <field name="code">islr.wh.doc.out_invoice</field>
         </record>
 
         <record id="seq_wh_islr_sales" model="ir.sequence">
-            <field name="name">Sale Withholding Income</field>
+            <field name="name">Sale Income Withholding</field>
             <field name="code">islr.wh.doc.out_invoice</field>
             <field name="prefix">%(year)s-%(month)s-</field>
             <field name="padding">8</field>
 
=== modified file 'l10n_ve_withholding_islr/i18n/es.po'
--- l10n_ve_withholding_islr/i18n/es.po	2012-02-09 19:23:11 +0000
+++ l10n_ve_withholding_islr/i18n/es.po	2013-01-14 19:15:27 +0000
@@ -22,7 +22,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.doc:0
-msgid "Print Withholding Income"
+msgid "Print Income Withholding"
 msgstr "Imprimir comprobante de retención"
 
 #. module: l10n_ve_withholding_islr
@@ -37,7 +37,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:islr.xml.wh.doc,amount_total_ret:0
-msgid "Withholding Income Amount Total"
+msgid "Income Withholding Amount Total"
 msgstr "Monto Total de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -53,7 +53,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:461
 #, python-format
-msgid "Impossible withholding income, because the journal of withholding income for the '%s' has not been created with the type '%s'"
+msgid "Impossible income withholding, because the journal of income withholding for the '%s' has not been created with the type '%s'"
 msgstr "Imposible realizar Comprobante de Retención ISLR, debido a que el diario de ISLR para la '%s' no ha sido creado con el tipo '%s'"
 
 #. module: l10n_ve_withholding_islr
@@ -63,7 +63,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:res.partner,islr_withholding_agent:0
-msgid "Check if the partner is an agent for withholding income"
+msgid "Check if the partner is an agent for income withholding"
 msgstr "Marque en caso de que la empresa sea agente de retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -146,12 +146,12 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:171
 #, python-format
-msgid "Impossible withholding income, because the partner '%s' has not fiscal direction set!."
+msgid "Impossible income withholding, because the partner '%s' has not fiscal direction set!."
 msgstr "Imposible realizar Comprobante de Retención de ISLR, debido a que el partner '%s' no tiene dirección fiscal asociada!."
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.doc.line:0
-msgid "Lines Withholding Income"
+msgid "Lines Income Withholding"
 msgstr "Líneas de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -204,7 +204,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,journal_sale:0
-msgid "Journal for sale operations involving Withholding Income"
+msgid "Journal for sale operations involving Income Withholding"
 msgstr "Diario para operaciones de venta que involucran retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -230,7 +230,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,journal_purchase:0
-msgid "Journal for purchase operations involving Withholding Income"
+msgid "Journal for purchase operations involving Income Withholding"
 msgstr "Diario para operaciones de venta que involucran ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -283,7 +283,7 @@
 #: model:ir.actions.act_window,name:l10n_ve_withholding_islr.action_wh_islr_customer
 #: model:ir.ui.menu,name:l10n_ve_withholding_islr.menu_action_wh_islr_customer
 #: view:islr.wh.doc:0
-msgid "Customer Withholding Income"
+msgid "Customer Income Withholding"
 msgstr "Retención de ISLR de Cliente"
 
 #. module: l10n_ve_withholding_islr
@@ -298,7 +298,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:wh.islr.config,account_purchase:0
-msgid "Account Withholding Income Purchase"
+msgid "Account Income Withholding Purchase"
 msgstr "Cuenta contable para ISLR (compras)"
 
 #. module: l10n_ve_withholding_islr
@@ -347,7 +347,7 @@
 #: model:ir.actions.act_window,name:l10n_ve_withholding_islr.action_wh_islr_supplier
 #: model:ir.ui.menu,name:l10n_ve_withholding_islr.menu_action_wh_islr_supplier
 #: view:islr.wh.doc:0
-msgid "Supplier Withholding Income"
+msgid "Supplier Income Withholding"
 msgstr "Retención de ISLR de Proveedores"
 
 #. module: l10n_ve_withholding_islr
@@ -373,7 +373,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:270
 #, python-format
-msgid "Impossible withholding income,because the invoice number: '%s' has not number reference free!"
+msgid "Impossible income withholding,because the invoice number: '%s' has not number reference free!"
 msgstr "Imposible realizar Comprobante de Retención ISLR, debido a que la factura número: '%s' no tiene Número de Referencia Libre!"
 
 #. module: l10n_ve_withholding_islr
@@ -425,7 +425,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:282
 #, python-format
-msgid "Impossible withholding income, because the account for withholding of sale is not assigned to the Concept withholding '%s'!"
+msgid "Impossible income withholding, because the account for withholding of sale is not assigned to the Concept withholding '%s'!"
 msgstr "Imposible realizar Retención ISLR, debido a que la cuenta contable para retención de venta no esta asignada al Concepto '%s' !!"
 
 #. module: l10n_ve_withholding_islr
@@ -441,7 +441,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:194
 #, python-format
-msgid "Impossible withholding income, because the partner '%s' has not vat associated!"
+msgid "Impossible income withholding, because the partner '%s' has not vat associated!"
 msgstr "Imposible realizar Comprobante de Retencion ISLR, debido a que el partner, '%s' no tiene RIF asociado!"
 
 #. module: l10n_ve_withholding_islr
@@ -461,7 +461,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.actions.act_window,help:l10n_ve_withholding_islr.action_wh_islr_supplier
-msgid "With Supplier Withholding  you can manage document withholding issued to your suppliers. OpenERP can Just generate document withholding for purchase process automatically from invoices. To generate the withholding income and all accounting process you must confirm and validate the document withholding."
+msgid "With Supplier Withholding  you can manage document withholding issued to your suppliers. OpenERP can Just generate document withholding for purchase process automatically from invoices. To generate the income withholding and all accounting process you must confirm and validate the document withholding."
 msgstr "A través de Retención de ISLR de proveedores usted prodrá gestionar el documento de retención emitido para sus proveedores. OpenERP también puede generar el documento de retención automáticamente desde la factura de proveedor. Para generar la retención se debe confirmar y validar el documento de retención."
 
 #. module: l10n_ve_withholding_islr
@@ -537,13 +537,13 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:islr.xml.wh.line,islr_wh_doc_line_id:0
-msgid "Withholding Income Document"
+msgid "Income Withholding Document"
 msgstr "Documento de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:288
 #, python-format
-msgid "Impossible withholding income, because the account for withholding of purchase is not assigned to the Concept withholding '%s'!"
+msgid "Impossible income withholding, because the account for withholding of purchase is not assigned to the Concept withholding '%s'!"
 msgstr "Imposible realizar Retención ISLR, debido a que la cuenta contable para retención de compra no esta asignada al Concepto '%s' !"
 
 #. module: l10n_ve_withholding_islr
@@ -629,7 +629,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:account.invoice.line,concept_id:0
-msgid "Concept of Withholding Income asociate this rate"
+msgid "Concept of Income Withholding asociate this rate"
 msgstr "Concepto de Retención asociado a esta tasa"
 
 #. module: l10n_ve_withholding_islr
@@ -649,7 +649,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.doc:0
-msgid "Search Withholding Income"
+msgid "Search Income Withholding"
 msgstr "Búsqueda - Documento de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -665,7 +665,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/installer.py:92
 #, python-format
-msgid "Journal Withholding Income Purchase"
+msgid "Journal Income Withholding Purchase"
 msgstr "Diario ISLR para compras"
 
 #. module: l10n_ve_withholding_islr
@@ -680,12 +680,12 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:wh.islr.config,wh_agent:0
-msgid "Withholding Income Agent"
+msgid "Income Withholding Agent"
 msgstr "Eres agente de retención de ISLR?"
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.module.module,shortdesc:l10n_ve_withholding_islr.module_meta_information
-msgid "Automatically Calculation Withholding Income"
+msgid "Automatically Calculation Income Withholding"
 msgstr "Calculo Automático de Impuesto Sobre la Renta (ISLR)"
 
 #. module: l10n_ve_withholding_islr
@@ -701,7 +701,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.actions.act_window,help:l10n_ve_withholding_islr.action_wh_islr_concept
-msgid "With \"Concept of Withholding Income\" you can create and manage the concept of wittholding income. For each concept is to create and manage rates associated."
+msgid "With \"Concept of Income Withholding\" you can create and manage the concept of wittholding income. For each concept is to create and manage rates associated."
 msgstr "A través de \"Concepto de Retención de ISLR\"  usted podrá crear y gestionar los conceptos de retención de ISLR. Por cada concepto se puede crear y gestionar las tasas asociadas."
 
 #. module: l10n_ve_withholding_islr
@@ -712,7 +712,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.model,name:l10n_ve_withholding_islr.model_islr_wh_doc_line
-msgid "Lines of Document Withholding Income"
+msgid "Lines of Document Income Withholding"
 msgstr "Líneas del Documento de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -757,7 +757,7 @@
 #. module: l10n_ve_withholding_islr
 #: model:ir.actions.report.xml,name:l10n_ve_withholding_islr.list_report_withholding_islr
 #: model:ir.ui.menu,name:l10n_ve_withholding_islr.menu_wh_configuration_islr
-msgid "Withholding Income"
+msgid "Income Withholding"
 msgstr "Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -777,7 +777,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.model,name:l10n_ve_withholding_islr.model_islr_wh_doc
-msgid "Document Withholding Income"
+msgid "Document Income Withholding"
 msgstr "Documento de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -787,7 +787,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:product.template,concept_id:0
-msgid "Concept Withholding Income to apply to the service"
+msgid "Concept Income Withholding to apply to the service"
 msgstr "Concepto de Retención a aplicar para el servicio"
 
 #. module: l10n_ve_withholding_islr
@@ -812,7 +812,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.actions.report.xml,name:l10n_ve_withholding_islr.voucher_report_withholding_islr
-msgid "Voucher Withholding Income"
+msgid "Voucher Income Withholding"
 msgstr "Comprobante de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -827,7 +827,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.doc.line:0
-msgid "Detail of the Concept of Withholding Income"
+msgid "Detail of the Concept of Income Withholding"
 msgstr "Detalle del Concepto de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -871,7 +871,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/installer.py:93
 #, python-format
-msgid "Journal Withholding Income Sale"
+msgid "Journal Income Withholding Sale"
 msgstr "Diario ISLR para ventas"
 
 #. module: l10n_ve_withholding_islr
@@ -973,7 +973,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:wh.islr.config,account_sale:0
-msgid "Account Withholding Income Sale"
+msgid "Account Income Withholding Sale"
 msgstr "Cuenta contable ISLR (ventas)"
 
 #. module: l10n_ve_withholding_islr
@@ -1014,7 +1014,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:229
 #, python-format
-msgid "Impossible withholding income, because the Concept of Withholding associated with type line is not withheld!"
+msgid "Impossible income withholding, because the Concept of Withholding associated with type line is not withheld!"
 msgstr "Imposible realizar Comprobante de Retención ISLR, debido a que  el Concepto de Retención asociado a la línea no es de tipo Retenible!"
 
 #. module: l10n_ve_withholding_islr
@@ -1037,7 +1037,7 @@
 #. module: l10n_ve_withholding_islr
 #: model:ir.model,name:l10n_ve_withholding_islr.model_islr_wh_concept
 #: field:islr.wh.doc,concept_ids:0
-msgid "Withholding Income Concept"
+msgid "Income Withholding Concept"
 msgstr "Concepto de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1052,7 +1052,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,account_purchase:0
-msgid "Account for purchase operations involving Withholding Income"
+msgid "Account for purchase operations involving Income Withholding"
 msgstr "Cuenta contable para operaciones de compra que involucran ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1077,8 +1077,8 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:islr.xml.wh.doc,name:0
-msgid "Description about statement of withholding income"
-msgstr "Description about statement of withholding income"
+msgid "Description about statement of income withholding"
+msgstr "Description about statement of income withholding"
 
 #. module: l10n_ve_withholding_islr
 #: report:islr.wh.doc:0
@@ -1087,12 +1087,12 @@
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.concept:0
-msgid "Search Concept of Withholding Income"
+msgid "Search Concept of Income Withholding"
 msgstr "Búsqueda - Concepto de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
 #: field:res.partner,islr_withholding_agent:0
-msgid "Withholding Income Agent?"
+msgid "Income Withholding Agent?"
 msgstr "Agente de Retención de ISLR?"
 
 #. module: l10n_ve_withholding_islr
@@ -1173,7 +1173,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:166
 #, python-format
-msgid "Impossible withholding income, because the partner '%s' country has not defined direction in fiscal!"
+msgid "Impossible income withholding, because the partner '%s' country has not defined direction in fiscal!"
 msgstr "Imposible realizar Comprobante de Retención de ISLR, debido a que el partner '%s' no tiene país en su facturación fiscal!"
 
 #. module: l10n_ve_withholding_islr
@@ -1251,7 +1251,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,account_sale:0
-msgid "Account for sale operations involving Withholding Income"
+msgid "Account for sale operations involving Income Withholding"
 msgstr "Cuenta para operaciones de ventas que involucran ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1293,7 +1293,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:410
 #, python-format
-msgid "Impossible withholding income, because the supplier '%s' withholding agent is not!"
+msgid "Impossible income withholding, because the supplier '%s' withholding agent is not!"
 msgstr "Imposible realizar Comprobante de Retención de ISLR, debido a que el comprador '%s' no es agente de Retención!"
 
 #. module: l10n_ve_withholding_islr
@@ -1304,22 +1304,22 @@
 #. module: l10n_ve_withholding_islr
 #: model:ir.module.module,description:l10n_ve_withholding_islr.module_meta_information
 msgid "\n"
-"                    ----------Automatically Calculated Withholding Income------------\n"
+"                    ----------Automatically Calculated Income Withholding------------\n"
 "\n"
 "                    What make this module?\n"
 "                    \n"
-"                    --Generate the voucher of withholding income to validate the invoice.\n"
-"                    --Generate the report of voucher of withholding income.\n"
+"                    --Generate the voucher of income withholding to validate the invoice.\n"
+"                    --Generate the report of voucher of income withholding.\n"
 "                    --Generate the file .xml required by the Venezuelan laws, for agent\n"
-"                      of withholding income specials.\n"
+"                      of income withholding specials.\n"
 "                    --Generate view for load the concepts of wittholding whith their rates.\n"
-"                    --Generate view for visualize the withholding income for suppilers and \n"
+"                    --Generate view for visualize the income withholding for suppilers and \n"
 "                      customers.\n"
 "                    --Load data of the 86 concepts of wittholdings whith their rates.\n"
 "\n"
 "                    Impromevents\n"
 "                    \n"
-"                    --For include the functionality of the withholding income to sales, \n"
+"                    --For include the functionality of the income withholding to sales, \n"
 "                      purchases and stock you should installer the module: l10n_ve_sale_purchase.\n"
 "                   "
 msgstr "\n"
@@ -1352,7 +1352,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/product.py:62
 #, python-format
-msgid "Must create the concept of withholding income"
+msgid "Must create the concept of income withholding"
 msgstr "Debe crear el concepto de retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1368,12 +1368,12 @@
 #: view:islr.xml.wh.line:0
 #: view:product.product:0
 #: view:product.template:0
-msgid "Concept of Withholding Income"
+msgid "Concept of Income Withholding"
 msgstr "Concepto de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,wh_agent:0
-msgid "Check if this company is a withholding income agent"
+msgid "Check if this company is a income withholding agent"
 msgstr "Determine si su cumpañía es un agente de retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1384,7 +1384,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:280
 #, python-format
-msgid "Impossible withholding income, because the invoice number: '%s' has not control number associated!"
+msgid "Impossible income withholding, because the invoice number: '%s' has not control number associated!"
 msgstr "Imposible realizar Comprobante de Retención ISLR, debido a que la factura número: '%s' no tiene Número de Control Asociado!"
 
 #. module: l10n_ve_withholding_islr
@@ -1425,12 +1425,12 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:412
 #, python-format
-msgid "Impossible withholding income, because the lines of the invoice has not concept withholding!"
+msgid "Impossible income withholding, because the lines of the invoice has not concept withholding!"
 msgstr "Imposible realizar retención de ISLR, porque las lineas de la factura no tienen concepto de retención asociado!"
 
 #. module: l10n_ve_withholding_islr
 #: view:wh.islr.config:0
-msgid "Withholding income Configuration"
+msgid "Income withholding Configuration"
 msgstr "Configuración de la Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1441,7 +1441,7 @@
 #. module: l10n_ve_withholding_islr
 #: view:wh.islr.config:0
 msgid "\n"
-"Configure your company's withholding income                      \n"
+"Configure your company's income withholding                      \n"
 "                  "
 msgstr "\n"
 "Configure los datos de su compañía para la Retención del Impuesto Sobre La Renta (ISLR)                      \n"
 
=== modified file 'l10n_ve_withholding_islr/i18n/es_VE.po'
--- l10n_ve_withholding_islr/i18n/es_VE.po	2012-02-09 19:23:11 +0000
+++ l10n_ve_withholding_islr/i18n/es_VE.po	2013-01-14 19:15:27 +0000
@@ -27,7 +27,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.doc:0
-msgid "Print Withholding Income"
+msgid "Print Income Withholding"
 msgstr "Imprimir comprobante de retención"
 
 
@@ -38,7 +38,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:islr.xml.wh.doc,amount_total_ret:0
-msgid "Withholding Income Amount Total"
+msgid "Income Withholding Amount Total"
 msgstr "Monto Total de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -54,7 +54,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:461
 #, python-format
-msgid "Impossible withholding income, because the journal of withholding income for the '%s' has not been created with the type '%s'"
+msgid "Impossible income withholding, because the journal of income withholding for the '%s' has not been created with the type '%s'"
 msgstr "Imposible realizar Comprobante de Retención ISLR, debido a que el diario de ISLR para la '%s' no ha sido creado con el tipo '%s'"
 
 #. module: l10n_ve_withholding_islr
@@ -64,7 +64,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:res.partner,islr_withholding_agent:0
-msgid "Check if the partner is an agent for withholding income"
+msgid "Check if the partner is an agent for income withholding"
 msgstr "Marque en caso de que la empresa sea agente de retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -147,12 +147,12 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:171
 #, python-format
-msgid "Impossible withholding income, because the partner '%s' has not fiscal direction set!."
+msgid "Impossible income withholding, because the partner '%s' has not fiscal direction set!."
 msgstr "Imposible realizar Comprobante de Retención de ISLR, debido a que el partner '%s' no tiene dirección fiscal asociada!."
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.doc.line:0
-msgid "Lines Withholding Income"
+msgid "Lines Income Withholding"
 msgstr "Líneas de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -205,7 +205,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,journal_sale:0
-msgid "Journal for sale operations involving Withholding Income"
+msgid "Journal for sale operations involving Income Withholding"
 msgstr "Diario para operaciones de venta que involucran retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -231,7 +231,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,journal_purchase:0
-msgid "Journal for purchase operations involving Withholding Income"
+msgid "Journal for purchase operations involving Income Withholding"
 msgstr "Diario para operaciones de venta que involucran ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -284,7 +284,7 @@
 #: model:ir.actions.act_window,name:l10n_ve_withholding_islr.action_wh_islr_customer
 #: model:ir.ui.menu,name:l10n_ve_withholding_islr.menu_action_wh_islr_customer
 #: view:islr.wh.doc:0
-msgid "Customer Withholding Income"
+msgid "Customer Income Withholding"
 msgstr "Retención de ISLR de Cliente"
 
 #. module: l10n_ve_withholding_islr
@@ -299,7 +299,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:wh.islr.config,account_purchase:0
-msgid "Account Withholding Income Purchase"
+msgid "Account Income Withholding Purchase"
 msgstr "Cuenta contable para ISLR (compras)"
 
 #. module: l10n_ve_withholding_islr
@@ -348,7 +348,7 @@
 #: model:ir.actions.act_window,name:l10n_ve_withholding_islr.action_wh_islr_supplier
 #: model:ir.ui.menu,name:l10n_ve_withholding_islr.menu_action_wh_islr_supplier
 #: view:islr.wh.doc:0
-msgid "Supplier Withholding Income"
+msgid "Supplier Income Withholding"
 msgstr "Retención de ISLR de Proveedores"
 
 #. module: l10n_ve_withholding_islr
@@ -374,7 +374,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:270
 #, python-format
-msgid "Impossible withholding income,because the invoice number: '%s' has not number reference free!"
+msgid "Impossible income withholding,because the invoice number: '%s' has not number reference free!"
 msgstr "Imposible realizar Comprobante de Retención ISLR, debido a que la factura número: '%s' no tiene Número de Referencia Libre!"
 
 #. module: l10n_ve_withholding_islr
@@ -426,7 +426,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:282
 #, python-format
-msgid "Impossible withholding income, because the account for withholding of sale is not assigned to the Concept withholding '%s'!"
+msgid "Impossible income withholding, because the account for withholding of sale is not assigned to the Concept withholding '%s'!"
 msgstr "Imposible realizar Retención ISLR, debido a que la cuenta contable para retención de venta no esta asignada al Concepto '%s' !!"
 
 #. module: l10n_ve_withholding_islr
@@ -442,7 +442,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:194
 #, python-format
-msgid "Impossible withholding income, because the partner '%s' has not vat associated!"
+msgid "Impossible income withholding, because the partner '%s' has not vat associated!"
 msgstr "Imposible realizar Comprobante de Retencion ISLR, debido a que el partner, '%s' no tiene RIF asociado!"
 
 #. module: l10n_ve_withholding_islr
@@ -462,7 +462,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.actions.act_window,help:l10n_ve_withholding_islr.action_wh_islr_supplier
-msgid "With Supplier Withholding  you can manage document withholding issued to your suppliers. OpenERP can Just generate document withholding for purchase process automatically from invoices. To generate the withholding income and all accounting process you must confirm and validate the document withholding."
+msgid "With Supplier Withholding  you can manage document withholding issued to your suppliers. OpenERP can Just generate document withholding for purchase process automatically from invoices. To generate the income withholding and all accounting process you must confirm and validate the document withholding."
 msgstr "A través de Retención de ISLR de proveedores usted prodrá gestionar el documento de retención emitido para sus proveedores. OpenERP también puede generar el documento de retención automáticamente desde la factura de proveedor. Para generar la retención se debe confirmar y validar el documento de retención."
 
 #. module: l10n_ve_withholding_islr
@@ -538,13 +538,13 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:islr.xml.wh.line,islr_wh_doc_line_id:0
-msgid "Withholding Income Document"
+msgid "Income Withholding Document"
 msgstr "Documento de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:288
 #, python-format
-msgid "Impossible withholding income, because the account for withholding of purchase is not assigned to the Concept withholding '%s'!"
+msgid "Impossible income withholding, because the account for withholding of purchase is not assigned to the Concept withholding '%s'!"
 msgstr "Imposible realizar Retención ISLR, debido a que la cuenta contable para retención de compra no esta asignada al Concepto '%s' !"
 
 #. module: l10n_ve_withholding_islr
@@ -630,7 +630,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:account.invoice.line,concept_id:0
-msgid "Concept of Withholding Income asociate this rate"
+msgid "Concept of Income Withholding asociate this rate"
 msgstr "Concepto de Retención asociado a esta tasa"
 
 #. module: l10n_ve_withholding_islr
@@ -650,7 +650,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.doc:0
-msgid "Search Withholding Income"
+msgid "Search Income Withholding"
 msgstr "Búsqueda - Documento de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -666,7 +666,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/installer.py:92
 #, python-format
-msgid "Journal Withholding Income Purchase"
+msgid "Journal Income Withholding Purchase"
 msgstr "Diario ISLR para compras"
 
 #. module: l10n_ve_withholding_islr
@@ -681,12 +681,12 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:wh.islr.config,wh_agent:0
-msgid "Withholding Income Agent"
+msgid "Income Withholding Agent"
 msgstr "Eres agente de retención de ISLR?"
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.module.module,shortdesc:l10n_ve_withholding_islr.module_meta_information
-msgid "Automatically Calculation Withholding Income"
+msgid "Automatically Calculation Income Withholding"
 msgstr "Calculo Automático de Impuesto Sobre la Renta (ISLR)"
 
 #. module: l10n_ve_withholding_islr
@@ -702,7 +702,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.actions.act_window,help:l10n_ve_withholding_islr.action_wh_islr_concept
-msgid "With \"Concept of Withholding Income\" you can create and manage the concept of wittholding income. For each concept is to create and manage rates associated."
+msgid "With \"Concept of Income Withholding\" you can create and manage the concept of wittholding income. For each concept is to create and manage rates associated."
 msgstr "A través de \"Concepto de Retención de ISLR\"  usted podrá crear y gestionar los conceptos de retención de ISLR. Por cada concepto se puede crear y gestionar las tasas asociadas."
 
 #. module: l10n_ve_withholding_islr
@@ -713,7 +713,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.model,name:l10n_ve_withholding_islr.model_islr_wh_doc_line
-msgid "Lines of Document Withholding Income"
+msgid "Lines of Document Income Withholding"
 msgstr "Líneas del Documento de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -758,7 +758,7 @@
 #. module: l10n_ve_withholding_islr
 #: model:ir.actions.report.xml,name:l10n_ve_withholding_islr.list_report_withholding_islr
 #: model:ir.ui.menu,name:l10n_ve_withholding_islr.menu_wh_configuration_islr
-msgid "Withholding Income"
+msgid "Income Withholding"
 msgstr "Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -778,7 +778,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.model,name:l10n_ve_withholding_islr.model_islr_wh_doc
-msgid "Document Withholding Income"
+msgid "Document Income Withholding"
 msgstr "Documento de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -788,7 +788,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:product.template,concept_id:0
-msgid "Concept Withholding Income to apply to the service"
+msgid "Concept Income Withholding to apply to the service"
 msgstr "Concepto de Retención a aplicar para el servicio"
 
 #. module: l10n_ve_withholding_islr
@@ -813,7 +813,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: model:ir.actions.report.xml,name:l10n_ve_withholding_islr.voucher_report_withholding_islr
-msgid "Voucher Withholding Income"
+msgid "Voucher Income Withholding"
 msgstr "Comprobante de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -828,7 +828,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.doc.line:0
-msgid "Detail of the Concept of Withholding Income"
+msgid "Detail of the Concept of Income Withholding"
 msgstr "Detalle del Concepto de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -872,7 +872,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/installer.py:93
 #, python-format
-msgid "Journal Withholding Income Sale"
+msgid "Journal Income Withholding Sale"
 msgstr "Diario ISLR para ventas"
 
 #. module: l10n_ve_withholding_islr
@@ -974,7 +974,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: field:wh.islr.config,account_sale:0
-msgid "Account Withholding Income Sale"
+msgid "Account Income Withholding Sale"
 msgstr "Cuenta contable ISLR (ventas)"
 
 #. module: l10n_ve_withholding_islr
@@ -1015,7 +1015,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:229
 #, python-format
-msgid "Impossible withholding income, because the Concept of Withholding associated with type line is not withheld!"
+msgid "Impossible income withholding, because the Concept of Withholding associated with type line is not withheld!"
 msgstr "Imposible realizar Comprobante de Retención ISLR, debido a que  el Concepto de Retención asociado a la línea no es de tipo Retenible!"
 
 #. module: l10n_ve_withholding_islr
@@ -1038,7 +1038,7 @@
 #. module: l10n_ve_withholding_islr
 #: model:ir.model,name:l10n_ve_withholding_islr.model_islr_wh_concept
 #: field:islr.wh.doc,concept_ids:0
-msgid "Withholding Income Concept"
+msgid "Income Withholding Concept"
 msgstr "Concepto de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1053,7 +1053,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,account_purchase:0
-msgid "Account for purchase operations involving Withholding Income"
+msgid "Account for purchase operations involving Income Withholding"
 msgstr "Cuenta contable para operaciones de compra que involucran ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1078,8 +1078,8 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:islr.xml.wh.doc,name:0
-msgid "Description about statement of withholding income"
-msgstr "Description about statement of withholding income"
+msgid "Description about statement of income withholding"
+msgstr "Description about statement of income withholding"
 
 #. module: l10n_ve_withholding_islr
 #: report:islr.wh.doc:0
@@ -1088,12 +1088,12 @@
 
 #. module: l10n_ve_withholding_islr
 #: view:islr.wh.concept:0
-msgid "Search Concept of Withholding Income"
+msgid "Search Concept of Income Withholding"
 msgstr "Búsqueda - Concepto de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
 #: field:res.partner,islr_withholding_agent:0
-msgid "Withholding Income Agent?"
+msgid "Income Withholding Agent?"
 msgstr "Agente de Retención de ISLR?"
 
 #. module: l10n_ve_withholding_islr
@@ -1174,7 +1174,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:166
 #, python-format
-msgid "Impossible withholding income, because the partner '%s' country has not defined direction in fiscal!"
+msgid "Impossible income withholding, because the partner '%s' country has not defined direction in fiscal!"
 msgstr "Imposible realizar Comprobante de Retención de ISLR, debido a que el partner '%s' no tiene país en su facturación fiscal!"
 
 #. module: l10n_ve_withholding_islr
@@ -1252,7 +1252,7 @@
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,account_sale:0
-msgid "Account for sale operations involving Withholding Income"
+msgid "Account for sale operations involving Income Withholding"
 msgstr "Cuenta para operaciones de ventas que involucran ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1294,7 +1294,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:410
 #, python-format
-msgid "Impossible withholding income, because the supplier '%s' withholding agent is not!"
+msgid "Impossible income withholding, because the supplier '%s' withholding agent is not!"
 msgstr "Imposible realizar Comprobante de Retención de ISLR, debido a que el comprador '%s' no es agente de Retención!"
 
 #. module: l10n_ve_withholding_islr
@@ -1305,22 +1305,22 @@
 #. module: l10n_ve_withholding_islr
 #: model:ir.module.module,description:l10n_ve_withholding_islr.module_meta_information
 msgid "\n"
-"                    ----------Automatically Calculated Withholding Income------------\n"
+"                    ----------Automatically Calculated Income Withholding------------\n"
 "\n"
 "                    What make this module?\n"
 "                    \n"
-"                    --Generate the voucher of withholding income to validate the invoice.\n"
-"                    --Generate the report of voucher of withholding income.\n"
+"                    --Generate the voucher of income withholding to validate the invoice.\n"
+"                    --Generate the report of voucher of income withholding.\n"
 "                    --Generate the file .xml required by the Venezuelan laws, for agent\n"
-"                      of withholding income specials.\n"
+"                      of income withholding specials.\n"
 "                    --Generate view for load the concepts of wittholding whith their rates.\n"
-"                    --Generate view for visualize the withholding income for suppilers and \n"
+"                    --Generate view for visualize the income withholding for suppilers and \n"
 "                      customers.\n"
 "                    --Load data of the 86 concepts of wittholdings whith their rates.\n"
 "\n"
 "                    Impromevents\n"
 "                    \n"
-"                    --For include the functionality of the withholding income to sales, \n"
+"                    --For include the functionality of the income withholding to sales, \n"
 "                      purchases and stock you should installer the module: l10n_ve_sale_purchase.\n"
 "                   "
 msgstr "\n"
@@ -1353,7 +1353,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/product.py:62
 #, python-format
-msgid "Must create the concept of withholding income"
+msgid "Must create the concept of income withholding"
 msgstr "Debe crear el concepto de retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1369,12 +1369,12 @@
 #: view:islr.xml.wh.line:0
 #: view:product.product:0
 #: view:product.template:0
-msgid "Concept of Withholding Income"
+msgid "Concept of Income Withholding"
 msgstr "Concepto de Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
 #: help:wh.islr.config,wh_agent:0
-msgid "Check if this company is a withholding income agent"
+msgid "Check if this company is a income withholding agent"
 msgstr "Determine si su cumpañía es un agente de retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1385,7 +1385,7 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/invoice.py:280
 #, python-format
-msgid "Impossible withholding income, because the invoice number: '%s' has not control number associated!"
+msgid "Impossible income withholding, because the invoice number: '%s' has not control number associated!"
 msgstr "Imposible realizar Comprobante de Retención ISLR, debido a que la factura número: '%s' no tiene Número de Control Asociado!"
 
 #. module: l10n_ve_withholding_islr
@@ -1426,12 +1426,12 @@
 #. module: l10n_ve_withholding_islr
 #: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:412
 #, python-format
-msgid "Impossible withholding income, because the lines of the invoice has not concept withholding!"
+msgid "Impossible income withholding, because the lines of the invoice has not concept withholding!"
 msgstr "Imposible realizar retención de ISLR, porque las lineas de la factura no tienen concepto de retención asociado!"
 
 #. module: l10n_ve_withholding_islr
 #: view:wh.islr.config:0
-msgid "Withholding income Configuration"
+msgid "Income withholding Configuration"
 msgstr "Configuración de la Retención de ISLR"
 
 #. module: l10n_ve_withholding_islr
@@ -1442,7 +1442,7 @@
 #. module: l10n_ve_withholding_islr
 #: view:wh.islr.config:0
 msgid "\n"
-"Configure your company's withholding income                      \n"
+"Configure your company's income withholding                      \n"
 "                  "
 msgstr "\n"
 "Configure los datos de su compañía para la Retención del Impuesto Sobre La Renta (ISLR)                      \n"
 
=== modified file 'l10n_ve_withholding_islr/model/installer.py'
--- l10n_ve_withholding_islr/model/installer.py	2012-12-09 23:55:45 +0000
+++ l10n_ve_withholding_islr/model/installer.py	2013-01-14 19:15:27 +0000
@@ -74,24 +74,24 @@
             self._set_wh_agent(cr, uid)
 
     _columns = {
-        'journal_purchase': fields.char("Journal Wh Income Purchase", 64, help="Journal for purchase operations involving Withholding Income"),
-        'journal_sale': fields.char("Journal Wh Income Sale", 64, help="Journal for sale operations involving Withholding Income"),
+        'journal_purchase': fields.char("Journal Wh Income Purchase", 64, help="Journal for purchase operations involving Income Withholding"),
+        'journal_sale': fields.char("Journal Wh Income Sale", 64, help="Journal for sale operations involving Income Withholding"),
         'account_purchase': fields.many2one(
             "account.account",
-            "Account Withholding Income Purchase",
-            help="Account for purchase operations involving Withholding Income"
+            "Account Income Withholding Purchase",
+            help="Account for purchase operations involving Income Withholding"
         ),
         'account_sale': fields.many2one(
             "account.account",
-            "Account Withholding Income Sale",
-            help="Account for sale operations involving Withholding Income",
+            "Account Income Withholding Sale",
+            help="Account for sale operations involving Income Withholding",
         ),
-        'wh_agent': fields.boolean("Withholding Income Agent", help="Check if this company is a withholding income agent"),
+        'wh_agent': fields.boolean("Income Withholding Agent", help="Check if this company is a income withholding agent"),
     }
 
     _defaults = {
-        'journal_purchase': _("Journal Withholding Income Purchase"),
-        'journal_sale': _("Journal Withholding Income Sale"),
+        'journal_purchase': _("Journal Income Withholding Purchase"),
+        'journal_sale': _("Journal Income Withholding Sale"),
     }
 
 wh_islr_config()
 
=== modified file 'l10n_ve_withholding_islr/model/invoice.py'
--- l10n_ve_withholding_islr/model/invoice.py	2012-12-09 23:55:45 +0000
+++ l10n_ve_withholding_islr/model/invoice.py	2013-01-14 19:15:27 +0000
@@ -39,7 +39,7 @@
     _inherit = "account.invoice.line"
     _columns = {
         'apply_wh': fields.boolean('Withheld',help="Indicates whether a line has been retained or not, to accumulate the amount to withhold next month, according to the lines that have not been retained."),
-        'concept_id': fields.many2one('islr.wh.concept','Withholding  Concept',help="Concept of Withholding Income asociate this rate",required=False),
+        'concept_id': fields.many2one('islr.wh.concept','Withholding  Concept',help="Concept of Income Withholding asociate this rate",required=False),
     }
     _defaults = {
         'apply_wh': lambda *a: False,
@@ -93,6 +93,76 @@
     _defaults = {
         'status': lambda *a: "no_pro",
     }
+## BEGIN OF REWRITING ISLR
+
+    def check_invoice_type(self, cr, uid, ids, context=None):
+        '''
+        This method check if the given invoice record is from a supplier
+        '''
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        inv_brw = self.browse(cr, uid, ids[0],context=context)
+        return inv_brw.type in ('in_invoice', 'in_refund')
+
+    def check_withholdable_concept(self, cr, uid, ids, context=None):
+        '''
+        Check if the given invoice record is ISLR Withholdable 
+        '''
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        iwdi_obj = self.pool.get('islr.wh.doc.invoices')
+        return iwdi_obj._get_concepts(cr, uid, ids, context=context)
+
+    def _create_doc_invoices(self,cr,uid,ids,islr_wh_doc_id,context=None):
+        '''
+        This method link the invoices to be withheld 
+        with the withholding document.
+        '''
+        #TODO: CHECK IF THIS METHOD SHOULD BE HERE OR IN THE ISLR WH DOC
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        doc_inv_obj = self.pool.get('islr.wh.doc.invoices')
+        iwhdi_ids=[] 
+        for inv_id in ids:
+            iwhdi_ids.append(doc_inv_obj.create(cr,uid,
+                {'invoice_id':inv_id,'islr_wh_doc_id':islr_wh_doc_id}))
+        return iwhdi_ids
+
+    def _create_islr_wh_doc(self,cr,uid,ids,context=None):
+        '''
+        Funcion para crear en el modelo islr_wh_doc
+        '''
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        
+        doc_line_obj = self.pool.get('islr.wh.doc.line')
+        wh_doc_obj = self.pool.get('islr.wh.doc')
+        inv_obj =self.pool.get('account.invoice.line')
+        rate_obj = self.pool.get('islr.rates')
+        
+        row = self.browse(cr,uid,ids[0],context=context)
+        context['type']=row.type
+        wh_ret_code = wh_doc_obj.retencion_seq_get(cr, uid)
+        
+        if wh_ret_code:
+            islr_wh_doc_id = wh_doc_obj.create(cr,uid,
+            {'name': wh_ret_code,
+            'partner_id': row.partner_id.id,
+            'invoice_id': row.id,
+            'period_id': row.period_id.id,
+            'account_id': row.account_id.id,
+            'type': row.type,
+            'journal_id': wh_doc_obj._get_journal(cr,uid,context=context),})
+            self._create_doc_invoices(cr,uid,row.id,islr_wh_doc_id)
+        else:
+            raise osv.except_osv(_('Invalid action !'),_("No se ha encontrado el numero de secuencia!"))
+
+        self.write(cr,uid,ids,{'islr_wh_doc_id':islr_wh_doc_id,'islr_wh_doc_name':wh_ret_code})
+
+        #wf_service = netsvc.LocalService("workflow")
+        #wf_service.trg_validate(uid, 'islr.wh.doc', islr_wh_doc_id, 'button_confirm', cr)
+        return islr_wh_doc_id
+## END OF REWRITING ISLR
 
     def copy(self, cr, uid, id, default=None, context=None):
         
@@ -125,572 +195,6 @@
             list.append((x,y,res))
         return list
 
-    def _get_partners(self, cr, uid, invoice):
-        '''
-        Get the seller id, the buyer id from the invoice, and the boolean field that determines whether the buyer is the withholding agent
-        '''
-        if invoice.type == 'in_invoice' or invoice.type == 'in_refund':
-            vendor = invoice.partner_id
-            buyer = invoice.company_id.partner_id
-        else:
-            buyer = invoice.partner_id
-            vendor = invoice.company_id.partner_id
-        return (vendor, buyer, buyer.islr_withholding_agent)
-
-    def _get_concepts(self, cr, uid, invoice):
-        '''
-        Gets a list of concepts (cocenpt_id) from the invoice lines
-        '''
-        service_list = []
-        for invoice_line in invoice.invoice_line:
-            if invoice_line.concept_id and invoice_line.concept_id.withholdable:
-                service_list.append(invoice_line.concept_id.id)
-            else:
-                pass
-        return list(set(service_list))
-        
-    def _get_service_wh(self, cr, uid, invoice, concept_list):
-        '''
-        Gets all the vendor invoice lines, filtering by the period of the current invoice and the invoice state equal to {done, onpen}
-        The lines are stored in a dictionary, where the first key is the list of lines obtained, the second key is the field that indicates wheter any of these line was withholding, and the third key is the sum of the base of all the lines that have not withholding applied
-        A search in the lines is done seeking for lines that have withholding concepts equals to the current invoice. This is done to verify:
-            1.- If exist the same concepts in another invoice line that have not been withholding cause the amount have no exceeded the minimum value therefore this amount its taken to perform the sum and verification. If the amount exceeds the minimun then withholding is applied to the associated invoices.
-            2.- Verify if is the first time that a withholding is applied on that concept, If is true then the subtrahend is applied in the second key "wf" of the dictionary
-
-        '''
-        dict={}
-        for key in concept_list:
-            dict[key]={'lines':[],'wh':False,'base':0.0}
-        #~ inv_obj = self.pool.get('account.invoice')
-        #~ inv_lst = inv_obj.search(cr, uid,[('partner_id', '=', invoice.partner_id.id),('period_id','=',invoice.period_id.id),('state','in',['done','open'])]) # Lista de  facturas asociadas al proveedor actual, al periodo actual y al estado de las facturas: donde, open.
-        #~ 
-        #~ inv_line_lst=[]
-        #~ for id in inv_lst:
-            #~ inv_line_brw = inv_obj.browse(cr, uid, id).invoice_line #lista de lineas de facturas
-        for line in invoice.invoice_line:
-            if line.concept_id and  line.concept_id.id in concept_list: # Se verifica si el concepto de la linea en la que estoy buscando coincide con alguno de los conceptos de la factura actual.
-                if not line.apply_wh: # Se verifica si a la linea no se le ha aplicado retencion, de ser asi se almacena el id de la linea y la base.
-                    dict[line.concept_id.id]['lines'].append(line.id)
-                    dict[line.concept_id.id]['base']+= line.price_subtotal
-                else:  # Si ya se le aplico retencion, no se guarda el id porque no hace falta pero se indica que ya se le aplico retencion.
-                    dict[line.concept_id.id]['wh']=True
-        #~ dict[key]={'lines':[],'wh':False,'base':0.0}
-        return dict
-
-    def _get_country_fiscal(self,cr, uid, partner_id):
-        '''
-        Gets depending on the parameters the country of the seller or buyer from the fiscal address.
-        '''
-        for i in partner_id.address:
-            if i.type == 'invoice':
-                if not i.country_id:
-                    raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the partner '%s' country has not defined direction in fiscal!") % (partner_id.name))
-                    return False
-                else:
-                    return i.country_id.id
-        raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the partner '%s' has not fiscal direction set!.") % (partner_id.name))
-        return False
-
-    def _get_residence(self, cr, uid, vendor, buyer):
-        '''
-        Determines whether the buyer fiscal address is the same that the seller. with the objective of later get the associated rate.
-        Return True if is a domiciled or resident person, False if is not
-        '''
-        vendor_address = self._get_country_fiscal(cr, uid, vendor)
-        buyer_address = self._get_country_fiscal(cr, uid, buyer)
-        if vendor_address and buyer_address:
-            if vendor_address ==  buyer_address:
-                return True
-            else:
-                return False
-        return False
-
-    def _get_nature(self, cr, uid, partner_id):
-        '''
-        Gets the nature of the seller from RIF. Return True if is a natural person type, False if is a legal entity.
-        '''
-        if not partner_id.vat:
-            raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the partner '%s' has not vat associated!") % (partner_id.name))
-            return False
-        else:
-            if partner_id.vat[2:3] in 'VvEe':
-                return True
-            else:
-                return False
-
-    def _get_rate(self, cr, uid, concept_id, residence, nature,context):
-        '''
-        Gets the withholding concept rate, provided if is associated to the below specifications:
-           - the nature of the seller match with a rate
-           - the residence of the seller match with a rate
-        '''
-        ut_obj = self.pool.get('l10n.ut')
-        rate_brw_lst = self.pool.get('islr.wh.concept').browse(cr, uid, concept_id).rate_ids
-        for rate_brw in rate_brw_lst:
-            if rate_brw.nature == nature and rate_brw.residence == residence:
-                #~ (base,min,porc,sust,codigo,id_rate,name_rate)
-                rate_brw_minimum = ut_obj.compute_ut_to_money(cr, uid, rate_brw.minimum, False, context)#metodo que transforma los UVT en pesos
-                rate_brw_subtract = ut_obj.compute_ut_to_money(cr, uid, rate_brw.subtract, False, context)#metodo que transforma los UVT en pesos
-                return (rate_brw.base, rate_brw_minimum, rate_brw.wh_perc, rate_brw_subtract,rate_brw.code,rate_brw.id,rate_brw.name)
-        return ()
-    
-    def _get_rate_dict(self, cr, uid, concept_list, residence, nature,context):
-        '''
-        Returns a dictionary with the rate of each withholding concept.
-        '''
-        dictd = {}
-        cont = 0
-        for concept_id in concept_list:
-            dictd[concept_id] = self._get_rate(cr, uid, concept_id, residence, nature,context)
-            if dictd[concept_id]:
-                cont += 1
-        if not cont:
-            raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the Concept of Withholding associated with the line has not rate for the type of customer!"))
-        return dictd
-
-
-    def _pop_dict(self,cr,uid,concept_list,dict_rate,wh_dict):
-        '''
-        Method to delete all the elements where the withholding concept does not have a rate associated, in the dictionary of concept with rates and in the dictionary of invoice lines.
-        '''
-        for concept in concept_list:
-            if not dict_rate[concept]:
-                dict_rate.pop(concept)
-                wh_dict.pop(concept)
-
-    def _get_wh_calc(self,cr,uid,line,dict_rate_concept):
-        base = self.pool.get('account.invoice.line').browse(cr,uid,line).price_subtotal
-        return (base * (dict_rate_concept[0]/100) * (dict_rate_concept[2]/100), base)
-
-    def _get_number(self,cr,uid,number,long):
-        num1 = number[::-1]
-        result= ''
-        for i in num1:
-            if i.isdigit():
-                if len(result)<long:
-                    result = i + result
-                else:
-                    break
-            else:
-                break
-        return result.strip()
-
-
-    def _get_inv_data(self,cr, uid, line):
-        '''
-        Gets the RIF of the supplier, the invoice number and the control number of the invoice. Data required for XML, among others.
-        '''
-        inv_brw = self.pool.get('account.invoice.line').browse(cr, uid, line).invoice_id
-        vat = inv_brw.partner_id.vat[2:]
-        if inv_brw.type == 'in_invoice' or inv_brw.type == 'in_refund':
-            #~ number = inv_brw.reference.strip() 
-            if not inv_brw.reference:
-                raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income,because the invoice number: '%s' has not number reference free!") % (inv_brw.number))
-                number = 0
-            else:
-                number = self._get_number(cr,uid,inv_brw.reference.strip(),10)
-        else:
-            if not inv_brw.number:
-                number = 0
-            else:
-                number = self._get_number(cr,uid,inv_brw.number.strip(),10)
-        if not inv_brw.nro_ctrl:
-            raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the invoice number: '%s' has not control number associated!") % (inv_brw.number))
-        else:
-            control = self._get_number(cr,uid,inv_brw.nro_ctrl.strip(),8)
-
-        return (vat, number, control)
-
-    def _write_wh_apply(self,cr, uid,line,dict,apply,type):
-        '''
-        If wh_xml_id field in the invoice line has an associated xml id:
-            Write over the boolean field in the invoice line True o False depending on whether it holds withholding or not.
-            Write over the xml line the value of the withholding. This happens because it could be created the xml line with a 0.0 withholding (doesnt apply at that time) but if the amount of the withholding exceeds in another invoice, will be override the value with the new withholding amount.
-        Otherwise:
-            Create a new xml line.
-            Write True or False value on the invoice line, and assigns the xml id created in the previuos step.
-        '''
-        il_ids = self.pool.get('account.invoice.line').browse(cr, uid,line)
-
-        if il_ids.wh_xml_id:
-            self.pool.get('account.invoice.line').write(cr, uid, line, {'apply_wh': apply})
-            self.pool.get('islr.xml.wh.line').write(cr,uid,il_ids.wh_xml_id.id,{'wh':dict['wh']})
-        else:
-            if type in ('out_invoice', 'out_refund'):
-                self.pool.get('account.invoice.line').write(cr, uid, line, {'apply_wh': apply})
-            else:
-                self.pool.get('account.invoice.line').write(cr, uid, line, {'apply_wh': apply,'wh_xml_id':self._create_islr_xml_wh_line(cr, uid,line,dict)})
-                message = _("Withholding income xml line generated.")
-                self.log(cr, uid, line, message)
-                
-    def _create_islr_xml_wh_line(self,cr, uid, line, dict):
-        '''
-        Create a new xml line
-        '''
-        inv_id = self.pool.get('account.invoice.line').browse(cr, uid,line).invoice_id
-        return self.pool.get('islr.xml.wh.line').create(cr, uid, {'name': dict['name_rate'],
-        'concept_id': dict['concept'], 
-        'period_id':  inv_id.period_id.id,
-        'partner_vat':dict['vat'],
-        'invoice_number': dict['number'],
-        'control_number': dict['control'],
-        'concept_code':dict['code'],
-        'base': dict['subtotal'],
-        'porcent_rete':dict['perc'],
-        'wh':dict['wh'],
-        'rate_id': dict['rate_id'],
-        'account_invoice_line_id': line,
-        'account_invoice_id': inv_id.id,
-        'partner_id': inv_id.partner_id.id,
-        })
-
-    def _get_wh(self,cr, uid, subtract,concept, wh_dict, dict_rate, apply,context=None):
-        '''
-        Returns a dictionary containing all the values ​​of the retention of an invoice line.
-        '''
-        if context is None:
-            context={}
-        res= {}
-        inv_obj= self.pool.get('account.invoice')
-        if apply: # Si se va a aplicar retencion.
-            for line in wh_dict[concept]['lines']:
-                wh_calc, subtotal = self._get_wh_calc(cr,uid,line,dict_rate[concept]) # Obtengo el monto de retencion y el monto base sobre el cual se retiene
-                if subtract >= wh_calc:
-                    wh = 0.0
-                    subtract -= wh_calc
-                else:
-                    wh = wh_calc - subtract
-                    subtract_write= subtract
-                    subtract=0.0
-                inv_id = self.pool.get('account.invoice.line').browse(cr, uid,line).invoice_id.id
-                type = inv_obj.browse(cr,uid,inv_id).type
-                res[line]={ 'vat': self._get_inv_data(cr, uid, line)[0],
-                            'number': self._get_inv_data(cr, uid, line)[1],
-                            'control': self._get_inv_data(cr, uid, line)[2],
-                            'concept': concept, 
-                            'code':dict_rate[concept][4],
-                            'subtotal': subtotal, 
-                            'perc':dict_rate[concept][2],
-                            'wh':wh,
-                            'apply':apply,
-                            'rate_id':dict_rate[concept][5],
-                            'name_rate': dict_rate[concept][6]}
-                if not context.get('test_from_wkf',False):
-                    self._write_wh_apply(cr,uid,line,res[line],apply,type)
-                    inv_obj.write(cr, uid, inv_id, {'status': 'pro'})
-        else: # Si no aplica retencion
-            for line in wh_dict[concept]['lines']:
-                subtotal = self._get_wh_calc(cr,uid,line,dict_rate[concept])[1]
-                inv_id = self.pool.get('account.invoice.line').browse(cr, uid,line).invoice_id.id
-                type = inv_obj.browse(cr,uid,inv_id).type
-                res[line]={ 'vat': self._get_inv_data(cr, uid, line)[0],
-                            'number': self._get_inv_data(cr, uid, line)[1],
-                            'control': self._get_inv_data(cr, uid, line)[2],
-                            'concept': concept, 
-                            'code':dict_rate[concept][4],
-                            'subtotal': subtotal, 
-                            'perc':dict_rate[concept][2],
-                            'wh':0.0,
-                            'apply':apply,
-                            'rate_id':dict_rate[concept][5],
-                            'name_rate': dict_rate[concept][6]}
-                if not context.get('test_from_wkf',False):
-                    self._write_wh_apply(cr,uid,line,res[line],apply,type)
-                    inv_obj.write(cr, uid, inv_id, {'status': 'pro'})
-        return res
-
-
-    def _get_wh_apply(self,cr,uid,dict_rate,wh_dict,nature,context=None):
-        '''
-        Returns a dictionary containing all data for the withholding. Each item is an invoice line.
-        '''
-        if context is None:
-            context={}
-        res = {}
-        for concept in wh_dict:
-            if not wh_dict[concept]['wh']:  #Si nunca se ha aplicado retencion con este concepto.
-                if wh_dict[concept]['base'] >= dict_rate[concept][1]: # Si el monto base que suman todas las lineas de la factura es mayor o igual al monto minimo de la tasa.
-                    subtract = dict_rate[concept][3]  # Obtengo el sustraendo a aplicar. Existe sustraendo porque es la primera vez.
-                    res.update(self._get_wh(cr, uid, subtract,concept, wh_dict, dict_rate, True,context=context))# El True sirve para asignar al campo booleano de la linea de la factura True, para asi marcar de una vez que ya fue retenida, para una posterior busqueda.
-                else: # Si el monto base no supera el monto minimo de la tasa(de igual forma se deb declarar asi no supere.)
-                    subtract = 0.0
-                    res.update(self._get_wh(cr, uid, subtract,concept, wh_dict, dict_rate, False,context=context))
-            else: #Si ya se aplico alguna vez la retencion, se aplica rete de una vez, sobre la base sin chequear monto minimo.(Dentro de este periodo)
-                if nature:
-                    subtract = dict_rate[concept][3]
-                    res.update(self._get_wh(cr, uid, subtract,concept, wh_dict, dict_rate, True,context=context))
-                else:
-                    subtract = 0.0
-                    res.update(self._get_wh(cr, uid, subtract,concept, wh_dict, dict_rate, True,context=context))# El True sirve para indicar que la linea si se va a retener.
-        return res
-
-
-    def _get_amount(self,cr,uid,dict):
-        '''
-        Get the sum of the withholding amount by concept.
-        '''
-        dict_concept = {}
-        for key in dict:
-            x = dict[key]['concept']
-            y = dict[key]['wh']
-            if not dict_concept.get(x,False):
-                dict_concept[x] = y
-            else:
-                dict_concept[x]+= y
-        return dict_concept
-
-
-    def _get_dict_concepts(self,cr,uid,dict):
-        '''
-        Get a dictionary grouped by concept:  
-        {1:[{64: {'control': '', 'perc': 0.050000000000000003, 'concept': 1, 'number': False, 'wh': 0.0, 'code': u'A', 'rate_id': 1, 'apply': True, 'subtotal': 500.0, 'vat': u'J123456789'}}, 
-            {65: {'control': '', 'perc': 0.050000000000000003, 'concept': 1, 'number': False, 'wh': 0.0, 'code': u'A', 'rate_id': 1, 'apply': True, 'subtotal': 300.0, 'vat': u'J123456789'}}
-           ], 
-         2:[{63: {'control': '', 'perc': 0.029999999999999999, 'concept': 2, 'number': False, 'wh': 0.0, 'code': u'002', 'rate_id': 2, 'apply': True, 'subtotal': 1000.0, 'vat': u'J123456789'}}
-            ]}
-        '''
-        dict_concepts = {}
-        for key in dict:
-            x = dict[key]['concept']
-            y = dict[key]
-            if not dict_concepts.get(x,False):
-                if dict[key]['apply']:
-                    dict_concepts[x]=[]
-                    dict_concepts[x].append({key:y})
-            else:
-                if dict[key]['apply']:
-                    dict_concepts[x].append({key:y})
-        return dict_concepts
-
-
-    def get_journal(self,cr,uid,inv_brw):
-        '''
-        Assign the corresponding journal according to each type of withholding (purchase, sale). The journal types are created in retencion_iva
-        '''
-        tipo='Sale'
-        tipo2='islr_sale'
-        journal_id = None
-        journal_obj = self.pool.get('account.journal')
-        if inv_brw.type == 'out_invoice' or inv_brw.type =='out_refund':
-            journal_id = journal_obj.search(cr, uid, [('type', '=', 'islr_sale')], limit=1)
-        else:
-            journal_id = journal_obj.search(cr, uid, [('type', '=', 'islr_purchase')], limit=1)
-            tipo = 'Purchase'
-            tipo2 = 'islr_purchase'
-        if not journal_id:
-            raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the journal of withholding income for the '%s' has not been created with the type '%s'") % (tipo,tipo2))
-        
-        return journal_id[0] or None
-
-    def button_confirm(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state': 'confirmed'})
-
-    def _create_islr_wh_doc(self,cr,uid,inv_brw,dict):
-        '''
-        To create in the islr_wh_doc model
-        '''
-        islr_wh_doc_id=0 
-        wh_doc_obj = self.pool.get('islr.wh.doc')
-        inv_obj =self.pool.get('account.invoice.line')
-        inv_brw = inv_brw.invoice_id
-        inv_brw2 = inv_obj.browse(cr,uid,dict.keys())
-        islr_wh_doc_id = wh_doc_obj.create(cr,uid,
-        {'name': wh_doc_obj.retencion_seq_get(cr, uid),
-        'partner_id': inv_brw.partner_id.id,
-        'invoice_id': inv_brw.id,
-        'period_id': inv_brw.period_id.id,
-        'account_id': inv_brw.account_id.id,
-        'type': inv_brw.type,
-        'journal_id': self.get_journal(cr,uid,inv_brw),
-        'islr_wh_doc_id': [(6,0,[i.invoice_id.id for i in inv_brw2])]
-        })
-        
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'islr.wh.doc', islr_wh_doc_id, 'button_confirm', cr)
-#        wf_service.trg_write(uid, 'islr.wh.doc', islr_wh_doc_id, cr)
-        return islr_wh_doc_id
-
-
-    def _create_doc_line(self,cr,uid, inv_brw,key2,islr_wh_doc_id,dictt,dictc):
-        '''
-        To create in the islr_wh_doc_line model
-        '''
-        doc_line_obj = self.pool.get('islr.wh.doc.line')
-        rate_obj = self.pool.get('islr.rates')
-        dict_concept = self._get_amount(cr,uid,dictt)
-        inv_line_id = dictc[key2][0].keys()[0]
-        rate_id = dictc[key2][0][inv_line_id]['rate_id']
-
-        islr_wh_doc_line_id = doc_line_obj.create(cr,uid,
-        {'islr_wh_doc_id':islr_wh_doc_id,
-        'concept_id':key2,
-        'islr_rates_id':rate_id,
-        'invoice_id': inv_brw.invoice_id.id,
-        'retencion_islr': rate_obj.browse(cr,uid,rate_id).wh_perc,
-        'amount':dict_concept[key2],})
-
-        return islr_wh_doc_line_id
-
-    def _create_doc_invoices(self,cr,uid,key,islr_wh_doc_id):
-        '''
-        To create in the islr_wh_doc_invoices model
-        '''
-        doc_inv_obj = self.pool.get('islr.wh.doc.invoices')
-        inv_id = key
-        islr_wh_doc_invoices_id = doc_inv_obj.create(cr,uid,{'invoice_id':inv_id,'islr_wh_doc_id':islr_wh_doc_id})
-
-
-    def _write_wh_xml(self,cr,uid,key,islr_wh_doc_line_id):
-        '''
-        Write in the xml_wh_line model
-        '''
-        inv_obj =self.pool.get('account.invoice.line')
-        xml_obj = self.pool.get('islr.xml.wh.line')
-        xml_id = inv_obj.browse(cr,uid,key).wh_xml_id.id
-        xml_obj.write(cr, uid, xml_id, {'islr_wh_doc_line_id':islr_wh_doc_line_id})
-
-
-    def _get_inv_id(self,cr,uid,dict):
-        '''
-        Get the invoice obj_browse
-        '''
-        inv_obj =self.pool.get('account.invoice.line')
-        line_ids = [key for key in dict if dict[key]['apply']]
-        line_ids.sort()
-        return line_ids and inv_obj.browse(cr,uid,line_ids[-1]) or False
-
-
-    def _logic_create(self,cr,uid,dict,wh_doc_id):
-        '''
-        Handling of all the logic for generating lines on models.
-        '''
-        dictc = self._get_dict_concepts(cr,uid,dict)
-        inv_brw = self._get_inv_id(cr,uid,dict)
-        inv_obj =self.pool.get('account.invoice.line')
-        islr_wh_doc_id=None
-
-        if inv_brw:
-            if dictc and not wh_doc_id:
-                islr_wh_doc_id = self._create_islr_wh_doc(cr,uid,inv_brw,dict)
-            else:
-                islr_wh_doc_id = wh_doc_id
-            key_lst = []
-            if islr_wh_doc_id:
-                for key2 in dictc:
-                    inv_line_id = dictc[key2][0].keys()[0]
-                    islr_wh_doc_line_id = self._create_doc_line(cr,uid,inv_brw,key2,islr_wh_doc_id,dict,dictc)
-                    for line in dictc[key2]:
-                        inv_line_id2 = dictc[key2][0].keys()[0]
-                        for key in line:
-                            key_lst.append(inv_obj.browse(cr,uid,key).invoice_id.id)
-                            if not wh_doc_id:
-                                self._write_wh_xml(cr,uid,key,islr_wh_doc_line_id)
-                for key in set(key_lst):
-                    self._create_doc_invoices(cr,uid,key,islr_wh_doc_id)
-                        
-                self.pool.get('account.invoice').write(cr,uid,inv_brw.invoice_id.id,{'islr_wh_doc_id':islr_wh_doc_id})
-                
-                message = _("Withholding income voucher '%s' generated.") % self.pool.get('islr.wh.doc').browse(cr,uid,islr_wh_doc_id).name
-                self.log(cr, uid, islr_wh_doc_id, message)
-            else:
-                pass
-        else:
-            pass
-        return islr_wh_doc_id
-
-    def action_ret_islr(self, cr, uid, ids, context={}):
-        return self.pool.get('islr.wh.doc').action_ret_islr(cr,uid,ids,context)
-
-    def _check_wh_islr(self, cr, uid, ids, context=None):
-        if context is None:
-            context={}
-        
-        wh_apply=[]
-        # The two function being called below should undergo overhauling
-        # right now it takes an object as and argument instead of an integer
-        invoice = self.browse(cr, uid, ids[0], context=context)
-        vendor, buyer, wh = self._get_partners(cr, uid, invoice)
-        concept_list = self._get_concepts(cr, uid, invoice)
-        wh_apply.append(wh)
-        wh_apply.append(concept_list)
-        
-        return invoice, vendor, buyer, concept_list, all(wh_apply)
-
-    def _check_do_wh(self, cr, uid, ids, invoice, vendor, buyer, concept_list, context=None):
-        if context is None:
-            context={}
-        wh_dict = self._get_service_wh(cr, uid, invoice, concept_list)
-        residence = self._get_residence(cr, uid, vendor, buyer)
-        nature = self._get_nature(cr, uid, vendor)
-        dict_rate = self._get_rate_dict(cr, uid, concept_list, residence, nature,context=context)
-        self._pop_dict(cr,uid,concept_list,dict_rate,wh_dict)
-        dict_completo = self._get_wh_apply(cr,uid,dict_rate,wh_dict,nature,context=context)
-        inv_brw = self._get_inv_id(cr,uid,dict_completo)
-        
-        return bool(inv_brw)
-        
-    def check_wh_islr_apply(self, cr, uid, ids, context=None):
-        '''
-        This Method test if given certain conditions it is
-        possible to create a new withholding document
-        '''
-        #TODO: Este metodo deberia devolver true ya que es un metodo "check"
-        if context is None:
-            context={}
-        
-        invoice, vendor, buyer, concept_list, wh_apply = self._check_wh_islr(cr, uid, ids, context=context)
-        
-        do_wh = False
-        if wh_apply:
-            context.update({'test_from_wkf':True})
-            do_wh = self._check_do_wh(cr, uid, ids, invoice, vendor, buyer, concept_list, context=context)
-            
-        return all([wh_apply,do_wh])
-
-    def check_wh_islr_xml(self, cr, uid, ids, context=None):
-        '''
-        This Method test if given certain conditions it is
-        __not__ possible to create a new withholding document
-        but the xml elements needed to create a legal report
-        '''
-        if context is None:
-            context={}
-        
-        invoice, vendor, buyer, concept_list, wh_apply = self._check_wh_islr(cr, uid, ids, context=context)
-        
-        do_wh = True
-        if wh_apply:
-            context.update({'test_from_wkf':True})
-            do_wh = self._check_do_wh(cr, uid, ids, invoice, vendor, buyer, concept_list, context=context)
-            
-        return all([wh_apply,not do_wh])
-
-    def action_islr_xml(self, cr, uid, ids, context=None):
-        '''
-        This Method creates the xml elements needed to provide a legal report
-        '''
-        if context is None:
-            context={}
-        
-        invoice, vendor, buyer, concept_list, wh_apply = self._check_wh_islr(cr, uid, ids, context=context)
-        
-        if wh_apply:
-            self._check_do_wh(cr, uid, ids, invoice, vendor, buyer, concept_list, context=context)
-            
-        return True
-
-    def check_invoice_type(self, cr, uid, ids, context=None):
-        '''
-        This method test the invoice types to create a new withholding document
-        '''
-        #TODO: change on workflow
-        if context is None:
-            context={}
-        obj = self.browse(cr, uid, ids[0],context=context)
-        if obj.type in ('in_invoice', 'in_refund'):
-            return True 
-        return False
-
     def validate_wh_income_done(self, cr, uid, ids, context=None):
         """
         Method that check if wh income is validated in invoice refund.
@@ -710,12 +214,3 @@
         return True
 
 account_invoice()
-
-
-
-
-
-
-
-
-
 
=== modified file 'l10n_ve_withholding_islr/model/islr_wh_concept.py'
--- l10n_ve_withholding_islr/model/islr_wh_concept.py	2012-12-09 23:55:45 +0000
+++ l10n_ve_withholding_islr/model/islr_wh_concept.py	2013-01-14 19:15:27 +0000
@@ -38,7 +38,7 @@
     Model to create the withholding concepts
     '''
     _name='islr.wh.concept'
-    _description = 'Withholding Income Concept'
+    _description = 'Income Withholding Concept'
 
     _columns={
         'name':fields.char('Withholding Concept', translate=True,size=256,required=True,help="Name of Withholding Concept,  Example: Honorarios Profesionales, Comisiones a..."),
 
=== modified file 'l10n_ve_withholding_islr/model/islr_wh_doc.py'
--- l10n_ve_withholding_islr/model/islr_wh_doc.py	2012-12-09 23:55:45 +0000
+++ l10n_ve_withholding_islr/model/islr_wh_doc.py	2013-01-14 19:15:27 +0000
@@ -41,13 +41,14 @@
         type = context.get('type', 'in_invoice')
         return type
 
-    def _get_journal(self, cr, uid, context):
+    def _get_journal(self, cr, uid, context=None):
         if context is None:
             context = {}
-        type_inv = context.get('type')
-        type2journal = {'out_invoice': 'retislrSale', 'in_invoice': 'retislrPurchase', 'out_refund': 'retislrSale', 'in_refund': 'retislrPurchase'}
         journal_obj = self.pool.get('account.journal')
-        res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'retislrPurchase'))], limit=1)
+        if context.get('type') in ('out_invoice', 'out_refund'):
+            res = journal_obj.search(cr, uid, [('type', '=', 'islr_sale')], limit=1)
+        else:
+            res = journal_obj.search(cr, uid, [('type', '=', 'islr_purchase')], limit=1)
         if res:
             return res[0]
         else:
@@ -68,18 +69,6 @@
                 res[rete.id] += line.amount
         return res
 
-    def _get_period(self,cr,uid,ids,name,args,context={}):
-        res = {}
-        wh_doc_brw = self.browse(cr,uid,ids, context=None)
-        for doc in wh_doc_brw:
-            res[doc.id] = False
-            if doc.date_ret:
-                period_ids = self.pool.get('account.period').search(cr,uid,[('date_start','<=',doc.date_ret or time.strftime('%Y-%m-%d')),('date_stop','>=',doc.date_ret or time.strftime('%Y-%m-%d'))])
-                if len(period_ids):
-                    period_id = period_ids[0]
-                res[doc.id] = period_id
-        return res
-
     def filter_lines_invoice(self,cr,uid,partner_id,context):
         inv_obj = self.pool.get('account.invoice')
         invoice_obj = self.pool.get('islr.wh.doc.invoices')
@@ -95,7 +84,7 @@
         return inv_ids
     
     _name = "islr.wh.doc"
-    _description = 'Document Withholding Income'
+    _description = 'Document Income Withholding'
     _columns= {
         'name': fields.char('Description', size=64,readonly=True, states={'draft':[('readonly',False)]}, required=True, help="Voucher description"),
         'code': fields.char('Code', size=32, readonly=True, states={'draft':[('readonly',False)]}, help="Voucher reference"),
@@ -116,14 +105,14 @@
             ],'State', readonly=True, help="Voucher state"),
         'date_ret': fields.date('Accounting Date', help="Keep empty to use the current date"),
         'date_uid': fields.date('Withhold Date', readonly=True, states={'draft':[('readonly',False)]}, help="Voucher date"),
-        'period_id': fields.function(_get_period, method=True, required=False, type='many2one',relation='account.period', string='Period', help="Period when the accounts entries were done"),
+        'period_id': fields.many2one('account.period', 'Period', help="Period when the accounts entries were done"),
         'account_id': fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Account Receivable or Account Payable of partner"),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, required=True, states={'draft':[('readonly',False)]}, help="Partner object of withholding"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Currency in which the transaction takes place"),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True,readonly=True, states={'draft':[('readonly',False)]}, help="Journal where accounting entries are recorded"),
         'company_id': fields.many2one('res.company', 'Company', required=True, help="Company"),
         'amount_total_ret':fields.function(_get_amount_total,method=True, string='Amount Total', type='float', digits_compute= dp.get_precision('Withhold ISLR'),  help="Total Withheld amount"),
-        'concept_ids': fields.one2many('islr.wh.doc.line','islr_wh_doc_id','Withholding Income Concept', readonly=True, states={'draft':[('readonly',False)]}),
+        'concept_ids': fields.one2many('islr.wh.doc.line','islr_wh_doc_id','Income Withholding Concept', readonly=True, states={'draft':[('readonly',False)]}),
         'invoice_ids':fields.one2many('islr.wh.doc.invoices','islr_wh_doc_id','Withheld Invoices'),
         'invoice_id':fields.many2one('account.invoice','Invoice',readonly=False,help="Invoice to make the accounting entry"),
         'islr_wh_doc_id': fields.one2many('account.invoice','islr_wh_doc_id','Invoices',states={'draft':[('readonly',False)]}),
@@ -142,22 +131,39 @@
         'user_id': lambda s, cr, u, c: u,
     }
 
+    def check_income_wh(self, cr, uid, ids, context=None):
+        context = context or {}      
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        obj = self.browse(cr, uid, ids[0],context=context)
+        res = {}
+        for wh_line in obj.invoice_ids:
+            if not wh_line.islr_xml_id:
+                res[wh_line.id] = (wh_line.invoice_id.name, 
+                    wh_line.invoice_id.number, wh_line.invoice_id.reference)
+        if res:
+            note = _('The Following Invoices Have not yet been withheld:\n\n')
+            for i in res:
+                note += '* %s, %s, %s\n'%res[i]
+            note += _('\nPlease, Load the Taxes to be withheld and Try Again')
+            raise osv.except_osv(_('Invoices with Missing Withheld Taxes!'),note)
+        return True
+
+    def compute_amount_wh(self, cr, uid, ids, context=None):
+        context = context or {}      
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        iwdi_obj = self.pool.get('islr.wh.doc.invoices')
+        iwd_brw = self.browse(cr, uid, ids[0], context=context)
+        for iwdi_brw in iwd_brw.invoice_ids:
+            iwdi_obj.load_taxes(cr, uid, iwdi_brw.id, context=context)    
+        return True
     def validate(self, cr,uid,ids,*args):
 
         if args[0]in ['in_invoice','in_refund'] and args[1] and args[2]:
             return True
 
-    def action_process(self,cr,uid,ids, *args):
-        inv_obj=self.pool.get('account.invoice')
-        context = {}
-        wh_doc_brw = self.browse(cr, uid, ids, context=None)
-        inv_ids = []
-        
-        for wh_doc in wh_doc_brw:
-            for wh_doc_line in wh_doc.islr_wh_doc_id: 
-                inv_ids.append(wh_doc_line.id)
-        context["wh_doc_id"]=ids[0]
-        inv_obj.action_ret_islr(cr, uid, inv_ids,context)
+    def action_process(self,cr,uid,ids, context=None):
+        # TODO: ERASE THE REGARDING NODE IN THE WORKFLOW
+        # METHOD HAVE BEEN LEFT FOR BACKWARD COMPATIBILITY
         return True
 
     def action_cancel_process(self,cr,uid,ids,context=None):
@@ -226,9 +232,10 @@
         vals['code'] = code
         return super(islr_wh_doc, self).create(cr, uid, vals, context)
 
-    def action_confirm1(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state':'confirmed'})
-
+    def action_confirm(self, cr, uid, ids, context=None):
+        context = context or {}      
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        return self.write(cr, uid, ids[0], {'state':'confirmed'})
 
     def action_number(self, cr, uid, ids, *args):
         obj_ret = self.browse(cr, uid, ids)[0]
@@ -243,21 +250,12 @@
                     'WHERE id=%s', (number, id))
         return True
 
-    def action_done1(self, cr, uid, ids, context={}):
-        self.action_number(cr, uid, ids)
-        self.action_move_create(cr, uid, ids)
-        self.write(cr, uid, ids, {'state':'done'})
-        return True
-
     def action_cancel(self,cr,uid,ids,context={}):
         #~ if self.browse(cr,uid,ids)[0].type=='in_invoice':
             #~ return True
         self.cancel_move(cr,uid,ids)
         self.action_cancel_process(cr,uid,ids,context=context)
         return True
-        
-    
-
 
     def cancel_move (self,cr,uid,ids, *args):
         context={}
@@ -279,72 +277,69 @@
         self.write(cr, uid, ids, {'state':'draft'})
         return True
 
-    def action_move_create(self, cr, uid, ids, *args):
+    def action_move_create(self, cr, uid, ids, context=None):
         wh_doc_obj = self.pool.get('islr.wh.doc.line')
-        context = {}
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
         inv_id = None
         doc_brw = None
-        
-        for ret in self.browse(cr, uid, ids):
-            if not ret.date_uid:
-                self.write(cr, uid, [ret.id], {'date_uid':time.strftime('%Y-%m-%d')})
-
-            if not ret.date_ret:
-                self.write(cr, uid, [ret.id], {'date_ret':time.strftime('%Y-%m-%d')})
-            
-            period_id = ret.period_id and ret.period_id.id or False
-            journal_id = ret.journal_id.id
-            
-            if not period_id:
-                period_ids = self.pool.get('account.period').search(cr,uid,[('date_start','<=',ret.date_ret or time.strftime('%Y-%m-%d')),('date_stop','>=',ret.date_ret or time.strftime('%Y-%m-%d'))])
-                if len(period_ids):
-                    period_id = period_ids[0]
-                else:
-                    raise osv.except_osv(_('Warning !'), _("Not found a fiscal period to date: '%s' please check!") % (ret.date_ret or time.strftime('%Y-%m-%d')))
-
-            if ret.concept_ids:
-                for line in ret.concept_ids:
-                    if ret.type in ('in_invoice', 'in_refund'):
-                        if line.concept_id.property_retencion_islr_payable:
-                            acc_id = line.concept_id.property_retencion_islr_payable.id
-                            inv_id = ret.invoice_id.id
-                        else:
-                            raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the account for withholding of sale is not assigned to the Concept withholding '%s'!")% (line.concept_id.name))
-                    else:
-                        if  line.concept_id.property_retencion_islr_receivable:
-                            acc_id = line.concept_id.property_retencion_islr_receivable.id
-                            inv_id = line.invoice_id.id
-                        else:
-                            raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the account for withholding of purchase is not assigned to the Concept withholding '%s'!") % (line.concept_id.name))
-
-                    writeoff_account_id = False
-                    writeoff_journal_id = False
-                    amount = line.amount
-
-                    ret_move = self.wh_and_reconcile(cr, uid, [ret.id], inv_id,
-                            amount, acc_id, period_id, journal_id, writeoff_account_id,
-                            period_id, writeoff_journal_id, context)
-
-                    # make the retencion line point to that move
-                    rl = {
-                        'move_id': ret_move['move_id'],
-                    }
-                    #lines = [(op,id,values)] escribir en un one2many
-                    lines = [(1, line.id, rl)]
-                    self.write(cr, uid, [ret.id], {'concept_ids':lines})
-                  
-                    if lines:
-                        message = _("Withholding income voucher '%s' validated and accounting entry generated.") % self.browse(cr, uid, ids[0]).name
-                        self.log(cr, uid, ids[0], message) 
-                  
-                    for line in ret.concept_ids:
-                        for xml in line.xml_ids:
-                            if xml.islr_xml_wh_doc.state!='done':
-                                if xml.period_id.id != period_id:
-                                    self.pool.get('islr.xml.wh.line').write(cr,uid,xml.id,{'period_id':period_id, 'islr_xml_wh_doc':None})
-                            else:
-                                raise osv.except_osv(_('Invalid action !'),_("Impossible change the period accountig to a withholding that has already been declared."))
-#                    inv_obj.write(cr, uid, line.invoice_id.id, {'retention':True}, context=context)
+        ixwl_obj = self.pool.get('islr.xml.wh.line')
+        ret = self.browse(cr, uid, ids[0], context=context)
+        if not ret.date_uid:
+            self.write(cr, uid, [ret.id], {'date_uid':time.strftime('%Y-%m-%d')})
+
+        if not ret.date_ret:
+            self.write(cr, uid, [ret.id], {'date_ret':time.strftime('%Y-%m-%d')})
+        
+        period_id = ret.period_id and ret.period_id.id or False
+        journal_id = ret.journal_id.id
+        
+        if not period_id:
+            period_ids = self.pool.get('account.period').search(cr,uid,[('date_start','<=',ret.date_ret or time.strftime('%Y-%m-%d')),('date_stop','>=',ret.date_ret or time.strftime('%Y-%m-%d'))])
+            if len(period_ids):
+                period_id = period_ids[0]
+            else:
+                raise osv.except_osv(_('Warning !'), _("Not found a fiscal period to date: '%s' please check!") % (ret.date_ret or time.strftime('%Y-%m-%d')))
+
+        for line in ret.concept_ids:
+            if ret.type in ('in_invoice', 'in_refund'):
+                if line.concept_id.property_retencion_islr_payable:
+                    acc_id = line.concept_id.property_retencion_islr_payable.id
+                    inv_id = line.invoice_id.id
+                else:
+                    raise osv.except_osv(_('Invalid action !'),_("Impossible income withholding, because the account for withholding of sale is not assigned to the Concept withholding '%s'!")% (line.concept_id.name))
+            else:
+                if  line.concept_id.property_retencion_islr_receivable:
+                    acc_id = line.concept_id.property_retencion_islr_receivable.id
+                    inv_id = line.invoice_id.id
+                else:
+                    raise osv.except_osv(_('Invalid action !'),_("Impossible income withholding, because the account for withholding of purchase is not assigned to the Concept withholding '%s'!") % (line.concept_id.name))
+
+            writeoff_account_id = False
+            writeoff_journal_id = False
+            amount = line.amount
+
+            ret_move = self.wh_and_reconcile(cr, uid, [ret.id], inv_id,
+                    amount, acc_id, period_id, journal_id, writeoff_account_id,
+                    period_id, writeoff_journal_id, context)
+
+            # make the retencion line point to that move
+            rl = {
+                'move_id': ret_move['move_id'],
+            }
+            #lines = [(op,id,values)] escribir en un one2many
+            lines = [(1, line.id, rl)]
+            self.write(cr, uid, [ret.id], {'concept_ids':lines})
+          
+            if lines:
+                message = _("Income withholding voucher '%s' validated and accounting entry generated.") % self.browse(cr, uid, ids[0]).name
+                self.log(cr, uid, ids[0], message) 
+        
+        xml_ids = []  
+        for line in ret.concept_ids:
+            xml_ids += [xml.id for xml in line.xml_ids]
+        ixwl_obj.write(cr,uid,xml_ids,{'period_id':period_id},context=context)
+        self.write(cr,uid,ids,{'period_id':period_id},context=context)
         return True
 
 
@@ -415,46 +410,13 @@
         self.pool.get('account.invoice').write(cr, uid, invoice_id, {}, context=context)
         return {'move_id': move_id}
 
-
-    def action_ret_islr(self, cr, uid, ids, context={}):
-        #TODO: :
-        inv_obj = self.pool.get('account.invoice')
-        invoices_brw = inv_obj.browse(cr, uid, ids, context)
-        wh_doc_list = []
-        for invoice in invoices_brw:
-            wh_doc_list = inv_obj.pool.get('islr.wh.doc.invoices').search(cr,uid,[('invoice_id','=',invoice.id)])  
-            if wh_doc_list: #Chequear que la factura no haya sido retenida.
-                raise osv.except_osv(_('Invalid action !'),_("The Withholding invoice '%s' has already been done!") % (invoice.number))
-            else: # 1.- Si la factura no ha sido retenida
-                wh_dict={}
-                dict_rate={}
-                dict_completo={}
-                vendor, buyer, apply_wh = inv_obj._get_partners(cr,uid,invoice) # Se obtiene el (vendedor, el comprador, si el comprador es agente de retencion)
-                concept_list = inv_obj._get_concepts(cr,uid,invoice)# Se obtiene la lista de conceptos de las lineas de la factura actual.
-                if concept_list:  # 2.- Si existe algun concepto de retencion en las lineas de la factura.
-                    if apply_wh:  # 3.- Si el comprador es agente de retencion
-                        wh_dict = inv_obj._get_service_wh(cr, uid, invoice, concept_list) # Se obtiene un dic con la lista de lineas de factura, si se aplico retencion alguna vez, el monto base total de las lineas.
-                        residence = inv_obj._get_residence(cr, uid, vendor, buyer) # Retorna el tipo de residencia del vendedor
-                        nature = inv_obj._get_nature(cr, uid, vendor) # Retorna la naturaleza del vendedor.
-                        dict_rate = inv_obj._get_rate_dict(cr, uid, concept_list, residence, nature,context) # Retorna las tasas por cada concepto
-                        inv_obj._pop_dict(cr,uid,concept_list,dict_rate,wh_dict) # Borra los conceptos y las lineas de factura que no tengan tasa asociada.
-                        dict_completo = inv_obj._get_wh_apply(cr,uid,dict_rate,wh_dict,nature) # Retorna el dict con todos los datos de la retencion por linea de factura.
-                        islr_wh_doc_id=inv_obj._logic_create(cr,uid,dict_completo,context.get('wh_doc_id',False))# Se escribe y crea en todos los modelos asociados al islr.
-                    else:
-                        raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the supplier '%s' withholding agent is not!") % (buyer.name))
-                else:
-                    raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the lines of the invoice has not concept withholding!"))
-            #~ break
-        return islr_wh_doc_id
-
-
 islr_wh_doc()
 
 
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
     _columns = {
-        'islr_wh_doc_id': fields.many2one('islr.wh.doc','Withhold Document',readonly=True,help="Document Withholding Income tax generated from this bill"),
+        'islr_wh_doc_id': fields.many2one('islr.wh.doc','Withhold Document',readonly=True,help="Document Income Withholding tax generated from this bill"),
     }
     _defaults = {
         'islr_wh_doc_id': lambda *a: 0,
@@ -474,7 +436,7 @@
 class islr_wh_doc_invoices(osv.osv):
     _name = "islr.wh.doc.invoices"
     _description = 'Document and Invoice Withheld Income'
-
+    
     def _amount_all(self, cr, uid, ids, fieldname, args, context=None):
         res = {}
         for ret_line in self.browse(cr, uid, ids, context):
@@ -491,17 +453,226 @@
     _columns= {
         'islr_wh_doc_id': fields.many2one('islr.wh.doc','Withhold Document', ondelete='cascade', help="Document Retention income tax generated from this bill"),
         'invoice_id':fields.many2one('account.invoice','Invoice', help="Withheld invoice"),
-        'islr_xml_id':fields.one2many('islr.xml.wh.line','islr_wh_doc_inv_id','Withholding'),
-        'amount_islr_ret':fields.function(_amount_all, method=True, digits=(16,4), string='Wh. tax amount', multi='all', help="Withholding tax amount"),
-        'base_ret': fields.function(_amount_all, method=True, digits=(16,4), string='Wh. amount', multi='all', help="Withholding without tax amount"),
+        'islr_xml_id':fields.one2many('islr.xml.wh.line','islr_wh_doc_inv_id','Withholding Lines'),
+        'amount_islr_ret':fields.function(_amount_all, method=True, digits=(16,4), string='Withheld Amount', multi='all', help="Amount withheld from the base amount"),
+        'base_ret': fields.function(_amount_all, method=True, digits=(16,4), string='Base Amount', multi='all', help="Amount where a withholding is going to be compute from"),
     }
     _rec_rame = 'invoice_id'
+    
+    def _get_concepts(self, cr, uid, ids, context=None):
+        '''
+        Gets a list of withholdable concepts (concept_id) from the invoice lines
+        '''
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        inv_obj = self.pool.get('account.invoice')
+        concept_set = set()
+        inv_brw = inv_obj.browse(cr, uid, ids[0], context=context)
+        for ail in inv_brw.invoice_line:
+            if ail.concept_id and ail.concept_id.withholdable:
+                concept_set.add(ail.concept_id.id)
+        return list(concept_set)
+
+    def _get_wh(self, cr, uid, ids, concept_id, context=None):
+        '''
+        Returns a dictionary containing all the values ​​of the retention of an invoice line.
+        '''
+        context= context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        ixwl_obj= self.pool.get('islr.xml.wh.line')
+        iwdl_obj= self.pool.get('islr.wh.doc.line')
+        iwdl_brw = iwdl_obj.browse(cr, uid, ids[0], context=context)
+
+        vendor, buyer, wh_agent = self._get_partners(cr, uid, iwdl_brw.invoice_id)
+        apply = not vendor.islr_exempt
+        residence = self._get_residence(cr, uid, vendor, buyer)
+        nature = self._get_nature(cr, uid, vendor)
+
+        #rate_base,rate_minimum,rate_wh_perc,rate_subtract,rate_code,rate_id,rate_name 
+        rate_tuple = self._get_rate(cr, uid, concept_id, residence, nature, context=context)
+        base = 0
+        for line in iwdl_brw.xml_ids:
+            base += line.account_invoice_line_id.price_subtotal
+        apply = apply and base >= rate_tuple[0]*rate_tuple[1]/100.0
+        wh = 0.0
+        subtract = apply and rate_tuple[3] or 0.0
+        subtract_write=0.0
+        wh_concept = 0.0
+        sb_concept = subtract 
+        for line in iwdl_brw.xml_ids:
+            if apply: 
+                wh_calc = (rate_tuple[0]/100.0)*rate_tuple[2]*line.account_invoice_line_id.price_subtotal/100.0
+                if subtract >= wh_calc:
+                    wh = 0.0
+                    subtract -= wh_calc
+                else:
+                    wh = wh_calc - subtract
+                    subtract_write= subtract
+                    subtract=0.0
+            ixwl_obj.write(cr,uid,line.id,{'wh':wh, 'sustract':subtract or subtract_write},
+                    context=context)
+            wh_concept+=wh
+        iwdl_obj.write(cr, uid, ids[0],{'amount':wh_concept,
+            'subtract':sb_concept, 'base_amount': base},context=context)
+        return True 
+
+
+    def load_taxes(self, cr, uid, ids, context=None):
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        ixwl_obj = self.pool.get('islr.xml.wh.line')
+        iwdl_obj = self.pool.get('islr.wh.doc.line')
+        ret_line = self.browse(cr, uid, ids[0], context=context)
+        lines = []
+        rates = {}
+        wh_perc= {}
+        xmls = {}
+        if ret_line.invoice_id:
+            #~ Searching & Unlinking for xml lines from the current invoice
+            xml_lines = ixwl_obj.search(cr, uid, [('islr_wh_doc_inv_id', '=', ret_line.id)],context=context)
+            if xml_lines:
+                ixwl_obj.unlink(cr, uid, xml_lines)
+
+            #~ Creating xml lines from the current invoices again
+            ail_brws= [i for i in ret_line.invoice_id.invoice_line if i.concept_id and i.concept_id.withholdable]
+            for i in ail_brws:
+                values = self._get_xml_lines(cr, uid, i, context=context)
+                values.update({'islr_wh_doc_inv_id':ret_line.id,})
+                #~ Vuelve a crear las lineas
+                xml_id = ixwl_obj.create(cr, uid, values, context=context)
+                #~ Write back the new xml_id into the account_invoice_line
+                i.write({'wh_xml_id':xml_id},context=context)
+                lines.append(xml_id)
+                #~ Keeps a log of the rate & percentage for a concept
+                rates[i.concept_id.id]=values['rate_id']
+                wh_perc[i.concept_id.id]=values['porcent_rete']
+                if xmls.get(i.concept_id.id):
+                    xmls[i.concept_id.id]+=[xml_id] 
+                else:
+                    xmls[i.concept_id.id]=[xml_id]
+
+            #~ Searching & Unlinking for concept lines from the current invoice  
+            iwdl_ids  = iwdl_obj.search(cr, uid, [('invoice_id', '=', ret_line.invoice_id.id)],context=context)
+            if iwdl_ids:
+                iwdl_obj.unlink(cr, uid, iwdl_ids)
+                iwdl_ids=[]
+            #~ Creating concept lines for the current invoice
+            concept_list = self._get_concepts(cr, uid, ret_line.invoice_id.id, context=context)
+            for concept_id in concept_list:
+                iwdl_id=iwdl_obj.create(cr,uid,
+                        {'islr_wh_doc_id':ret_line.islr_wh_doc_id.id,
+                        'concept_id':concept_id,
+                        'islr_rates_id':rates[concept_id], 
+                        'invoice_id': ret_line.invoice_id.id,
+                        'retencion_islr':wh_perc[concept_id], 
+                        'xml_ids': [(6,0,xmls[concept_id])],
+                        }, context=context)
+                self._get_wh(cr, uid, iwdl_id, concept_id, context=context)
+        return True
+        
+    def _get_partners(self, cr, uid, invoice):
+        '''
+        Se obtiene: el id del vendedor, el id del comprador de la factura y el campo booleano que determina si el comprador es agente de retencion.
+        '''
+        if invoice.type == 'in_invoice' or invoice.type == 'in_refund':
+            vendor = invoice.partner_id
+            buyer = invoice.company_id.partner_id
+            ret_code = invoice
+        else:
+            buyer = invoice.partner_id
+            vendor = invoice.company_id.partner_id
+        return (vendor, buyer, buyer.islr_withholding_agent)
+        
+    def _get_residence(self, cr, uid, vendor, buyer):
+        '''
+        Se determina si la direccion fiscal del comprador es la misma que la del vendedor, con el fin de luego obtener la tasa asociada.
+        Retorna True si es una persona domiciliada o residente. Retorna False si es, no Residente o No Domicialiado.
+        '''
+        vendor_address = self._get_country_fiscal(cr, uid, vendor)
+        buyer_address = self._get_country_fiscal(cr, uid, buyer)
+        if vendor_address and buyer_address:
+            if vendor_address ==  buyer_address:
+                return True
+            else:
+                return False
+        return False
+
+    def _get_nature(self, cr, uid, partner_id):
+        '''
+        Se obtiene la naturaleza del vendedor a partir del RIF, retorna True si es persona de tipo natural, y False si es juridica.
+        '''
+        if not partner_id.vat:
+            raise osv.except_osv(_('Invalid action !'),_("Impossible income withholding, because the partner '%s' has not vat associated!") % (partner_id.name))
+            return False
+        else:
+            if partner_id.vat[2:3] in 'VvEe' or partner_id.spn:
+                return True
+            else:
+                return False
+
+    def _get_rate(self, cr, uid, concept_id, residence, nature,context):
+        '''
+        Se obtiene la tasa del concepto de retencion, siempre y cuando exista uno asociado a las especificaciones:
+            La naturaleza del vendedor coincida con una tasa.
+            La residencia del vendedor coindica con una tasa.
+        '''
+        ut_obj = self.pool.get('l10n.ut')
+        rate_brw_lst = self.pool.get('islr.wh.concept').browse(cr, uid, concept_id).rate_ids
+        for rate_brw in rate_brw_lst:
+            if rate_brw.nature == nature and rate_brw.residence == residence:
+                #~ (base,min,porc,sust,codigo,id_rate,name_rate)
+                rate_brw_minimum = ut_obj.compute_ut_to_money(cr, uid, rate_brw.minimum, False, context)#metodo que transforma los UVT en pesos
+                rate_brw_subtract = ut_obj.compute_ut_to_money(cr, uid, rate_brw.subtract, False, context)#metodo que transforma los UVT en pesos
+                return (rate_brw.base, rate_brw_minimum, rate_brw.wh_perc, rate_brw_subtract,rate_brw.code,rate_brw.id,rate_brw.name)
+        return ()
+
+    def _get_country_fiscal(self,cr, uid, partner_id,context=None):
+        '''
+        Get the country of the partner
+        '''
+        #TODO: THIS METHOD SHOULD BE IMPROVED
+        #DUE TO OPENER HAS CHANGED THE WAY PARTNER
+        #ARE USED FOR ACCOUNT_MOVE
+        context = context or {}
+        if not partner_id.country_id:
+            raise osv.except_osv(_('Invalid action !'),_("Impossible income withholding, because the partner '%s' country has not been defined in the address!") % (partner_id.name))
+        else:
+            return partner_id.country_id.id
+        
+    def _get_xml_lines(self, cr, uid, ail_brw, context=None):
+        context = context or {}
+        vendor, buyer, wh_agent = self._get_partners(cr, uid, ail_brw.invoice_id)
+        residence = self._get_residence(cr, uid, vendor, buyer)
+        nature = self._get_nature(cr, uid, vendor)
+        rate_base,rate_minimum,rate_wh_perc,rate_subtract,rate_code,rate_id,rate_name = self._get_rate(cr, uid, ail_brw.concept_id.id, residence, nature,context=context)
+        
+        wh = ((rate_base * ail_brw.price_subtotal /100) * rate_wh_perc)/100.0
+        
+        return {
+            'account_invoice_id':ail_brw.invoice_id.id,
+            'islr_wh_doc_line_id':False,
+            'islr_xml_wh_doc':False,
+            'wh':wh, # Debo buscarlo
+            'base':ail_brw.price_subtotal, # La consigo tambien pero desde el rate
+            'period_id':False, # Debemos revisar la definicion porque esta en NOT NULL
+            'invoice_number':ail_brw.invoice_id.reference,
+            'rate_id':rate_id, # La consigo tambien pero desde el rate
+            'partner_id':ail_brw.invoice_id.partner_id.id, #Warning Depende de si es cliente o proveedor
+            'concept_id':ail_brw.concept_id.id,
+            'partner_vat':vendor.vat[2:12], #Warning Depende si es cliente o proveedor
+            'porcent_rete':rate_wh_perc, # La consigo tambien pero desde el rate
+            'control_number':ail_brw.invoice_id.nro_ctrl,
+            'sustract':rate_subtract,# La consigo tambien pero desde el rate
+            'account_invoice_line_id':ail_brw.id,
+            'concept_code':rate_code,# La consigo tambien pero desde el rate
+        }
+
 islr_wh_doc_invoices()
 
 
 class islr_wh_doc_line(osv.osv):
     _name = "islr.wh.doc.line"
-    _description = 'Lines of Document Withholding Income'
+    _description = 'Lines of Document Income Withholding'
 
     def _retention_rate(self, cr, uid, ids, name, args, context=None):
         res = {}
@@ -515,10 +686,12 @@
     _columns= {
         'name': fields.char('Description', size=64, help="Description of the voucher line"),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete='set null', help="Invoice to withhold"),
-        'amount':fields.float('Amount', digits_compute= dp.get_precision('Withhold ISLR'), help="Withheld amount"),
+        'amount':fields.float('Withheld Amount', digits_compute= dp.get_precision('Withhold ISLR'), help="Withheld amount"),
+        'base_amount':fields.float('Base Amount', digits_compute= dp.get_precision('Withhold ISLR'), help="Base amount"),
+        'subtract':fields.float('Subtract', digits_compute= dp.get_precision('Withhold ISLR'), help="Subtract"),
         'islr_wh_doc_id': fields.many2one('islr.wh.doc','Withhold Document', ondelete='cascade', help="Document Retention income tax generated from this bill"),
-        'concept_id': fields.many2one('islr.wh.concept','Withhold  Concept', help="Withhold concept associated with this rate"),
-        'retencion_islr':fields.float('Percentage', digits_compute= dp.get_precision('Withhold ISLR'), help="Withholding percentage"),
+        'concept_id': fields.many2one('islr.wh.concept','Withholding Concept', help="Withholding concept associated with this rate"),
+        'retencion_islr':fields.float('Withholding Rate', digits_compute= dp.get_precision('Withhold ISLR'), help="Withholding Rate"),
         'retention_rate': fields.function(_retention_rate, method=True, string='Withholding Rate', type='float', help="Withhold rate has been applied to the invoice", digits_compute= dp.get_precision('Withhold ISLR')),
         'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, help="Accounting voucher"),
         'islr_rates_id': fields.many2one('islr.rates','Rates', help="Withhold rates"),
 
=== modified file 'l10n_ve_withholding_islr/model/islr_xml_wh.py'
--- l10n_ve_withholding_islr/model/islr_xml_wh.py	2012-12-09 23:55:45 +0000
+++ l10n_ve_withholding_islr/model/islr_xml_wh.py	2013-01-14 19:15:27 +0000
@@ -57,7 +57,7 @@
         return res
 
     _columns = {
-        'name':fields.char('Description',128, required=True, select=True, help = "Description about statement of withholding income"),
+        'name':fields.char('Description',128, required=True, select=True, help = "Description about statement of income withholding"),
         'company_id': fields.many2one('res.company', 'Company', required=True, help="Company"),
         'state': fields.selection([
             ('draft','Draft'),
@@ -66,7 +66,7 @@
             ('cancel','Cancelled')
             ],'State', readonly=True, help="Voucher state"),
         'period_id':fields.many2one('account.period','Period',required=True, help="Period when the accounts entries were done"),
-        'amount_total_ret':fields.function(_get_amount_total,method=True, digits=(16, 2), readonly=True, string='Withholding Income Amount Total', help="Amount Total of withholding"),
+        'amount_total_ret':fields.function(_get_amount_total,method=True, digits=(16, 2), readonly=True, string='Income Withholding Amount Total', help="Amount Total of withholding"),
         'amount_total_base':fields.function(_get_amount_total_base,method=True, digits=(16, 2), readonly=True, string='Without Tax Amount Total', help="Total without taxes"),
         'xml_ids':fields.one2many('islr.xml.wh.line','islr_xml_wh_doc','XML Document Lines', readonly=True ,states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
@@ -79,7 +79,7 @@
         'user_id': lambda s, cr, u, c: u,
 
         'period_id': lambda self,cr,uid,context: self.period_return(cr,uid,context),
-        'name':lambda self,cr,uid,context : 'Withholding Income '+time.strftime('%m/%Y')
+        'name':lambda self,cr,uid,context : 'Income Withholding '+time.strftime('%m/%Y')
     }
 
     def period_return(self,cr,uid,context=None):
@@ -193,17 +193,17 @@
     _description = 'Generate XML Lines'
     
     _columns = {
-        'concept_id': fields.many2one('islr.wh.concept','Withhold  Concept',help="Withhold concept associated with this rate",required=True, ondelete='cascade'),
-        'period_id':fields.many2one('account.period','Period',required=False, help="Period when the accounts entries were done"),
+        'concept_id': fields.many2one('islr.wh.concept','Withholding Concept',help="Withholding concept associated with this rate",required=True, ondelete='cascade'),
+        'period_id':fields.many2one('account.period','Period',required=False, help="Period when the journal entries were done"),
         'partner_vat': fields.char('VAT', size=10, required=True, help="Partner VAT"),
         'invoice_number': fields.char('Invoice Number',size=10,required=True, help="Number of invoice"),
         'control_number': fields.char('Control Number',size=8,required=True, help="Reference"),
         'concept_code': fields.char('Concept Code', size=10, required=True, help="Concept code"),
-        'base': fields.float('Without Tax Amount', required=True, help="Taxable", digits_compute= dp.get_precision('Withhold ISLR')),
-        'porcent_rete': fields.float('% Withhold', required=True, help="Percentage of Withhold", digits_compute= dp.get_precision('Withhold ISLR')),
+        'base': fields.float('Base Amount', required=True, help="Amount where a withholding is going to be computed from", digits_compute= dp.get_precision('Withhold ISLR')),
+        'porcent_rete': fields.float('Withholding Rate', required=True, help="Withholding Rate", digits_compute= dp.get_precision('Withhold ISLR')),
         'wh':fields.float('Withheld Amount',required=True, help="Withheld amount to partner", digits_compute= dp.get_precision('Withhold ISLR')),
         'rate_id':fields.many2one('islr.rates', 'Person Type',domain="[('concept_id','=',concept_id)]",required=True, help="Person type"),
-        'islr_wh_doc_line_id':fields.many2one('islr.wh.doc.line','Withholding Income Document', help="Withhold income document"),
+        'islr_wh_doc_line_id':fields.many2one('islr.wh.doc.line','Income Withholding Document', help="Income Withholding Document"),
         'account_invoice_line_id':fields.many2one('account.invoice.line','Invoice Line', help="Invoice line to Withhold"),
         'account_invoice_id':fields.many2one('account.invoice','Invoice', help="Invoice to Withhold"),
         'islr_xml_wh_doc': fields.many2one('islr.xml.wh.doc','ISLR XML Document', help="Income tax XML Doc"),
 
=== modified file 'l10n_ve_withholding_islr/model/partner.py'
--- l10n_ve_withholding_islr/model/partner.py	2012-12-09 23:55:45 +0000
+++ l10n_ve_withholding_islr/model/partner.py	2013-01-14 19:15:27 +0000
@@ -42,6 +42,9 @@
         'islr_exempt': fields.boolean('Is it exempt from income withholding?'),
     }
     
+    _defaults = {
+        'islr_withholding_agent': lambda *a: True,
+    }
 res_partner()
 
 
 
=== modified file 'l10n_ve_withholding_islr/model/product.py'
--- l10n_ve_withholding_islr/model/product.py	2012-12-09 23:55:45 +0000
+++ l10n_ve_withholding_islr/model/product.py	2013-01-14 19:15:27 +0000
@@ -37,7 +37,7 @@
     _inherit = "product.template"
 
     _columns = {
-        'concept_id': fields.many2one('islr.wh.concept','Withhold  Concept',help="Concept Withholding Income to apply to the service", required=False),
+        'concept_id': fields.many2one('islr.wh.concept','Withhold  Concept',help="Concept Income Withholding to apply to the service", required=False),
     }
 
 product_template()
@@ -59,7 +59,7 @@
             if concept_id:
                 concept_id = concept_obj.search(cr, uid, [('name','ilike','NO APLICA RETENCION')])[0]
             else:
-                raise osv.except_osv(_('Invalid action !'),_("Must create the concept of withholding income"))
+                raise osv.except_osv(_('Invalid action !'),_("Must create the concept of income withholding"))
                 
         return {'value' : {'concept_id':concept_id or False}} 
 
 
=== modified file 'l10n_ve_withholding_islr/report/islr_wh_report.xml'
--- l10n_ve_withholding_islr/report/islr_wh_report.xml	2012-12-19 18:17:09 +0000
+++ l10n_ve_withholding_islr/report/islr_wh_report.xml	2013-01-14 19:15:27 +0000
@@ -6,7 +6,7 @@
             model="islr.wh.doc"
             name="islr.wh.doc"
             rml="addons/l10n_ve_withholding_islr/report/wh_islr_report.rml" 
-            string="Voucher Withholding Income"
+            string="Voucher Income Withholding"
             auto="False"
             header="False"
             menu="False"
@@ -18,7 +18,7 @@
             model="islr.xml.wh.doc" 
             name="list.wh.islr" 
             rml="addons/l10n_ve_withholding_islr/report/list_wh_islr_report.rml" 
-            string="Withholding Income"
+            string="Income Withholding"
             auto = "True"
             header="False"/>
 
 
=== modified file 'l10n_ve_withholding_islr/view/installer.xml'
--- l10n_ve_withholding_islr/view/installer.xml	2012-12-12 01:44:29 +0000
+++ l10n_ve_withholding_islr/view/installer.xml	2013-01-14 19:15:27 +0000
@@ -4,18 +4,17 @@
     <record id="wh_islr_config_view" model="ir.ui.view">
         <field name="name">Configure your ISLR Withholdings</field>
         <field name="model">wh.islr.config</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
           <data>
             <form position="attributes">
-              <attribute name="string">Withholding income Configuration</attribute>
+              <attribute name="string">Income withholding Configuration</attribute>
             </form>
             
             <xpath expr='//group[@string="res_config_contents"]' position='before'>
                  <group colspan="4" col="8">
                    <group colspan="1" width="220">
-                    <label align="0.0" string="Configure your company's withholding income" width="200" colspan="2"/>
+                    <label align="0.0" string="Configure your company's income withholding" width="200" colspan="2"/>
                    </group>
                    <separator orientation="vertical" colspan="1" rowspan="15"/>
                    <group colspan="6">
 
=== modified file 'l10n_ve_withholding_islr/view/invoice_view.xml'
--- l10n_ve_withholding_islr/view/invoice_view.xml	2012-12-14 19:49:40 +0000
+++ l10n_ve_withholding_islr/view/invoice_view.xml	2013-01-14 19:15:27 +0000
@@ -11,7 +11,6 @@
         <record id="account_invoice_wh_islr_customer" model="ir.ui.view">
             <field name="name">account.invoice.wh.islr.customer</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_customer"/>
             <field name="arch" type="xml">
                 <xpath expr="//separator[@string='vsep']" position="after">
@@ -31,7 +30,6 @@
         <record id="account_invoice_wh_islr_supplier" model="ir.ui.view">
             <field name="name">account.invoice.wh.islr.supplier</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_supplier"/>
             <field name="arch" type="xml">
                 <xpath expr="//separator[@string='vsep']" position="after">
@@ -51,7 +49,6 @@
             <record model="ir.ui.view" id="view_account_invoice_form_concept_islr">
                 <field name="name">account_invoice_concept_islr</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="//field[@name='quantity']" position="before">
@@ -60,10 +57,20 @@
                 </field>
             </record>
 
+            <record model="ir.ui.view" id="view_account_invoice_form_concept_islr_customer">
+                <field name="name">account.invoice.concept.islr.customer</field>
+                <field name="model">account.invoice</field>
+                <field name="inherit_id" ref="account.invoice_form"/>
+                <field name="arch" type="xml">
+                <xpath expr="//field[@name='quantity']" position="before">
+                    <field name="concept_id" required="1"/>
+                </xpath>
+                </field>
+            </record>
+
         <record model="ir.ui.view" id="view_invoice_line_form_islr">
             <field name="name">account_invoice_line_concept_islr</field>
             <field name="model">account.invoice.line</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_invoice_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='product_id']" position="before">
@@ -75,7 +82,6 @@
         <record model="ir.ui.view" id="view_invoice_line_tree_islr">
             <field name="name">account_invoice_line_tree_concept_islr</field>
             <field name="model">account.invoice.line</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_invoice_line_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
@@ -86,9 +92,3 @@
     
     </data>
 </openerp>
-
-
-
-
-
-
 
=== modified file 'l10n_ve_withholding_islr/view/islr_wh_concept_view.xml'
--- l10n_ve_withholding_islr/view/islr_wh_concept_view.xml	2012-12-17 19:11:02 +0000
+++ l10n_ve_withholding_islr/view/islr_wh_concept_view.xml	2013-01-14 19:15:27 +0000
@@ -9,12 +9,11 @@
         <record id="view_wh_concept_filter" model="ir.ui.view">
             <field name="name">islr.wh.concept.search</field>
             <field name="model">islr.wh.concept</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Concept of Withholding Income">
+                <search string="Search Concept of Income Withholding">
                    <group col="10" colspan="4">
                         <filter name="withholdable" string="Withhold" domain="[('withholdable','=','True')]" help="Concept withholding withheld"/>
-                        <filter domain="[('user_id','=',uid)]" help="My Withholding Income" separator="1"/>
+                        <filter domain="[('user_id','=',uid)]" help="My Income Withholding" separator="1"/>
                     </group>
                </search>
             </field>
@@ -23,7 +22,6 @@
         <record id="view_wh_islr_rate_form" model="ir.ui.view">
             <field name="name">tasas_form</field>
             <field name="model">islr.rates</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Rates">
                     <field name="name" colspan="4"/>
@@ -43,7 +41,6 @@
         <record id="view_wh_islr_rate_tree" model="ir.ui.view">
             <field name="name">tasas_tree</field>
             <field name="model">islr.rates</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Rates">
                     <field name="name"/>
@@ -61,9 +58,8 @@
         <record id="view_wh_concept_islr_tree" model="ir.ui.view">
             <field name="name">islr.wh.concept_tree</field>
             <field name="model">islr.wh.concept</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Concept of Withholding Income">
+                <tree string="Concept of Income Withholding">
                     <field name="name"/>
                     <field name="withholdable"/>
                 </tree>
@@ -73,9 +69,8 @@
         <record id="view_wh_concept_islr_form" model="ir.ui.view">
             <field name="name">islr.wh.concept_form</field>
             <field name="model">islr.wh.concept</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Concept of Withholding Income">
+                <form string="Concept of Income Withholding">
                     <group colspan="4" col="4">
                         <field name="name"/>
                         <field name="withholdable"/>
@@ -92,13 +87,13 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_wh_islr_concept">
-            <field name="name">Concept of Withholding Income</field>
+            <field name="name">Concept of Income Withholding</field>
             <field name="res_model">islr.wh.concept</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_wh_concept_filter"/>
-            <field name="help">With "Concept of Withholding Income" you can create and manage the concept of wittholding income. For each concept is to create and manage rates associated.</field>
+            <field name="help">With "Concept of Income Withholding" you can create and manage the concept of wittholding income. For each concept is to create and manage rates associated.</field>
         </record>
         
         <record model="ir.actions.act_window.view" id="action_wh_islr_concept_tree">
@@ -114,7 +109,7 @@
             <field name="act_window_id" ref="action_wh_islr_concept"/>
         </record>
         
-        <menuitem name="Concept of Withholding Income" 
+        <menuitem name="Concept of Income Withholding" 
             id="menu_action_concept_retention" 
             parent="menu_wh_configuration_islr"
             action="action_wh_islr_concept"/>
 
=== modified file 'l10n_ve_withholding_islr/view/islr_wh_doc_view.xml'
--- l10n_ve_withholding_islr/view/islr_wh_doc_view.xml	2012-12-18 13:23:28 +0000
+++ l10n_ve_withholding_islr/view/islr_wh_doc_view.xml	2013-01-14 19:15:27 +0000
@@ -8,19 +8,32 @@
     =====================================================
     -->
 
+        <record id="view_islr_wh_doc_invoices_tree_" model="ir.ui.view">
+            <field name="name">islr.wh.doc.invoices_tree</field>
+            <field name="model">islr.wh.doc.invoices</field>
+            <field name="arch" type="xml">
+                <tree string="Withheld Invoices">
+                    <field name="invoice_id"/>
+                    <field name="islr_xml_id"/>
+                    <field name="amount_islr_ret"/>
+                    <field name="base_ret"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="view_islr_wh_doc_invoices_form_" model="ir.ui.view">
             <field name="name">islr.wh.doc.invoices_form</field>
             <field name="model">islr.wh.doc.invoices</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoices">
                     <field
                         name="invoice_id"
-                        domain="[('partner_id','=',parent.partner_id),('islr_wh_doc_id', '=', False),('state', '=', 'open'),('invoice_line.concept_id.withholdable', '=', True)]"
+                        domain="[('partner_id','=',parent.partner_id),('islr_wh_doc_id', '=', False),('state', '=', 'open')]"
                         colspan='6'/>
                     <newline/>
                     <field name="islr_xml_id" nolabel="1"  colspan='4'>
-                        <tree string="Detail of the Concept of Withholding Income">
+                        <tree string="Detail of the Concept of Income Withholding">
+                            <field name="concept_code"/>
                             <field name="rate_id"/>
                             <field name="wh"/>
                             <field name="porcent_rete"/>
@@ -43,15 +56,14 @@
         <record id="view_wh_islr_filter_customer" model="ir.ui.view">
             <field name="name">islr.wh.doc.search</field>
             <field name="model">islr.wh.doc</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Withholding Income">
+                <search string="Search Income Withholding">
                    <group col="10" colspan="4">
-                        <filter name="to_process" string="To Process" domain="[('state','=','to_process')]" help="To Process Withholding Income"/>
-                        <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Withholding Income"/>
-                        <filter name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Withholding Income"/>
-                        <filter name="done" string="Done" domain="[('state','=','done')]" help="Done Withholding Income"/>
-                        <filter name="cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Withholding Income"/>
+                        <filter name="to_process" string="To Process" domain="[('state','=','to_process')]" help="To Process Income Withholding"/>
+                        <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Income Withholding"/>
+                        <filter name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Income Withholding"/>
+                        <filter name="done" string="Done" domain="[('state','=','done')]" help="Done Income Withholding"/>
+                        <filter name="cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Income Withholding"/>
                     </group>
                     <group expand="1" string="Group By...">
                         <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -67,9 +79,8 @@
         <record id="view_islr_line_tree" model="ir.ui.view">
             <field name="name">islr.wh.doc_line_tree</field>
             <field name="model">islr.wh.doc.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Lines Withholding Income" editable="bottom" >
+                <tree string="Lines Income Withholding" editable="bottom" >
                     <field name="name"/>
                     <field name="concept_id"/>
                     <field name="retencion_islr"/>
@@ -82,14 +93,13 @@
         <record id="view_islr_line_form" model="ir.ui.view">
             <field name="name">islr.wh.doc.line_form</field>
             <field name="model">islr.wh.doc.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Lines Withholding Income">
+                <form string="Lines Income Withholding">
                     <field name="concept_id"  colspan='6'/>
                     <field name="move_id"  colspan='6'/>
                     <newline/>
                     <field name="xml_ids" nolabel="1"  colspan='4'>
-                        <tree string="Detail of the Concept of Withholding Income">
+                        <tree string="Detail of the Concept of Income Withholding">
                             <field name="rate_id"/>
                             <field name="wh"/>
                             <field name="porcent_rete"/>
@@ -103,9 +113,8 @@
         <record id="view_islr_tree_customers" model="ir.ui.view">
             <field name="name">islr.wh.doc_tree_customers</field>
             <field name="model">islr.wh.doc</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state=='draft'" string="Customer Withholding Income">
+                <tree colors="blue:state=='draft'" string="Customer Income Withholding">
                     <field name="partner_id"/>
                     <field name="date_ret"/>
                     <field name="period_id"/>
@@ -122,9 +131,8 @@
         <record id="view_islr_form_customers" model="ir.ui.view">
             <field name="name">islr.wh.doc_form_customers</field>
             <field name="model">islr.wh.doc</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Customer Withholding Income">
+                <form string="Customer Income Withholding">
                     <group colspan="4" col="6">
                         <field name="journal_id" domain="[('type','=','islr_sale')]"/>
                         <field name="type"/>
@@ -138,10 +146,13 @@
                         <field name="date_uid"/>
                     </group>
                             <notebook colspan="6">
+                                <page string="Invoices to Be Withheld">
+                                    <field name='invoice_ids' nolabel='1'/>
+                                </page>
                                 <page string="Invoices">
                                     <field domain="[('partner_id','=',partner_id),('status','=','no_pro'),('state','in',['open','paid']),('type','in',['out_invoice','out_refund'])]" colspan="6" name="islr_wh_doc_id" nolabel="1" widget="many2many"/>
                                 </page>
-                                <page string="Concept of Withholding Income">
+                                <page string="Concept of Income Withholding">
                                     <field colspan="6" name="concept_ids" nolabel="1" widget="one2many_list"/>
                                         <group col="4" colspan="2">
                                             <field name="amount_total_ret"/>
@@ -154,10 +165,9 @@
                         <group colspan="6" col="2">
                         <group col="1">
                             <field name="state"/>
-                            <button name="act_progress" string="Progress" states="draft" icon="gtk-go-forward"/>
-                            <button name="act_confirmed" string="Confirmed" states="progress" icon="gtk-go-forward"/>
+                            <button name="act_confirm" string="Confirmed" states="draft" icon="gtk-go-forward"/>
                             <button name="act_done" string="Done" states="confirmed" icon="gtk-execute" />
-                            <button name="%(voucher_report_withholding_islr)d" string="Print Withholding Income" states="done" colspan="3" type="action" icon="gtk-execute"/>
+                            <button name="%(voucher_report_withholding_islr)d" string="Print Income Withholding" states="done" colspan="3" type="action" icon="gtk-execute"/>
                             <button name="act_cancel" string="Cancel" states="draft,progress,confirmed,done"  icon="gtk-cancel"  />
                             <button name="act_draft" colspan="2" string="Set to draft" states="cancel" icon="gtk-go-forward"/>
                         </group>
@@ -175,14 +185,13 @@
         <record id="view_wh_islr_filter_suppliers" model="ir.ui.view">
             <field name="name">islr.wh.doc.search</field>
             <field name="model">islr.wh.doc</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Withholding Income">
+                <search string="Search Income Withholding">
                    <group col="10" colspan="4">
-                        <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Withholding Income"/>
-                        <filter name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Withholding Income"/>
-                        <filter name="done" string="Done" domain="[('state','=','done')]" help="Done Withholding Income"/>
-                        <filter name="cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Withholding Income"/>
+                        <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Income Withholding"/>
+                        <filter name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Income Withholding"/>
+                        <filter name="done" string="Done" domain="[('state','=','done')]" help="Done Income Withholding"/>
+                        <filter name="cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Income Withholding"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
@@ -199,9 +208,8 @@
         <record id="view_wh_islr_tree_suppliers" model="ir.ui.view">
             <field name="name">islr.wh.doc_tree_suppliers</field>
             <field name="model">islr.wh.doc</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state=='draft'" string="Supplier Withholding Income">
+                <tree colors="blue:state=='draft'" string="Supplier Income Withholding">
                     <field name="partner_id"/>
                     <field name="date_ret"/>
                     <field name="period_id"/>
@@ -215,49 +223,11 @@
             </field>
         </record>
 
-        <record id="view_islr_line_tree" model="ir.ui.view">
-            <field name="name">islr.wh.doc_line_tree2</field>
-            <field name="model">islr.wh.doc.line</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Lines Withholding Income" editable="bottom" >
-                    <field name="name"/>
-                    <field name="concept_id"/>
-                    <field name="retencion_islr"/>
-                    <field name="amount"/>
-                    <field name="move_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_islr_line_form" model="ir.ui.view">
-            <field name="name">islr.wh.doc.line_form2</field>
-            <field name="model">islr.wh.doc.line</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Lines Withholding Income">
-                    <field name="concept_id"  colspan='6'/>
-                    <field name="move_id"  colspan='6'/>
-                    <newline/>
-                    <field name="xml_ids" nolabel="1"  colspan='4'>
-                        <tree string="Detail of the Concept of Withholding Income">
-                            <field name="rate_id"/>
-                            <field name="wh"/>
-                            <field name="porcent_rete"/>
-                            <field name="base"/>
-                        </tree>
-                    </field>
-                </form>
-            </field>
-        </record>
-
-
         <record id="view_wh_islr_form_suppliers" model="ir.ui.view">
             <field name="name">islr.wh.doc_form_suppliers</field>
             <field name="model">islr.wh.doc</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Supplier Withholding Income">
+                <form string="Supplier Income Withholding">
                     <group colspan="4" col="6">
                         <field name="journal_id" domain="[('type','=','islr_purchase')]"/>
                         <field name="type"/>
@@ -273,36 +243,60 @@
                         <field name="invoice_id" />
                     </group>
                             <notebook colspan="6">
-                                <page string="Invoices">
+                                <page string="Invoices to Be Withheld">
+                                    <field name="invoice_ids" nolabel='1'/>
+                                </page>
+                                <page string="Invoices" invisible='1'>
                                     <field domain="[('partner_id','=',partner_id),('status','=','no_pro'),('state','in',['open','paid']),('type','in',['in_invoice','in_refund'])]" colspan="6" name="islr_wh_doc_id" nolabel="1" widget="many2many"/>
                                 </page>
-                                <page string="Concept of Withholding Income">
-                                    <field colspan="6" name="concept_ids" nolabel="1" widget="one2many_list"/>
-                                        <group col="4" colspan="2">
-                                            <field name="amount_total_ret"/>
-                                        </group>
-                                </page>
-                                <page string="Invoices" invisible="1">
-                                    <field name="invoice_ids" nolabel="1">
-                                        <tree string="Invoices Withhelds">
+                                <page string="Income Withholding Concepts">
+                                    <field colspan="6" name="concept_ids" nolabel="1">
+                                        <tree string="Income Withholding Concepts">
+                                            <field name="name" invisible='1'/>
                                             <field name="invoice_id"/>
-                                            <field name="islr_xml_id"/>
-                                            <field name="amount_islr_ret"/>
-                                            <field name="base_ret"/>
+                                            <field name="concept_id"/>
+                                            <field name="base_amount"/>
+                                            <field name="retencion_islr"/>
+                                            <field name="subtract"/>
+                                            <field name="amount"/>
+                                            <field name="move_id"/>
                                         </tree>
+                                        <form string="Income Withholding Concepts">
+                                            <field name="invoice_id"/>
+                                            <newline/>
+                                            <field name="concept_id"  colspan='6'/>
+                                            <newline/>
+                                            <field name="xml_ids" nolabel="1"  colspan='4'>
+                                                <tree string="Detail of the Concept of Income Withholding">
+                                                    <field name="concept_code"/>
+                                                    <field name="rate_id"/>
+                                                    <field name="wh"/>
+                                                    <field name="porcent_rete"/>
+                                                    <field name="base"/>
+                                                </tree>
+                                            </field>
+                                            <field name="base_amount"/>
+                                            <field name="subtract"/>
+                                            <field name="retencion_islr"/>
+                                            <field name="amount"/>
+                                            <field name="move_id"  colspan='6'/>
+                                        </form>
                                     </field>
                                 </page>
                                <page string="Other Information">
                                     <field name="company_id"/>
                                 </page>
                             </notebook>
+                        <group col="4" colspan="2">
+                            <field name="amount_total_ret"/>
+                            <button colspan="2" name="compute_amount_wh" string="Compute Income Withholding" type="object" icon="terp-stock_format-scientific"/>
+                        </group>
                         <group colspan="6" col="2">
                         <group col="1">
                             <field name="state"/>
-                            <button name="act_progress" string="Progress" states="draft" type="workflow"  icon="gtk-go-forward"/>
-                            <button name="act_confirmed" string="Confirmed" states="progress" type="workflow"  icon="gtk-go-forward"/>
+                            <button name="act_confirm" string="Confirm" states="draft" type="workflow"  icon="gtk-go-forward"/>
                             <button name="act_done" string="Done" states="confirmed" type="workflow"  icon="gtk-go-forward"/>
-                            <button name="%(voucher_report_withholding_islr)d" string="Print Withholding Income" colspan="3" states="done" type="action" icon="gtk-execute"/>
+                            <button name="%(voucher_report_withholding_islr)d" string="Print Income Withholding" colspan="3" states="done" type="action" icon="gtk-execute"/>
                             <button name="act_cancel" string="Cancel" states="draft,progress,confirmed,done" type="workflow"   icon="gtk-go-forward"/>
                             <button name="act_draft"  colspan="2"  string="Set to draft" states="cancel" type="workflow"  icon="gtk-go-forward"/>
                         </group>
@@ -313,7 +307,7 @@
 
 
         <record model="ir.actions.act_window" id="action_wh_islr_customer">
-            <field name="name">Customer Withholding Income</field>
+            <field name="name">Customer Income Withholding</field>
             <field name="res_model">islr.wh.doc</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -338,12 +332,12 @@
 
         <menuitem
             id="menu_action_wh_islr_customer"
-            name="Customer Withholding Income"
+            name="Customer Income Withholding"
             parent="account.menu_finance_receivables"
             action="action_wh_islr_customer"/>
 
         <record model="ir.actions.act_window" id="action_wh_islr_supplier">
-            <field name="name">Supplier Withholding Income</field>
+            <field name="name">Supplier Income Withholding</field>
             <field name="res_model">islr.wh.doc</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -351,7 +345,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice', 'search_default_draft': 1}</field>
             <field name="search_view_id" ref="view_wh_islr_filter_suppliers"/>
-            <field name="help">With Supplier Withholding  you can manage document withholding issued to your suppliers. OpenERP can Just generate document withholding for purchase process automatically from invoices. To generate the withholding income and all accounting process you must confirm and validate the document withholding.</field>
+            <field name="help">With Supplier Withholding  you can manage document withholding issued to your suppliers. OpenERP can Just generate document withholding for purchase process automatically from invoices. To generate the Income Withholding and all accounting process you must confirm and validate the document withholding.</field>
 
         </record>
         <record model="ir.actions.act_window.view" id="action_wh_islr_tree">
@@ -369,7 +363,7 @@
 
         <menuitem
             id="menu_action_wh_islr_supplier"
-            name="Supplier Withholding Income" 
+            name="Supplier Income Withholding" 
             parent="account.menu_finance_payables"
             action="action_wh_islr_supplier"/>
 
 
=== modified file 'l10n_ve_withholding_islr/view/islr_xml_wh.xml'
--- l10n_ve_withholding_islr/view/islr_xml_wh.xml	2012-12-17 23:45:56 +0000
+++ l10n_ve_withholding_islr/view/islr_xml_wh.xml	2013-01-14 19:15:27 +0000
@@ -11,7 +11,6 @@
         <record id="view_xml_islr_line_form" model="ir.ui.view">
             <field name="name">islr.xml.wh.line_form</field>
             <field name="model">islr.xml.wh.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Export in XML data">
                     <newline/>
@@ -22,7 +21,7 @@
                         <field name="partner_vat"/>
                     </group>
                     <newline/>
-                    <separator string="Concept of Withholding Income" colspan="6"/>
+                    <separator string="Concept of Income Withholding" colspan="6"/>
                     <newline/>
                     <group col="4" colspan="4">
                         <field name="concept_id" colspan="4" />
@@ -54,7 +53,6 @@
         <record id="view_xml_islr_tree" model="ir.ui.view">
             <field name="name">islr.xml.wh.doc_tree</field>
             <field name="model">islr.xml.wh.doc</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Lines Withholding for XML" >
                     <field name="name"/>
@@ -67,7 +65,6 @@
         <record id="view_xml_islr_form" model="ir.ui.view">
             <field name="name">islr.xml.wh.doc_form</field>
             <field name="model">islr.xml.wh.doc</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Lines Withholding for XML">
                     <field name="name"/>
@@ -107,7 +104,6 @@
         <record id="view_generate_xml_filter" model="ir.ui.view">
             <field name="name">islr.xml.wh.doc.search</field>
             <field name="model">islr.xml.wh.doc</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search File XML">
                    <group col="10" colspan="4">
@@ -118,7 +114,7 @@
                         <separator orientation="vertical"/>
                         <field name="company_id"/>
                         <field name="user_id" select="1" widget="selection" string="Salesman">
-                        <filter domain="[('user_id','=',uid)]" help="My Withholding Income" icon="terp-personal" separator="1"/>
+                        <filter domain="[('user_id','=',uid)]" help="My Income Withholding" icon="terp-personal" separator="1"/>
                         </field>
                     </group>
                     <newline/>
 
=== modified file 'l10n_ve_withholding_islr/view/partner_view.xml'
--- l10n_ve_withholding_islr/view/partner_view.xml	2012-10-02 18:30:33 +0000
+++ l10n_ve_withholding_islr/view/partner_view.xml	2013-01-14 19:15:27 +0000
@@ -11,7 +11,6 @@
         <record id="res_partner_wh_islr" model="ir.ui.view">
             <field name="name">res.partner.wh.islr</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_partner"/>
             <field name="arch" type="xml">
                 <xpath expr="//separator[@string='vsep']" position="after">
 
=== modified file 'l10n_ve_withholding_islr/view/product_view.xml'
--- l10n_ve_withholding_islr/view/product_view.xml	2012-11-07 21:33:58 +0000
+++ l10n_ve_withholding_islr/view/product_view.xml	2013-01-14 19:15:27 +0000
@@ -5,12 +5,11 @@
         <record model="ir.ui.view" id="view_product_product_islr">
             <field name="name">product.product.form.islr</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='properties']" position="after">
                     <newline/>
-                    <separator string="Concept of Withholding Income"/>
+                    <separator string="Concept of Income Withholding"/>
                     <newline/>
                     <group col='6' colspan='6' >
                         <field name="concept_id"/>
@@ -30,7 +29,6 @@
         <record id="product_normal_form_view_type" model="ir.ui.view">
             <field name="name">product.normal.form.type</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='type']" position="replace">
 
=== modified file 'l10n_ve_withholding_islr/view/wh_islr_view.xml'
--- l10n_ve_withholding_islr/view/wh_islr_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_islr/view/wh_islr_view.xml	2013-01-14 19:15:27 +0000
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_wh_configuration_islr" name="Withholding Income" parent="l10n_ve_withholding.menu_wh_configuration"/>
+        <menuitem id="menu_wh_configuration_islr" name="Income Withholding" parent="l10n_ve_withholding.menu_wh_configuration"/>
 
     </data>
 </openerp>
 
=== modified file 'l10n_ve_withholding_islr/workflow/account_workflow.xml'
--- l10n_ve_withholding_islr/workflow/account_workflow.xml	2012-12-18 13:37:25 +0000
+++ l10n_ve_withholding_islr/workflow/account_workflow.xml	2013-01-14 19:15:27 +0000
@@ -15,7 +15,7 @@
             <field name="name">Withholding Islr</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" ref="wh_islr_order"/>
-            <field name="action">action_ret_islr()</field>
+            <field name="action">_create_islr_wh_doc()</field>
         </record>
 
 	<record id="act_islr_router" model="workflow.activity">
@@ -39,8 +39,8 @@
     -->
         <record id="trans_wh_router_wh_islr" model="workflow.transition">
             <field name="act_from" ref="l10n_ve_withholding.act_wh_router"/>
-            <field name="act_to" ref="act_islr_router"/>
-            <field name="condition">check_invoice_type()</field>
+            <field name="act_to" ref="act_withold_islr"/>
+            <field name="condition">check_invoice_type() and check_withholdable_concept()</field>
             <field name="signal"></field>
         </record>
 	
 
=== modified file 'l10n_ve_withholding_islr/workflow/islr_wh_workflow.xml'
--- l10n_ve_withholding_islr/workflow/islr_wh_workflow.xml	2012-05-04 14:44:55 +0000
+++ l10n_ve_withholding_islr/workflow/islr_wh_workflow.xml	2013-01-14 19:15:27 +0000
@@ -24,8 +24,7 @@
 
         <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="wh_islr_order"/>
-            <field name="action">action_number()
-write({'state':'confirmed'})</field>
+            <field name="action">action_confirm()</field>
             <field name="kind">function</field>
             <field name="name">confirmed</field>
         </record>
@@ -34,7 +33,8 @@
             <field name="wkf_id" ref="wh_islr_order"/>
             <field name="kind">function</field>
             <field name="name">done</field>
-            <field name="action">action_move_create()
+            <field name="action">action_number()
+action_move_create()
 write({'state':'done'})</field>
         </record>
         
@@ -63,7 +63,8 @@
         <record id="trans_draft_confirmed" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirmed"/>
-            <field name="condition">validate(type,concept_ids,invoice_ids)</field>
+            <field name="condition">check_income_wh()</field>
+            <field name="signal">act_confirm</field>
         </record>
         
         <record id="trans_draft_progress" model="workflow.transition">
@@ -82,7 +83,8 @@
         <record id="trans_progress_confirmed" model="workflow.transition">
             <field name="act_from" ref="act_progress"/>
             <field name="act_to" ref="act_confirmed"/>
-            <field name="signal">act_confirmed</field>
+            <field name="condition">True</field>
+            <field name="signal"></field>
         </record>
 
         <record id="trans_confirmed_cancel" model="workflow.transition">
 
=== modified file 'l10n_ve_withholding_iva/model/__init__.py'
--- l10n_ve_withholding_iva/model/__init__.py	2012-11-07 21:33:58 +0000
+++ l10n_ve_withholding_iva/model/__init__.py	2013-01-14 19:15:27 +0000
@@ -29,6 +29,5 @@
 import generate_txt
 import report
 import installer
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'l10n_ve_withholding_src/__init__.py'
--- l10n_ve_withholding_src/__init__.py	2012-02-20 20:11:16 +0000
+++ l10n_ve_withholding_src/__init__.py	2013-01-14 19:15:27 +0000
@@ -24,4 +24,6 @@
 ################################################################################
 
 import model
+import wizard
 import report
+
 
=== modified file 'l10n_ve_withholding_src/__openerp__.py'
--- l10n_ve_withholding_src/__openerp__.py	2012-08-22 22:56:20 +0000
+++ l10n_ve_withholding_src/__openerp__.py	2013-01-14 19:15:27 +0000
@@ -54,12 +54,15 @@
     "update_xml" : [
         'security/wh_src_security.xml',
         'security/ir.model.access.csv',
+        'wizard/wizard_retention_view.xml',
         'view/wh_src_view.xml',
         'view/account_invoice_view.xml',
         'view/company_view.xml',
+        'view/partner_view.xml',
         'workflow/l10n_ve_wh_src_wf.xml',
         'data/data.xml',
-        'wh_src_report.xml',
+        'report/wh_src_report.xml',
+        
     ],
     "active": False,
     "installable": True
 
=== modified file 'l10n_ve_withholding_src/data/data.xml'
--- l10n_ve_withholding_src/data/data.xml	2012-09-11 00:38:30 +0000
+++ l10n_ve_withholding_src/data/data.xml	2013-01-14 19:15:27 +0000
@@ -2,17 +2,32 @@
 <openerp>
     <data noupdate="1">
 
+        <!-- Sequence types for account.wh.src --> 
         <record id="seq_type_account_wh_iva" model="ir.sequence.type">
             <field name="name">Withholding src costumer</field>
             <field name="code">wh.src.out</field>
         </record>
 
         <record id="seq_type_account_wh_iva_purchase" model="ir.sequence.type">
-            <field name="name">Withholding src  supplier</field>
+            <field name="name">Withholding src supplier</field>
             <field name="code">wh.src.in</field>
         </record>
-    
-        <record id="seq_type_account_wh_src_supplier" model="ir.sequence">
+
+        <record id="seq_type_account_wh_src_supplier" model="ir.sequence.type">
+            <field name="name">Withholding local.supplier</field>
+            <field name="code">account.wh.src.in_invoice</field>
+        </record>
+
+        <!-- Sequences for account.wh.src --> 
+        <record id="seq_account_retencion_src_customer" model="ir.sequence">
+            <field name="name">Withholding local customer</field>
+            <field name="code">account.wh.src.in_invoice</field>
+            <field name="prefix">RET-SRC</field>
+            <field name="padding">8</field>
+            <field name="number_increment">1</field>
+        </record>
+
+        <record id="seq_account_wh_src_supplier" model="ir.sequence">
             <field name="name">Withholding src</field>
             <field name="code">wh.src.out</field>
             <field name="prefix">src:</field>
@@ -20,48 +35,28 @@
             <field name="number_increment">1</field>
         </record>
 
-        <record id="seq_account_retencion_src_customer" model="ir.sequence">
+        <record id="seq_account_retencion_src_purchase" model="ir.sequence">
             <field name="name">Withholding src purchase</field>
             <field name="code">wh.src.in</field>
             <field name="prefix">%(year)s-%(month)s-</field>
             <field name="padding">8</field>
             <field name="number_increment">1</field>
         </record>
+
+        <!-- Journals for account.wh.src --> 
         <record id="withholding_scr_purchase_journal" model="account.journal">
             <field name="name">DIARIO DE SRC PARA PROVEEDORES</field>
             <field name="code">srcP</field>
             <field name="type">src_purchase</field>
-            <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="seq_type_account_wh_src_supplier"/>
+            <field name="sequence_id" ref="seq_account_wh_src_supplier"/>
         </record>
         
         <record id="withholding_src_sale_journal" model="account.journal">
             <field name="name">DIARIO DE SRC PARA CLIENTES</field>
             <field name="code">srcC</field>
             <field name="type">src_sale</field>
-            <field name="view_id" ref="account.account_journal_view"/>
             <field name="sequence_id" ref="seq_account_retencion_src_customer"/>
         </record>
-
-        <!-- Sequences type for account.wh.src --> 
-
-
-        <record id="seq_type_account_wh_src_supplier" model="ir.sequence.type">
-            <field name="name">Withholding local.supplier</field>
-            <field name="code">account.wh.src.in_invoice</field>
-        </record>
-
-        <!-- Sequences for account.wh.src --> 
-
-
-        <record id="seq_account_retencion_src_customer" model="ir.sequence">
-            <field name="name">Withholding local customer</field>
-            <field name="code">account.wh.src.in_invoice</field>
-            <field name="prefix">RET-SRC</field>
-            <field name="padding">8</field>
-            <field name="number_increment">1</field>
-        </record>
-
         
     </data>
 </openerp>
 
=== modified file 'l10n_ve_withholding_src/model/__init__.py'
--- l10n_ve_withholding_src/model/__init__.py	2012-01-27 05:37:46 +0000
+++ l10n_ve_withholding_src/model/__init__.py	2013-01-14 19:15:27 +0000
@@ -26,4 +26,5 @@
 import wh_src
 import invoice
 import res_company
+import partner
 
 
=== modified file 'l10n_ve_withholding_src/model/invoice.py'
--- l10n_ve_withholding_src/model/invoice.py	2012-01-27 05:37:46 +0000
+++ l10n_ve_withholding_src/model/invoice.py	2013-01-14 19:15:27 +0000
@@ -30,6 +30,23 @@
 
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
+     
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+        
+        p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        c = self.pool.get('res.partner').browse(cr, uid, uid)
+        res = super(account_invoice,self).onchange_partner_id(cr, uid, ids, type, \
+        partner_id, date_invoice,payment_term,partner_bank_id,company_id)
+        
+        if p.wh_src_agent and type in ('out_invoice') and not p.supplier:
+            res['value']['wh_src_rate'] = p.wh_src_rate
+        elif c.wh_src_agent and type in ('in_invoice') and p.supplier:
+            res['value']['wh_src_rate'] = c.wh_src_rate
+        else:
+            res['value']['wh_src_rate'] = 0
+            
+        return res
     
     def _retenida(self, cr, uid, ids, name, args, context):
         res = {}
@@ -66,6 +83,20 @@
             invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context)
         return invoice_ids
     
+    def _check_retention(self, cr, uid, ids, context=None):
+        '''This method will check the retention value will be maximum 5%   
+            '''
+        if context is None: context = {}
+        
+        invoice_brw = self.browse(cr, uid,ids)
+        
+        ret = invoice_brw[0].wh_src_rate
+    
+        if ret and ret > 5:
+            return False
+            
+        return True
+    
     _columns = {
         'wh_src': fields.boolean('Social Responsibility Commitment Withheld'),
         'wh_src_rate': fields.float('SRC Wh rate', digits_compute= dp.get_precision('Withhold'), readonly=True, states={'draft':[('readonly',False)]}, help="Social Responsibility Commitment Withholding Rate"),
@@ -75,6 +106,10 @@
         'wh_src': False,
     }
 
+    _constraints = [
+        (_check_retention, _("Error ! Maximum retention is 5%"), []),
+    ]
+
     def _get_move_lines(self, cr, uid, ids, to_wh, period_id, 
                             pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
@@ -84,7 +119,7 @@
                             pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
                             name, context=context)
-        if context.get('src_wh',False):
+        if context.get('wh_src',False):
             invoice = self.browse(cr, uid, ids[0])
             
             types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
 
=== modified file 'l10n_ve_withholding_src/model/partner.py'
--- l10n_ve_withholding_src/model/partner.py	2012-01-26 22:29:50 +0000
+++ l10n_ve_withholding_src/model/partner.py	2013-01-14 19:15:27 +0000
@@ -31,14 +31,12 @@
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
-    #~ logger = netsvc.Logger()
-    #~ _columns = {
-        #~ 'wh_src_agent': fields.boolean('Wh. Agent', help="Indicate if the partner is a withholding vat agent"),
-        #~ 'wh_src_rate': fields.float(string='Rate', digits_compute= dp.get_precision('Withhold'), help="Withholding vat rate"),
-    #~ }
-    #~ _defaults = {
-        #~ 'wh_src_rate': lambda *a: 0,
-    #~ }
-
-
+    logger = netsvc.Logger()
+    _columns = {
+        'wh_src_agent': fields.boolean('Wh. Agent', help="Indicate if the partner is a withholding vat agent"),
+        'wh_src_rate': fields.float(string='Rate', digits_compute= dp.get_precision('Withhold'), help="Withholding vat rate"),
+    }
+    _defaults = {
+        'wh_src_rate': lambda *a: 0,
+    }
 res_partner()
 
=== modified file 'l10n_ve_withholding_src/model/wh_src.py'
--- l10n_ve_withholding_src/model/wh_src.py	2012-09-26 22:10:42 +0000
+++ l10n_ve_withholding_src/model/wh_src.py	2013-01-14 19:15:27 +0000
@@ -51,6 +51,45 @@
             res.append((move.id, name))
         return res
 
+    def _get_uid_wh_agent(self, cr, uid, context=None):
+        context = context or {}
+        user_wh_agent = self.pool.get('res.partner').browse(cr, uid, uid, context=context).wh_src_agent
+        return user_wh_agent
+
+    def _get_partner_agent(self, cr, uid, context=None):
+        context = context or {}
+        
+        obj_partner = self.pool.get('res.partner')
+        
+        if context.get('type') in ('out_invoice'):
+            partner_ids = obj_partner.search(cr, uid, [('wh_src_agent','=',True)])
+            partner_brw = self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context)
+        else:
+            partner_ids = obj_partner.search(cr, uid, [])
+            partner_brw = self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context)
+        
+        l = map(lambda x: x.id, partner_brw)
+        
+        return l
+
+    def default_get(self, cr, uid, fields, context=None):
+        context = context or {}
+        res = super(account_wh_src, self).default_get(cr, uid, fields, context=context)
+        res.update({'uid_wh_agent': self._get_uid_wh_agent(cr,uid,context=context) })
+        res.update({'partner_list': self._get_partner_agent(cr,uid,context=context) })
+        
+        return res
+
+    def _get_p_agent(self, cr, uid, ids, field_name, args, context=None):
+        context = context or {}
+        res= {}.fromkeys(ids,self._get_partner_agent(cr,uid,context=context))
+        return res 
+
+    def _get_wh_agent(self, cr, uid, ids, field_name, args, context=None):
+        context = context or {}
+        res= {}.fromkeys(ids,self._get_uid_wh_agent(cr,uid,context=context))
+        return res 
+
     _name = "account.wh.src"
     _description = "Social Responsibility Commitment Withholding"
     _columns = {
@@ -77,7 +116,9 @@
         'company_id': fields.many2one('res.company', 'Company', required=True, help="Company"),
         'line_ids': fields.one2many('account.wh.src.line', 'wh_id', 'Local withholding lines', readonly=True, states={'draft':[('readonly',False)]}, help="Facturas a la cual se realizarán las retenciones"),
         'wh_amount': fields.float('Amount', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount withheld"),
-     
+        
+        'uid_wh_agent': fields.function(_get_wh_agent, type='boolean', string="uid_wh_agent", store=False),
+        'partner_list' : fields.function(_get_p_agent, type='char', string='Lista', store=False, method=False),
 
     } 
     
@@ -208,7 +249,7 @@
         inv_obj = self.pool.get('account.invoice')
         if context is None: context = {}
         
-        context.update({'src_wh':True})
+        context.update({'wh_src':True})
         
         ret = self.browse(cr, uid, ids[0], context)
 
 
=== renamed file 'l10n_ve_withholding_src/wh_src_report.xml' => 'l10n_ve_withholding_src/report/wh_src_report.xml'
=== modified file 'l10n_ve_withholding_src/security/ir.model.access.csv'
--- l10n_ve_withholding_src/security/ir.model.access.csv	2012-04-03 19:54:22 +0000
+++ l10n_ve_withholding_src/security/ir.model.access.csv	2013-01-14 19:15:27 +0000
@@ -3,3 +3,4 @@
 "access_account_wh_src_line_user","account.wh.src.line.user","model_account_wh_src_line","l10n_ve_withholding_src.group_account_wh_src_user",1,0,0,0
 "access_account_wh_src_manager","account.wh.src.manager","model_account_wh_src","l10n_ve_withholding_src.group_account_wh_src_manager",1,1,1,1
 "access_account_wh_src_line_manager","account.wh.src.line.manager","model_account_wh_src_line","l10n_ve_withholding_src.group_account_wh_src_manager",1,1,1,1
+"access_wiz_retention","wiz.retention.manager","model_wiz_retention","l10n_ve_withholding_src.group_account_wh_src_manager",1,1,1,1
 
=== modified file 'l10n_ve_withholding_src/view/account_invoice_view.xml'
--- l10n_ve_withholding_src/view/account_invoice_view.xml	2012-11-07 21:33:58 +0000
+++ l10n_ve_withholding_src/view/account_invoice_view.xml	2013-01-14 19:15:27 +0000
@@ -8,14 +8,20 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_customer"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='currency_id']" position="after">
+                <xpath expr="//separator[@string='rsep']" position="after">
                     <newline/>
                         <group col="6" colspan="4">
                             <field name="wh_src_rate"/>
                             <field name="wh_src_id"/>
                         </group>
+                        <button  name="%(action_wiz_retention)d" 
+                                 type='action' 
+                                 string='Change retention' 
+                                 icon="gtk-execute" 
+                                 colspan="6"
+                                 attrs="{'invisible': ['|',('state','=', 'draft'),('state','=', 'paid')]}"/>
                 </xpath>
-                <xpath expr="//field[@name='account_id']" position='attributes'>
+                <xpath expr="//separator[@string='rsep']" position='attributes'>
                     <attribute name="string">SRC Withholdings</attribute>
                 </xpath>
             </field>
@@ -33,7 +39,14 @@
                             <field name="wh_src_rate"/>
                             <field name="wh_src_id"/>
                         </group>
+                    <button  name="%(action_wiz_retention)d" 
+                                 type='action' 
+                                 string='Change retention' 
+                                 icon="gtk-execute" 
+                                 colspan="6"
+                                 attrs="{'invisible': ['|',('state','=', 'draft'),('state','=', 'paid')]}"/>
                 </xpath>
+
                 <xpath expr='//separator[@string="rsep"]' position='attributes'>
                     <attribute name="string">SRC Withholdings</attribute>
                 </xpath>
 
=== modified file 'l10n_ve_withholding_src/view/company_view.xml'
--- l10n_ve_withholding_src/view/company_view.xml	2012-01-27 05:37:46 +0000
+++ l10n_ve_withholding_src/view/company_view.xml	2013-01-14 19:15:27 +0000
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Social Responsability Commitment Accounts" colspan="4"/>
+                <xpath expr='//page[@string="Configuration"]/group/group[@name="account_grp"]' position="after">
+                    <separator string="Social Responsability Commitment Accounts" colspan="2"/>
                         <field name="wh_src_collected_account_id" required='1'/>
                         <field name="wh_src_paid_account_id" required='1'/>
                     <newline/>
-                </page>
+                </xpath>
             </field>
         </record>
 
 
=== modified file 'l10n_ve_withholding_src/view/partner_view.xml'
--- l10n_ve_withholding_src/view/partner_view.xml	2012-01-26 04:52:17 +0000
+++ l10n_ve_withholding_src/view/partner_view.xml	2013-01-14 19:15:27 +0000
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-
-
-    <!--
+<!--
     =====================================================
     Partners Extension
     =====================================================
-    -->
-
-        <record id="partner_ext_munici_view_form_loc_ve" model="ir.ui.view">
-            <field name="name">partner_extended_munici.partner.form.view.loc_ve</field>
+-->
+        <record id="partner_wh_src" model="ir.ui.view">
+            <field name="name">res.partner.form.wh.src</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_partner"/>
             <field name="arch" type="xml">
-                <page string="Withholdings" position="inside">
-                    <notebook>
-                        <page string="Local Withholdings">
-                            <group col="4" colspan="2">
-                                    <field name="property_wh_munici_payable"/>
-                                    <field name="property_wh_munici_receivable"/>
-                            </group>
-                        </page>
-                    </notebook>
-                </page>
+                <xpath expr="//page[@string='Withholdings']" position="after">
+                    <page string="Local Withholdings">
+                        <group col="4" colspan="2">
+                                <field name="wh_src_agent"/>
+                                <field name="wh_src_rate"/>
+                        </group>
+                    </page>
+                </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
 
=== modified file 'l10n_ve_withholding_src/view/wh_src_view.xml'
--- l10n_ve_withholding_src/view/wh_src_view.xml	2012-01-30 20:48:44 +0000
+++ l10n_ve_withholding_src/view/wh_src_view.xml	2013-01-14 19:15:27 +0000
@@ -57,10 +57,10 @@
             <field name="arch" type="xml">
                 <search string="Search Withholding Local">
                    <group col="10" colspan="4">
-                        <filter name="wh_src_draft" icon="terp-gtk-media-pause" string="Draft" domain="[('state','=','draft')]" help="Draft Withholding Local"/>
-                        <filter name="wh_src_confirmed" icon="terp-gtk-media-pause" string="Confirmed" domain="[('state','=','confirmed')]" help="Draft Withholding Local"/>
-                        <filter name="wh_src_done" icon="terp-check" string="Done" domain="[('state','=','done')]" help="Done Withholding Local"/>
-                        <filter name="wh_src_cancel" icon="terp-dialog-close" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Withholding Local"/>
+                        <filter name="wh_src_draft" string="Draft" domain="[('state','=','draft')]" help="Draft Withholding Local"/>
+                        <filter name="wh_src_confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Draft Withholding Local"/>
+                        <filter name="wh_src_done" string="Done" domain="[('state','=','done')]" help="Done Withholding Local"/>
+                        <filter name="wh_src_cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Withholding Local"/>
                         <separator orientation="vertical"/>
                         <field name="code"/>
                         <field name="number"/>
@@ -70,11 +70,11 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Accounting Date of Withhold" icon="terp-go-month" domain="[]"  context="{'group_by':'date_ret'}"/>
+                        <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" domain="[]"  context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Accounting Date of Withhold" domain="[]"  context="{'group_by':'date_ret'}"/>
                     </group>
                </search>
             </field>
@@ -87,7 +87,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state=='draft'" string="Social Responsibility Commitment Withholding">
                     <field name="name"/>
-                    <field name="type"/>
+                    <field name="type" readonly="1"/>
                     <field name="code"/>
                     <field name="number"/>
                     <field name="partner_id"/>
@@ -107,11 +107,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Social Responsibility Commitment Withholding">
+                    <field name="uid_wh_agent" invisible="1"/>
+                    <field name="partner_list" string="Partners List" 
+                        context="{'partner_list': partner_list} " invisible="1"/>
                     <group colspan="4" col="6">
                         <field name="journal_id"/>
-                        <field name="type"/>
+                        <field name="type" readonly="1"/>
                         <field name="code"/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id)"/>
+                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" 
+                        attrs="{'readonly':['&amp;',('uid_wh_agent','=',False),('type','=','in_invoice')]}" 
+                        domain="[('id','in',context.get('partner_list' , False))]" />
                         <field name="currency_id"/>
                         <field name="date_ret"/>
                         <field name="account_id"/>
@@ -132,10 +137,10 @@
                                 <field name="state"/>
                             </group>
                             <group col="4" colspan="2">
-                                <button name="wh_src_confirmed" states="draft" string="Confirm" icon="gtk-ok"/>
-                                <button name="wh_src_done" states="confirmed" string="Done" icon="gtk-execute"/>
-                                <button name="wh_src_cancel" states="done" string="Cancel" icon="gtk-cancel"/>
-                                <button name="wh_src_draft" states="cancel,confirmed" string="Set to draft" icon="gtk-refresh"/>
+                                <button name="wh_src_confirmed" states="draft" string="Confirm" />
+                                <button name="wh_src_done" states="confirmed" string="Done" />
+                                <button name="wh_src_cancel" states="done" string="Cancel" />
+                                <button name="wh_src_draft" states="cancel,confirmed" string="Set to draft" />
                             </group>
                         </page>
                         <page string="Other Information">
@@ -153,7 +158,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('type','=','out_invoice')]</field>
-            <field name="context">{'type':'out_invoice'}</field>
+            <field name="context">{'default_type':'out_invoice', 'type':'out_invoice' }</field>
             <field name="search_view_id" ref="view_wh_src_filter"/>
             <field name="help">With Social Responsibility Commitment Withholding Customer you can create and manage document withholding issued to your customers. OpenERP can also generate document withholding automatically from invoices. For retention must add the invoices, process them and then validate the document.</field>
         </record>
@@ -185,7 +190,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('type','=','in_invoice')]</field>
-            <field name="context">{'type':'in_invoice'}</field>
+            <field name="context">{'default_type':'in_invoice','type':'in_invoice'}</field>
             <field name="search_view_id" ref="view_wh_src_filter"/>
             <field name="help">With Social Responsibility Commitment Withholding Supplier you can create and manage document withholding issued to your customers. OpenERP can also generate document withholding automatically from invoices. For retention must add the invoices, process them and then validate the document.</field>
         </record>
 
=== modified file 'l10n_ve_withholding_src/wizard/__init__.py'
--- l10n_ve_withholding_src/wizard/__init__.py	2012-01-26 04:52:17 +0000
+++ l10n_ve_withholding_src/wizard/__init__.py	2013-01-14 19:15:27 +0000
@@ -23,7 +23,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-import wizard_ret_munici_xml
+#~ import wizard_ret_munici_xml
+import wizard_retention
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'l10n_ve_withholding_src/wizard/wizard_retention.py'
--- l10n_ve_withholding_src/wizard/wizard_retention.py	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_src/wizard/wizard_retention.py	2013-01-14 19:15:27 +0000
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: Vauxoo C.A.           
+#    Planified by: Humberto Arocha
+#    Audited by: Vauxoo 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/>.
+################################################################################
+
+import wizard
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+class wiz_retention(osv.osv_memory):
+    _name = 'wiz.retention'
+    _description = "Wizard that changes the retention value"
+
+    def set_retention(self, cr, uid, ids, context=None):
+        if context is None:
+            context={}
+        data = self.pool.get('wiz.retention').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_retention = data['name']
+                
+        if n_retention and n_retention > 5:
+            raise osv.except_osv(_("Error!"), _("Maximum retention is 5%"))
+        else:
+            invoice = inv_obj.browse(cr, uid, context['active_id'])
+            inv_obj.write(cr, uid, context.get('active_id'), {'wh_src_rate': n_retention}, context=context)
+        
+        return {}
+
+    _columns = {
+        'name': fields.float('Retention Value', required=True),
+        'sure': fields.boolean('Are you sure?'),
+    }
+    
+wiz_retention()
+
 
=== added file 'l10n_ve_withholding_src/wizard/wizard_retention_view.xml'
--- l10n_ve_withholding_src/wizard/wizard_retention_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_src/wizard/wizard_retention_view.xml	2013-01-14 19:15:27 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        
+        <record model="ir.ui.view" id="wizard_retention_form">
+            <field name="name">wizard.retention.form</field>
+            <field name="model">wiz.retention</field>
+            <field name="arch" type="xml">
+                <form string="Are you sure you want to do this?" version="7.0">
+                    <label for="name" />
+                    <field name="name" />
+                    <newline/><newline/>
+                    <label for="sure" />
+                    <field name="sure" />
+                        
+                    <footer>
+                        <button name="set_retention" string="Confirm" type="object" icon="terp-check" class="oe_highlight"/>
+                        or
+                        <button special='cancel' string="Cancel" icon="terp-gtk-stop" class="oe_link" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+    
+     <record id="action_wiz_retention" model="ir.actions.act_window">
+      <field name="name">Change retention</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">wiz.retention</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+    
+    </data>
+</openerp>