Merge lp:~vauxoo/openerp-venezuela-localization/hbto_wh_iva into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[hbto [Vauxoo] http://www.vauxoo.com]

Propuesta de merge para modulo de Retencion IVA tanto para clientes como proveedores,

la propuesta de merge tiene por el momento la finalidad de ir verificando si existe

algun conflicto con la version que actualmente se encuentra al aire.

[lp:~vauxoo/openerp-venezuela-localization/hbto_wh_iva]

494. By hbto [Vauxoo] http://www.vauxoo.com on 2011-12-22

[FIX] Minor changes in order to avoid conflict in merge proposal

Unmerged revisions

=== modified file 'l10n_ve_withholding/invoice.py'
--- l10n_ve_withholding/invoice.py	2011-10-30 22:07:10 +0000
+++ l10n_ve_withholding/invoice.py	2011-12-21 21:25:27 +0000
@@ -31,11 +31,19 @@
 
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
-
+    
+    
+    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, 
+                            name, context=None):
+        if context is None: context = {}
+        return []
+        
     def ret_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, 
                             period_id, pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
-                            name, context=None):
+                            name, to_wh, context=None):
         if context is None:
             context = {}
         #TODO check if we can use different period for payment and the writeoff line
@@ -53,21 +61,18 @@
             'ref':invoice.number,
             'date': date,
             'currency_id': False,
-        }
-        l2 = {
-            'debit': direction * pay_amount<0 and - direction * pay_amount,
-            'credit': direction * pay_amount>0 and direction * pay_amount,
-            'account_id': pay_account_id,
-            'partner_id': invoice.partner_id.id,
-            'ref':invoice.number,
-            'date': date,
-            'currency_id': False,
-        }
-
-        l1['name'] = name
-        l2['name'] = name
-
-        lines = [(0, 0, l1), (0, 0, l2)]
+            'name':name
+        }
+        lines = [(0, 0, l1)]
+
+        l2 = self._get_move_lines(cr, uid, ids, to_wh, period_id, 
+                            pay_journal_id, writeoff_acc_id, 
+                            writeoff_period_id, writeoff_journal_id, date, 
+                            name, context=context)
+        if not l2:
+            raise osv.except_osv(_('Warning !'), _('No accounting moves were created.\n Please, Check if there are Taxes/Concepts to withhold in the Invoices!'))
+        lines += l2
+
         move = {'ref': invoice.number, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
 

=== modified file 'l10n_ve_withholding_iva/__init__.py'
--- l10n_ve_withholding_iva/__init__.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/__init__.py	2011-12-21 21:25:27 +0000
@@ -22,13 +22,7 @@
 #    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 wh_iva
-import account
-import invoice
-import partner
-import generate_txt
+import model
 import report
-import installer
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
--- l10n_ve_withholding_iva/__openerp__.py	2011-10-28 17:13:52 +0000
+++ l10n_ve_withholding_iva/__openerp__.py	2011-12-21 21:25:27 +0000
@@ -8,6 +8,7 @@
 #    Coded by:  Javier Duran              <[e-mail]>
 #               Maria Gabriela Quilarque  <[e-mail]>
 #               Nhomar Hernandez          <[e-mail]>
+#               Humberto Arocha           <[e-mail]>
 #    Planified by: Nhomar Hernandez
 #    Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
 #    Audited by: Humberto Arocha [e-mail]
@@ -27,7 +28,7 @@
 ##############################################################################
 {
     "name" : "Management withholding vat based in the Venezuelan tax laws",
-    "version" : "0.2",
+    "version" : "1.0",
     "author" : "Vauxoo",
     "website" : "http://vauxoo.com",
     "category": 'Generic Modules/Accounting',
@@ -47,20 +48,19 @@
     'init_xml': [],
     "depends" : ["l10n_ve_withholding"],
     'update_xml': [
-        'withholding_vat_report.xml',
         'security/wh_iva_security.xml',
         'security/ir.model.access.csv',
-        'generate_txt_view.xml',
-        'txt_wh_report.xml',
-        'account_invoice_view.xml',
-        'account_view.xml',
-        'partner_view.xml',
-        'wh_iva_view.xml',
+        'view/generate_txt_view.xml',
+        'view/account_invoice_view.xml',
+        'view/account_view.xml',
+        'view/partner_view.xml',
+        'view/wh_iva_view.xml',
         "data/l10n_ve_withholding_data.xml",
-        "wh_iva_workflow.xml",
-        "account_workflow.xml",        
-        "l10n_ve_withholding_iva_installer.xml",
-        "account_workflow.xml",
+        'report/txt_wh_report.xml',
+        'report/withholding_vat_report.xml',
+        "workflow/wh_iva_workflow.xml",
+        "workflow/account_workflow.xml",        
+        "wizard/l10n_ve_withholding_iva_installer.xml",
     ],
     'demo_xml': ["demo/l10n_ve_withholding_iva_demo.xml"],
     'test': [],

=== added file 'l10n_ve_withholding_iva/files/IVA_LIBROS.pdf'
Binary files l10n_ve_withholding_iva/files/IVA_LIBROS.pdf	1970-01-01 00:00:00 +0000 and l10n_ve_withholding_iva/files/IVA_LIBROS.pdf	2011-12-21 21:25:27 +0000 differ
=== added directory 'l10n_ve_withholding_iva/model'
=== added file 'l10n_ve_withholding_iva/model/__init__.py'
--- l10n_ve_withholding_iva/model/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_iva/model/__init__.py	2011-12-21 21:25:27 +0000
@@ -0,0 +1,34 @@
+#!/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: Nhomar Hernandez
+#    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 wh_iva
+import account
+import invoice
+import partner
+import generate_txt
+import report
+import installer
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'l10n_ve_withholding_iva/account.py' => 'l10n_ve_withholding_iva/model/account.py'
--- l10n_ve_withholding_iva/account.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/model/account.py	2011-12-21 21:25:27 +0000
@@ -29,9 +29,25 @@
 class account_tax(osv.osv):
     _inherit = 'account.tax'
     _columns = {
-        'ret': fields.boolean('Withhold', help="Indicate if the amount of tax must be withholded"),
+        'ret': fields.boolean('Withholdable', help="Indicate if the tax must be withholded"),
+        'wh_vat_collected_account_id': fields.many2one(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Invoice Withholding VAT Account",
+            method=True,
+            view_load=True,
+            domain="[('type', '=', 'other')]",
+            help="This account will be used when applying a withhold to an Invoice"),
+        'wh_vat_paid_account_id': fields.many2one(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Refund Withholding VAT Account",
+            method=True,
+            view_load=True,
+            domain="[('type', '=', 'other')]",
+            help="This account will be used when applying a withhold to a Refund"),
    }
 
 account_tax()
-
-

=== renamed file 'l10n_ve_withholding_iva/generate_txt.py' => 'l10n_ve_withholding_iva/model/generate_txt.py'
=== renamed file 'l10n_ve_withholding_iva/installer.py' => 'l10n_ve_withholding_iva/model/installer.py'
=== renamed file 'l10n_ve_withholding_iva/invoice.py' => 'l10n_ve_withholding_iva/model/invoice.py'
--- l10n_ve_withholding_iva/invoice.py	2011-11-21 16:55:16 +0000
+++ l10n_ve_withholding_iva/model/invoice.py	2011-12-21 21:25:27 +0000
@@ -142,9 +142,11 @@
         return lines
 
     def wh_iva_line_create(self, cr, uid, inv):
+        wh_iva_rate = inv.type in ('in_invoice', 'in_refund') and inv.partner_id.wh_iva_rate or inv.type in ('out_invoice', 'out_refund') and inv.company_id.partner_id.wh_iva_rate
         return (0, False, {
             'name': inv.name or inv.number,
             'invoice_id': inv.id,
+            'wh_iva_rate': wh_iva_rate,
         })
 
     def action_wh_iva_create(self, cr, uid, ids, *args):
@@ -154,10 +156,10 @@
                 raise osv.except_osv('Invalid Action !', _('This invoice is already withholded'))
             ret_line = []
             if inv.type in ('out_invoice', 'out_refund'):
-                acc_id = inv.partner_id.property_wh_iva_receivable.id
+                acc_id = inv.partner_id.property_account_receivable.id
                 wh_type = 'out_invoice'
             else:
-                acc_id = inv.partner_id.property_wh_iva_payable.id
+                acc_id = inv.partner_id.property_account_payable.id
                 wh_type = 'in_invoice'
                 if not acc_id:
                     raise osv.except_osv('Invalid Action !',\
@@ -209,7 +211,7 @@
         if context is None:
             context={}
         return any([line.tax_id.ret for line in self.browse(cr, uid, ids[0], context=context).tax_line])
- 
+
     def check_wh_apply(self, cr, uid, ids, context=None):
         if context is None:
             context={}
@@ -218,10 +220,42 @@
         wh_apply.append(self._withholding_partner(cr, uid, ids, context=context))
         return all(wh_apply)
 
+    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, 
+                            name, context=None):
+        if context is None: context = {}
+        res = super(account_invoice,self)._get_move_lines(cr, uid, ids, to_wh, period_id, 
+                            pay_journal_id, writeoff_acc_id, 
+                            writeoff_period_id, writeoff_journal_id, date, 
+                            name, context=context)
+        if context.get('vat_wh',False):
+            invoice = self.browse(cr, uid, ids[0])
+            
+            types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+            direction = types[invoice.type]
+
+            for tax_brw in to_wh:
+                if 'invoice' in invoice.type:
+                    acc = tax_brw.tax_id.wh_vat_collected_account_id and tax_brw.tax_id.wh_vat_collected_account_id.id or False
+                elif 'refund' in invoice.type:
+                    acc = tax_brw.tax_id.wh_vat_paid_account_id and tax_brw.tax_id.wh_vat_paid_account_id or False
+                if not acc:
+                    raise osv.except_osv(_('Missing Account in Tax!'),_("Tax [%s] has missing account. Please, fill the missing fields") % (tax_brw.tax_id.name,))
+                res.append((0,0,{
+                    'debit': direction * tax_brw.amount_ret<0 and - direction * tax_brw.amount_ret,
+                    'credit': direction * tax_brw.amount_ret>0 and direction * tax_brw.amount_ret,
+                    'account_id': acc,
+                    'partner_id': invoice.partner_id.id,
+                    'ref':invoice.number,
+                    'date': date,
+                    'currency_id': False,
+                    'name':name
+                }))
+        
+        return res
 account_invoice()
 
-
-
 class account_invoice_tax(osv.osv):
     _inherit = 'account.invoice.tax'
     _columns = {
@@ -229,7 +263,6 @@
         'base_ret': fields.float('Amount', digits_compute= dp.get_precision('Withhold'), help="Amount without tax"),
     }
 
-
     def compute_amount_ret(self, cr, uid, invoice_id, context={}):
         res = {}
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)

=== renamed file 'l10n_ve_withholding_iva/partner.py' => 'l10n_ve_withholding_iva/model/partner.py'
=== renamed file 'l10n_ve_withholding_iva/wh_iva.py' => 'l10n_ve_withholding_iva/model/wh_iva.py'
--- l10n_ve_withholding_iva/wh_iva.py	2011-11-21 19:16:13 +0000
+++ l10n_ve_withholding_iva/model/wh_iva.py	2011-12-21 21:25:27 +0000
@@ -28,8 +28,193 @@
 from tools.translate import _
 import decimal_precision as dp
 
-
-class account_wh_iva(osv.osv):
+class account_wh_iva_line_tax(osv.osv):
+    _name = 'account.wh.iva.line.tax'
+account_wh_iva_line_tax()
+
+class account_wh_iva_line(osv.osv):
+    _name = "account.wh.iva.line"
+account_wh_iva_line()
+
+class account_wh_iva(osv.osv):
+    _name = "account.wh.iva"
+account_wh_iva()
+
+class account_wh_iva_line_tax(osv.osv):
+    
+    def _set_amount_ret(self, cr, uid, id, name, value, arg, ctx=None):
+        if ctx is None: 
+            ctx = {}
+        if not self.browse(cr,uid,id,context=ctx).wh_vat_line_id.retention_id.type=='out_invoice':
+            return False
+        sql_str = """UPDATE account_wh_iva_line_tax set
+                    amount_ret='%s'
+                    WHERE id=%d """ % (value, id)
+        cr.execute(sql_str)
+        return True
+        
+    def _get_amount_ret(self, cr, uid, ids, fieldname, args, context=None):
+        if context is None: context=None
+        res = {}
+        
+        awilt_brw = self.browse(cr, uid, ids, context=context)
+        
+        for each in awilt_brw:
+            #~ TODO: THIS NEEDS REFACTORY IN ORDER TO COMPLY WITH THE SALE WITHHOLDING
+            res[each.id] = each.amount * each.wh_vat_line_id.wh_iva_rate /100.0
+        return res
+    
+    _name = 'account.wh.iva.line.tax'
+    _columns = {
+        'inv_tax_id': fields.many2one('account.invoice.tax', 'Invoice Tax', required=True, ondelete='set null', help="Tax Line"),
+        'wh_vat_line_id':fields.many2one('account.wh.iva.line', 'Withholding VAT Line', required=True, ondelete='cascade',),
+        'tax_id': fields.related('inv_tax_id', 'tax_id', type='many2one',relation='account.tax', string='Tax', store=True, select=True, readonly=True, ondelete='set null'),
+        'name': fields.related('inv_tax_id', 'name', type='char', string='Tax Name', size=256, store=True, select=True, readonly=True, ondelete='set null'),
+        'base': fields.related('inv_tax_id', 'base', type='float', string='Tax Base', store=True, select=True, readonly=True, ondelete='set null'),
+        'amount': fields.related('inv_tax_id', 'amount', type='float', string='Taxed Amount', store=True, select=True, readonly=True, ondelete='set null'),
+        # Otro campo related
+        'company_id': fields.related('inv_tax_id', 'company_id', type='many2one',relation='res.company', string='Company', store=True, select=True, readonly=True, ondelete='set null'),
+        'amount_ret': fields.function(
+            _get_amount_ret,
+            method=True,
+            type='float',
+            string='Withheld Taxed Amount',
+            digits_compute= dp.get_precision('Withhold'), 
+            store= {
+                'account.wh.iva.line.tax': (lambda self, cr, uid, ids, c={}: ids, ['amount'],15)
+            },
+            fnct_inv=_set_amount_ret,
+            help="Withholding vat amount"),
+        #~ 'amount_ret': fields.float('Withheld Taxed Amount', digits_compute= dp.get_precision('Withhold'), help="Withholding vat amount"),
+    }
+
+account_wh_iva_line_tax()
+
+class account_wh_iva_line(osv.osv):
+    
+    ####################################################################
+    #~ ESTO SE DEBE BORRAR UNA VEZ QUE SE TERMINE
+    #~ DE DEFINIR LA EXISTENCIA DE LAS LINEAS NUEVAS PARA RETENCION
+    ####################################################################
+    
+    def _compute_tax_lines(self, cr, uid, ids, name, args, context=None):
+        if context is None: context = {}
+        res = {}
+        awilt_obj = self.pool.get('account.wh.iva.line.tax')
+        for ret_line in self.browse(cr, uid, ids, context):
+            lines = []
+            if ret_line.invoice_id:
+                tax_ids = [i.id for i in ret_line.invoice_id.tax_line if i.tax_id and i.tax_id.ret]
+                for i in tax_ids:
+                    lines.append(awilt_obj.create(cr, uid, {
+                            'inv_tax_id':i,
+                            'wh_vat_line_id':ret_line.id
+                                                }, context=context))
+            res[ret_line.id] = lines
+        return res
+
+    def _get_tax_lines(self, cr, uid, tax_id_brw, context=None):
+        if context is None: context = {}
+        return {
+            'inv_tax_id':tax_id_brw.id,
+            'tax_id':tax_id_brw.tax_id.id,
+            'name':tax_id_brw.tax_id.name,
+            'base':tax_id_brw.base,
+            'amount':tax_id_brw.amount,
+            'company_id':tax_id_brw.company_id.id,
+            'wh_iva_rate':tax_id_brw.invoice_id.partner_id.wh_iva_rate
+        }
+    
+    def load_taxes(self, cr, uid, ids, context=None):
+        if context is None: context = {}
+        awilt_obj = self.pool.get('account.wh.iva.line.tax')
+        for ret_line in self.browse(cr, uid, ids, context):
+            lines = []
+            if ret_line.invoice_id:
+                rate = \
+                    ret_line.retention_id.type == 'out_invoice' and ret_line.invoice_id.company_id.partner_id.wh_iva_rate or \
+                    ret_line.retention_id.type == 'in_invoice' and ret_line.invoice_id.partner_id.wh_iva_rate
+                self.write(cr, uid, ret_line.id, {'wh_iva_rate':  rate})
+                tax_lines = awilt_obj.search(cr, uid, [('wh_vat_line_id', '=', ret_line.id)])
+                if tax_lines:
+                    awilt_obj.unlink(cr, uid, tax_lines)
+                
+                tax_ids = [i for i in ret_line.invoice_id.tax_line if i.tax_id and i.tax_id.ret]
+                for i in tax_ids:
+                    values = self._get_tax_lines(cr, uid, i, context=context)
+                    values.update({'wh_vat_line_id':ret_line.id,})
+                    lines.append(awilt_obj.create(cr, uid, values, context=context))
+        return True
+
+    ####################################################################
+    #~ FIN DEL BORRADO
+    ####################################################################
+    
+    def _amount_all(self, cr, uid, ids, fieldname, args, context=None):
+        res = {}
+        for ret_line in self.browse(cr, uid, ids, context):
+            res[ret_line.id] = {
+                'amount_tax_ret': 0.0,
+                'base_ret': 0.0
+            }
+            for line in ret_line.tax_line:
+                res[ret_line.id]['amount_tax_ret'] += line.amount_ret
+                res[ret_line.id]['base_ret'] += line.base
+
+        return res
+
+    _name = "account.wh.iva.line"
+    _description = "Withholding vat line"
+    _columns = {
+        'name': fields.char('Description', size=64, required=True, help="Withholding line Description"),
+        'retention_id': fields.many2one('account.wh.iva', 'Withholding vat', ondelete='cascade', help="Withholding vat"),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice', required=True, ondelete='set null', help="Withholding invoice"),
+        #########################################
+        #~ REDEFINIENDO EL CAMPO TAX LINE,
+        #~ AHORA SERA UN NUEVO MODELO EL QUE LLEVARA A CABO TAL TAREA
+        'tax_line': fields.one2many('account.wh.iva.line.tax','wh_vat_line_id', string='Taxes', help="Invoice taxes"),
+        #~ 'tax_line': fields.function(_compute_tax_lines, method=True, relation='account.wh.iva.line.tax', type="one2many", string='Taxes', help="Invoice taxes",store = {'account.wh.iva.line': (lambda  self, cr, uid, ids, c={}: ids,['invoice_id'],15)}),
+        #~ 'tax_line': fields.function(_compute_tax_lines, method=True, relation='account.invoice.tax', type="one2many", string='Taxes', help="Invoice taxes"),
+        #########################################
+        'amount_tax_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"),
+#        'retention_rate': fields.function(_retention_rate, method=True, string='Wh. rate', type='float', help="Withholding rate"),
+        'move_id': fields.many2one('account.move', 'Account Entry', readonly=True, help="Account entry"),
+        #~ 'amount_base_wh': fields.float('Amount', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount without tax"),        
+        #~ 'amount_tax_wh': fields.float('Amount wh. tax vat', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount withholding tax vat"),        
+        'wh_iva_rate': fields.float(string='Withholding Vat Rate', digits_compute= dp.get_precision('Withhold'), help="Withholding vat rate"),
+    }
+
+    _sql_constraints = [
+      ('ret_fact_uniq', 'unique (invoice_id)', 'The invoice has already assigned in withholding vat, you cannot assigned it twice!')
+    ] 
+
+    def invoice_id_change(self, cr, uid, ids, invoice, context=None):
+        if context is None:
+            context = {}
+        if not invoice:
+            return {}
+        result = {}
+        lst=[]
+        domain = {}
+        ok = True
+        res = self.pool.get('account.invoice').browse(cr, uid, invoice, context=context)
+        cr.execute('select retention_id from account_wh_iva_line where invoice_id=%s', (invoice,))
+        ret_ids = cr.fetchone()
+        ok = ok and bool(ret_ids)
+        if ok:
+            ret = self.pool.get('account.wh.iva').browse(cr, uid, ret_ids[0], context)
+            raise osv.except_osv('Assigned Invoice !',"The invoice has already assigned in withholding vat code: '%s' !" % (ret.code,))
+
+        result['name'] = res.name
+
+
+        return {'value':result, 'domain':domain}
+
+account_wh_iva_line()
+
+class account_wh_iva(osv.osv):
+
     def _amount_ret_all(self, cr, uid, ids, name, args, context=None):
         res = {}
         for retention in self.browse(cr, uid, ids, context):
@@ -94,8 +279,8 @@
         'journal_id': fields.many2one('account.journal', 'Journal', required=True,readonly=True, states={'draft':[('readonly',False)]}, help="Journal entry"),
         'company_id': fields.many2one('res.company', 'Company', required=True, help="Company"),
         'wh_lines': fields.one2many('account.wh.iva.line', 'retention_id', 'Withholding vat lines', readonly=True, states={'draft':[('readonly',False)]}, help="Withholding vat lines"),
-        'tot_amount_base_wh': fields.float('Amount', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount without tax"),
-        'tot_amount_tax_wh': fields.float('Amount wh. tax vat', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount withholding tax vat"),
+        #~ 'tot_amount_base_wh': fields.float('Amount', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount without tax"),
+        #~ 'tot_amount_tax_wh': fields.float('Amount wh. tax vat', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount withholding tax vat"),
         'amount_base_ret': fields.function(_amount_ret_all, method=True, digits_compute= dp.get_precision('Withhold'), string='Compute amount', multi='all', help="Compute amount without tax"),
         'total_tax_ret': fields.function(_amount_ret_all, method=True, digits_compute= dp.get_precision('Withhold'), string='Compute amount wh. tax vat', multi='all', help="compute amount withholding tax vat"),
         
@@ -112,6 +297,43 @@
 
     }
 
+    def _get_valid_wh(self, cr, uid, amount_ret, amount, wh_iva_rate, offset=0.5,  context=None):
+        '''This method can be override in a way that
+        you can afford your own value for the offset'''
+        if context is None: context = {}
+        return amount_ret >= amount * (wh_iva_rate - offset)/100.0 and amount_ret <= amount * (wh_iva_rate + offset)/100.0
+    
+    def check_wh_taxes(self, cr, uid, ids, context=None):
+        if context is None: context = {}
+        res = {}
+        note = _('Taxes in the following invoices have been miscalculated\n\n')
+        for wh_line in self.browse(cr,uid, ids[0]).wh_lines:
+            for tax in wh_line.tax_line:
+                #~ if not self._get_valid_wh(cr, uid, tax.amount_ret, tax.amount, tax.wh_vat_line_id.wh_iva_rate, context=context):
+                if not self._get_valid_wh(cr, uid, tax.amount_ret, tax.amount, tax.wh_vat_line_id.wh_iva_rate, context=context):
+                    if not res.get(wh_line.id, False):
+                        note += _('\tInvoice: %s, %s, %s\n')%(wh_line.invoice_id.name,wh_line.invoice_id.number,wh_line.invoice_id.reference or '/')
+                        res[wh_line.id] = True
+                    note += '\t\t%s\n'%tax.name
+        if res:
+            raise osv.except_osv(_('Miscalculated Withheld Taxes'),note)
+        return True
+
+    def check_vat_wh(self, cr, uid, ids, context={}):
+        obj = self.browse(cr, uid, ids[0])
+        res = {}
+        for wh_line in obj.wh_lines:
+            if not wh_line.tax_line:
+                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 already 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 _check_partner(self, cr, uid, ids, context={}):
         agt = False
         obj = self.browse(cr, uid, ids[0])
@@ -164,21 +386,25 @@
 
     def action_move_create(self, cr, uid, ids, context=None):
         inv_obj = self.pool.get('account.invoice')
-        context = {}
-
-        for ret in self.browse(cr, uid, ids, context):
-            for line in ret.wh_lines:
-                if line.move_id or line.invoice_id.wh_iva:
-                    raise osv.except_osv(_('Invoice already withhold !'),\
-                    _("You must omit the follow invoice '%s' !") %\
-                    (line.invoice_id.name,))
-                    return False
-
-            acc_id = ret.account_id.id
-
-            period_id = ret.period_id and ret.period_id.id or False
-            journal_id = ret.journal_id.id
+        if context is None: context = {}
+
+        ret = self.browse(cr, uid, ids[0], context)
+        for line in ret.wh_lines:
+            if line.move_id or line.invoice_id.wh_iva:
+                raise osv.except_osv(_('Invoice already withhold !'),\
+                _("You must omit the follow invoice '%s' !") %\
+                (line.invoice_id.name,))
+
+        acc_id = ret.account_id.id
+
+        period_id = ret.period_id and ret.period_id.id or False
+        journal_id = ret.journal_id.id
+        if not period_id:
+            per_obj = self.pool.get('account.period')
+            period_id = per_obj.find(cr, uid,ret.date_ret or time.strftime('%Y-%m-%d'))
+            period_id = per_obj.search(cr,uid,[('id','in',period_id),('special','=',False)])
             if not period_id:
+<<<<<<< TREE
                 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]
@@ -201,38 +427,105 @@
                     }
                     lines = [(1, line.id, rl)]
                     self.write(cr, uid, [ret.id], {'wh_lines':lines, 'period_id':period_id})
+=======
+                raise osv.except_osv(_('Missing Periods!'),\
+                _("There are not Periods created for the pointed day: %s!") %\
+                (ret.date_ret or time.strftime('%Y-%m-%d')))
+            period_id = period_id[0]
+        if ret.wh_lines:
+            for line in ret.wh_lines:
+                writeoff_account_id,writeoff_journal_id = False, False
+                amount = line.amount_tax_ret
+                if line.invoice_id.type in ['in_invoice','in_refund']:
+                    name = 'COMP. RET. IVA ' + ret.number + ' Doc. '+ (line.invoice_id.reference or '')
+                else:
+                    name = 'COMP. RET. IVA ' + ret.number + ' Doc. '+ (str(int(line.invoice_id.number)) or '')
+                
+                context.update({'vat_wh':True})
+                ret_move = inv_obj.ret_and_reconcile(cr, uid, [line.invoice_id.id],
+                        amount, acc_id, period_id, journal_id, writeoff_account_id,
+                        period_id, writeoff_journal_id, ret.date_ret, name,line.tax_line, context)
+                # make the withholding line point to that move
+                rl = {
+                    'move_id': ret_move['move_id'],
+                }
+                lines = [(1, line.id, rl)]
+                self.write(cr, uid, [ret.id], {'wh_lines':lines, 'period_id':period_id})
+    
+>>>>>>> MERGE-SOURCE
         return True
 
 
-    def onchange_partner_id(self, cr, uid, ids, type, partner_id):
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,context=None):
+        if context is None: context = {}
+            
         acc_id = False
+        res = {}
+        inv_obj = self.pool.get('account.invoice')
+        
         if partner_id:
             p = self.pool.get('res.partner').browse(cr, uid, partner_id)
             if type in ('out_invoice', 'out_refund'):
-                acc_id = p.property_wh_iva_receivable.id
+                acc_id = p.property_account_receivable and p.property_account_receivable.id or False
             else:
-                acc_id = p.property_wh_iva_payable.id
-
-        self._update_check(cr, uid, ids, partner_id)
-        result = {'value': {
-            'account_id': acc_id}
+                acc_id = p.property_account_payable and p.property_account_payable.id or False
+        
+        wh_line_obj = self.pool.get('account.wh.iva.line')
+        wh_lines = ids and wh_line_obj.search(cr, uid, [('retention_id', '=', ids[0])]) or False
+        res_wh_lines = []
+        if wh_lines:
+            wh_line_obj.unlink(cr, uid, wh_lines)
+        
+        inv_ids = inv_obj.search(cr,uid,[('state', '=', 'open'), ('wh_iva', '=', False), ('partner_id','=',partner_id)],context=context)
+        
+        if inv_ids:
+            #~ Get only the invoices which are not in a document yet
+            inv_ids = [i for i in inv_ids if not wh_line_obj.search(cr, uid, [('invoice_id', '=', i)])]
+            
+        if inv_ids:
+            awil_obj = self.pool.get('account.wh.iva.line')
+            res_wh_lines = [{
+                        'invoice_id':   inv_brw.id,
+                        'name':         inv_brw.name or _('N/A'),
+                        'wh_iva_rate':  inv_brw.partner_id.wh_iva_rate,
+                        #~ 'tax_line': [awil_obj._get_tax_lines(cr, uid, i, context=context) for i in inv_brw.tax_line if i.tax_id and i.tax_id.ret]
+                        
+                        } for inv_brw in inv_obj.browse(cr,uid,inv_ids,context=context)]
+        
+        res = {'value': {
+            'account_id': acc_id,
+            'wh_lines':res_wh_lines}
         }
 
-        return result
+        return res
 
+    #~ ##########################################
+    #~ BEGIN DELETE 
+    #~ ##########################################
+    #~ ESTO SE DEBE BORRAR SI EN EL ONCHANGE 
+    #~ DEL DOCUMENTO YA SE ESTA CONSIDERANDO
+    #~ EL BORRADO DE LOS DOCUMENTOS QUE ESTABAN
+    #~ PREVIAMENTE
+    #~ ##########################################
+    
     def _update_check(self, cr, uid, ids, partner_id, context={}):
         if ids:
             ret = self.browse(cr, uid, ids[0])
             inv_str = ''
             for line in ret.wh_lines:
                 if line.invoice_id.partner_id.id != partner_id:
-                    inv_str+= '%s'% '\n'+line.invoice_id.name
+                    inv_str+= line.invoice_id.name and '%s'% '\n'+line.invoice_id.name or ''
 
             if inv_str:
                 raise osv.except_osv('Incorrect Invoices !',"The following invoices are not the selected partner: %s " % (inv_str,))
 
         return True
 
+    #~ ##########################################
+    #~ END DELETE 
+    #~ ##########################################
+
+
     def _new_check(self, cr, uid, values, context={}):
         lst_inv = []
 
@@ -254,20 +547,6 @@
 
         return True
 
-
-    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        if not context:
-            context={}
-        ret = self.browse(cr, uid, ids[0])
-        if update_check:
-            if 'partner_id' in vals and vals['partner_id']:
-                self._update_check(cr, uid, ids, vals['partner_id'], context)
-            else:
-                self._update_check(cr, uid, ids, ret.partner_id.id, context)
-
-        return super(account_wh_iva, self).write(cr, uid, ids, vals, context=context)
-
-
     def create(self, cr, uid, vals, context=None, check=True):
         if not context:
             context={}
@@ -282,96 +561,21 @@
     def compute_amount_wh(self, cr, uid, ids, context=None):
         res = {}
         if context is None:
-            context = {}        
+            context = {}      
+        awil_obj = self.pool.get('account.wh.iva.line')
         for retention in self.browse(cr, uid, ids, context):
-            res[retention.id] = {
-                'tot_amount_base_wh': 0.0,
-                'tot_amount_tax_wh': 0.0
-            }            
-            for line in retention.wh_lines:
-                res[retention.id]['tot_amount_base_wh'] += line.amount_base_wh
-                res[retention.id]['tot_amount_tax_wh'] += line.amount_tax_wh
-        self.write(cr, uid, [retention.id], res[retention.id])        
+            
+            #~ res[retention.id] = {
+                #~ 'tot_amount_base_wh': 0.0,
+                #~ 'tot_amount_tax_wh': 0.0
+            #~ }
+            whl_ids = [line.id for line in retention.wh_lines]
+            if whl_ids:
+                awil_obj.load_taxes(cr, uid, whl_ids , context=context)
+                
+                #~ res[retention.id]['tot_amount_base_wh'] += line.amount_base_wh
+                #~ res[retention.id]['tot_amount_tax_wh'] += line.amount_tax_wh
+        #~ self.write(cr, uid, [retention.id], res[retention.id])        
         return True
     
 account_wh_iva()
-
-
-
-class account_wh_iva_line(osv.osv):
-    def _compute_tax_lines(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        for ret_line in self.browse(cr, uid, ids, context):
-            lines = []
-            if ret_line.invoice_id:
-                ids_tline = ret_line.invoice_id.tax_line
-                lines = map(lambda x: x.id, ids_tline)
-            result[ret_line.id] = lines
-        return result
-
-    def _amount_all(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        for ret_line in self.browse(cr, uid, ids, context):
-            res[ret_line.id] = {
-                'amount_tax_ret': 0.0,
-                'base_ret': 0.0
-            }
-            for line in ret_line.invoice_id.tax_line:
-                res[ret_line.id]['amount_tax_ret'] += line.amount_ret
-                res[ret_line.id]['base_ret'] += line.base_ret
-
-        return res
-
-    def check_a_retention(self, cr, uid, ids, context=None):
-        amount = 0.0
-        for tax_line in self.browse(cr,uid, ids[0]).tax_line:
-            amount+= tax_line.amount
-        wh_vat_line=self.browse(cr, uid, ids, context)[0]
-        if wh_vat_line.amount_base_wh > amount:
-            raise osv.except_osv(_('Amount Error'),_('the amount is greater than the tax'))
-        return True
-
-
-    _name = "account.wh.iva.line"
-    _description = "Withholding vat line"
-    _columns = {
-        'name': fields.char('Description', size=64, required=True, help="Withholding line Description"),
-        'retention_id': fields.many2one('account.wh.iva', 'Withholding vat', ondelete='cascade', help="Withholding vat"),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', required=True, ondelete='set null', help="Withholding invoice"),
-        'tax_line': fields.function(_compute_tax_lines, method=True, relation='account.invoice.tax', type="one2many", string='Taxes', help="Invoice taxes"),
-        'amount_tax_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"),
-#        'retention_rate': fields.function(_retention_rate, method=True, string='Wh. rate', type='float', help="Withholding rate"),
-        'move_id': fields.many2one('account.move', 'Account Entry', readonly=True, help="Account entry"),
-        'amount_base_wh': fields.float('Amount', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount without tax"),        
-        'amount_tax_wh': fields.float('Amount wh. tax vat', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount withholding tax vat"),        
-
-    }
-
-    _sql_constraints = [
-      ('ret_fact_uniq', 'unique (invoice_id)', 'The invoice has already assigned in withholding vat, you cannot assigned it twice!')
-    ] 
-
-    def invoice_id_change(self, cr, uid, ids, invoice, context=None):
-        if context is None:
-            context = {}
-        if not invoice:
-            return {}
-        result = {}
-        lst=[]
-        domain = {}
-        ok = True
-        res = self.pool.get('account.invoice').browse(cr, uid, invoice, context=context)
-        cr.execute('select retention_id from account_wh_iva_line where invoice_id=%s', (invoice,))
-        ret_ids = cr.fetchone()
-        ok = ok and bool(ret_ids)
-        if ok:
-            ret = self.pool.get('account.wh.iva').browse(cr, uid, ret_ids[0], context)
-            raise osv.except_osv('Assigned Invoice !',"The invoice has already assigned in withholding vat code: '%s' !" % (ret.code,))
-
-        result['name'] = res.name
-
-
-        return {'value':result, 'domain':domain}
-
-account_wh_iva_line()

=== renamed file 'l10n_ve_withholding_iva/txt_wh_report.xml' => 'l10n_ve_withholding_iva/report/txt_wh_report.xml'
=== renamed file 'l10n_ve_withholding_iva/withholding_vat_report.xml' => 'l10n_ve_withholding_iva/report/withholding_vat_report.xml'
=== modified file 'l10n_ve_withholding_iva/report/wittholding_vat.py'
--- l10n_ve_withholding_iva/report/wittholding_vat.py	2011-11-09 21:04:25 +0000
+++ l10n_ve_withholding_iva/report/wittholding_vat.py	2011-12-21 21:25:27 +0000
@@ -147,24 +147,78 @@
         ttal = {}
         lst_comp = []
 
+        dic_inv = {}
         for rl in comp.wh_lines:
-            dic_inv = {}
             lst_tmp = []
             k=1
             no_fac_afe = rl.invoice_id.origin or ''
             if rl.invoice_id.type in ['in_refund', 'out_refund']:
                 k=-1
                 no_fac_afe = rl.invoice_id.parent_id and rl.invoice_id.parent_id.reference or ''
+
+            #~ Codigo para cumplir los cambios en el nuevo uso del campo ret, 
+            #~ y la relacion nueva en account.invoice.tax
+            
             for txl in rl.invoice_id.tax_line:
-                sdcf = False
-                tot_base_imp[types[rl.invoice_id.type]] = tot_base_imp.get(types[rl.invoice_id.type],0.0) + txl.base_ret
-                tot_imp_iva[types[rl.invoice_id.type]] = tot_imp_iva.get(types[rl.invoice_id.type],0.0) + txl.amount
-                tot_iva_ret[types[rl.invoice_id.type]] = tot_iva_ret.get(types[rl.invoice_id.type],0.0) + txl.amount_ret
+                #~ Aqui se esta revisando son los impuestos que estan
+                #~ en la factura solo con el fin de poder obtener
+                #~ solo los impuestos que no son objeto de retencion
+
+                a= (txl.name and txl.name.find('SDCF')!=-1)
+                b= (txl.tax_id and not txl.tax_id.ret)
+                if not any([a,b]):
+                    continue
+                
+                sdcf = False
+                tot_base_imp[types[rl.invoice_id.type]] = tot_base_imp.get(types[rl.invoice_id.type],0.0) + txl.base
+                tot_imp_iva[types[rl.invoice_id.type]] = tot_imp_iva.get(types[rl.invoice_id.type],0.0) + txl.amount
+                tot_iva_ret[types[rl.invoice_id.type]] = tot_iva_ret.get(types[rl.invoice_id.type],0.0) + txl.amount_ret
+
+                if any([a,b]):
+                    tot_comp_sdc[types[rl.invoice_id.type]] = tot_comp_sdc.get(types[rl.invoice_id.type],0.0) + (txl.base+txl.amount)
+                    sdcf = True
+                else:
+                    tot_comp[types[rl.invoice_id.type]] = tot_comp.get(types[rl.invoice_id.type],0.0) + (txl.base+txl.amount)
+
+                d1 = {
+                    'fecha': rl.invoice_id.date_invoice,
+                    'nro_fact': rl.invoice_id.reference,
+                    'nro_ctrl': rl.invoice_id.nro_ctrl,
+                    'nro_ncre': rl.invoice_id.reference,
+                    'nro_ndeb': rl.invoice_id.reference,
+                    'porcenta': rl.invoice_id.wh_iva_rate,
+                    'tip_tran': self._get_tipo_doc(rl.invoice_id.type),
+                    'nro_fafe': no_fac_afe,
+                    'tot_civa': not sdcf and k*(txl.base+txl.amount) or 0.0,
+                    'cmp_sdcr': sdcf and k*(txl.base+txl.amount) or 0.0,
+                    'bas_impo': k*txl.base,
+                    'alic': txl.tax_id.amount and txl.tax_id.amount * 100.0 or 0.0,
+                    'iva': k*txl.amount,
+                    'iva_ret': k*txl.amount_ret,
+                    'inv_type': rl.invoice_id.type
+                }
+                lst_tmp.append(d1)
+                dic_inv[rl.invoice_id.id] = lst_tmp
+            
+            for txl in rl.tax_line:
+                a= (txl.name and txl.name.find('SDCF')!=-1)
+                b= (txl.tax_id and not txl.tax_id.ret)
+                if any([a,b]):
+                    continue
+                sdcf = False
+                tot_base_imp[types[rl.invoice_id.type]] = tot_base_imp.get(types[rl.invoice_id.type],0.0) + txl.base
+                tot_imp_iva[types[rl.invoice_id.type]] = tot_imp_iva.get(types[rl.invoice_id.type],0.0) + txl.amount
+                tot_iva_ret[types[rl.invoice_id.type]] = tot_iva_ret.get(types[rl.invoice_id.type],0.0) + txl.amount_ret
+                
+                #~ TODO: ESTO SE DEBE SOLUCIONAR, MEDIANTE EL USO DEL CAMPO RET 
+                #~ EN EL MODELO ACCOUNT.TAX, DE TAL MANERA QUE SI EL IMPUESTO APARECE
+                #~ CON EL VALOR EN FALSE, Y DADO QUE AHORA CONTAMOS CON UN TAX_ID EN ACCOUNT.INVOICE.TAX
+                #~ PODEMOS HACER EL RASTREO HASTA EL ACCOUNT.TAX
                 if txl.name.find('SDCF')!=-1:
-                    tot_comp_sdc[types[rl.invoice_id.type]] = tot_comp_sdc.get(types[rl.invoice_id.type],0.0) + (txl.base_ret+txl.amount)
+                    tot_comp_sdc[types[rl.invoice_id.type]] = tot_comp_sdc.get(types[rl.invoice_id.type],0.0) + (txl.base+txl.amount)
                     sdcf = True
                 else:
-                    tot_comp[types[rl.invoice_id.type]] = tot_comp.get(types[rl.invoice_id.type],0.0) + (txl.base_ret+txl.amount)
+                    tot_comp[types[rl.invoice_id.type]] = tot_comp.get(types[rl.invoice_id.type],0.0) + (txl.base+txl.amount)
 
                 d1 = {
                     'fecha': rl.invoice_id.date_invoice,
@@ -175,17 +229,18 @@
                     'porcenta': rl.invoice_id.wh_iva_rate,
                     'tip_tran': self._get_tipo_doc(rl.invoice_id.type),
                     'nro_fafe': no_fac_afe,
-                    'tot_civa': not sdcf and k*(txl.base_ret+txl.amount) or 0.0,
-                    'cmp_sdcr': sdcf and k*(txl.base_ret+txl.amount) or 0.0,
-                    'bas_impo': k*txl.base_ret,
-                    'alic': txl.base_amount and (txl.tax_amount/txl.base_amount*100) or 0.0,
+                    'tot_civa': not sdcf and k*(txl.base+txl.amount) or 0.0,
+                    'cmp_sdcr': sdcf and k*(txl.base+txl.amount) or 0.0,
+                    'bas_impo': k*txl.base,
+                    'alic': txl.tax_id.amount and txl.tax_id.amount * 100.0 or 0.0,
                     'iva': k*txl.amount,
                     'iva_ret': k*txl.amount_ret,
                     'inv_type': rl.invoice_id.type
                 }
                 lst_tmp.append(d1)
                 dic_inv[rl.invoice_id.id] = lst_tmp
-                
+        
+        
         for inv_id in dic_inv.keys():
             i=0
             cf = False
@@ -211,7 +266,6 @@
         self.ttbase = tot_base_imp.get('s',0.0) - tot_base_imp.get('r',0.0)
         self.ttiva = tot_imp_iva.get('s',0.0) - tot_imp_iva.get('r',0.0)
         self.ttretencion = tot_iva_ret.get('s',0.0) - tot_iva_ret.get('r',0.0)
-                                
         return lst_comp
 
     def _get_tot_gral_compra(self): 

=== added directory 'l10n_ve_withholding_iva/view'
=== renamed file 'l10n_ve_withholding_iva/account_invoice_view.xml' => 'l10n_ve_withholding_iva/view/account_invoice_view.xml'
=== renamed file 'l10n_ve_withholding_iva/account_view.xml' => 'l10n_ve_withholding_iva/view/account_view.xml'
--- l10n_ve_withholding_iva/account_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/view/account_view.xml	2011-12-21 21:25:27 +0000
@@ -18,6 +18,13 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/group/field[@name='active']" position="after">
                     <field name="ret" />
+                </xpath>
+                <xpath expr="/form/notebook/page[@string='Tax Definition']/group/separator[@string='Tax Declaration: Invoices']" position="before">
+                    <separator colspan="4" string="Withholding Tax Accounts"/>
+                    <field name="wh_vat_collected_account_id" attrs="{'required':[('ret','=',True)]}"/>
+                    <label colspan="2" nolabel="1" string="This account will be used when applying a withhold to an Invoice"/>
+                    <field name="wh_vat_paid_account_id" attrs="{'required':[('ret','=',True)]}"/>
+                    <label colspan="2" nolabel="1" string="This account will be used when applying a withhold to a Refund"/>
                 </xpath>                        
             </field>
         </record>
@@ -26,6 +33,3 @@
 
     </data>
 </openerp>
-
-
-

=== renamed file 'l10n_ve_withholding_iva/generate_txt_view.xml' => 'l10n_ve_withholding_iva/view/generate_txt_view.xml'
=== renamed file 'l10n_ve_withholding_iva/partner_view.xml' => 'l10n_ve_withholding_iva/view/partner_view.xml'
=== renamed file 'l10n_ve_withholding_iva/wh_iva_view.xml' => 'l10n_ve_withholding_iva/view/wh_iva_view.xml'
--- l10n_ve_withholding_iva/wh_iva_view.xml	2011-11-21 19:16:13 +0000
+++ l10n_ve_withholding_iva/view/wh_iva_view.xml	2011-12-21 21:25:27 +0000
@@ -17,10 +17,9 @@
                     <field name="name"/>
                     <field name="invoice_id" on_change="invoice_id_change(invoice_id)" domain="[('state', '=', 'open'), ('wh_iva', '=', False), ('partner_id','=',parent.partner_id)]"/>
 <!--                    <field name="retention_rate" />-->
-                    <field name="base_ret"/>
                     <field name="amount_tax_ret"/>
-                    <field name="amount_base_wh"/>
-                    <field name="amount_tax_wh"/>
+                    <field name="wh_iva_rate" />
+                    <field name="tax_line"/>
                     <field name="move_id"/>
                 </tree>
             </field>
@@ -33,31 +32,53 @@
             <field name="arch" type="xml">
                 <form string="Withholding Lines">
                     <notebook>
-                        <page string="Line">
-                            <field name="invoice_id" on_change="invoice_id_change(invoice_id)" domain="[('state', '=', 'open'), ('wh_iva', '=', False), ('partner_id','=',parent.partner_id)]"/>
-<!--                            <field name="retention_rate" />-->
-                            <field colspan="4" name="name" select="1"/>
+                        <page string="Withheld Invoice">
+                            <field name="invoice_id"  colspan="2" on_change="invoice_id_change(invoice_id)" domain="[('state', '=', 'open'), ('wh_iva', '=', False), ('partner_id','=',parent.partner_id)]"/>
+                            <field colspan="2" name="name" select="1"/>
                             <group col="1" colspan="4">
                                 <field name="tax_line" nolabel="1">
-                                    <tree string="Taxes">
+                                    <tree string="Taxes" editable='top'>
                                         <field name="name"/>
                                         <field name="base" />
                                         <field name="amount" />
-                                        <field name="base_ret" />
                                         <field name="amount_ret" />
-                                        <field invisible="True" name="base_amount"/>
-                                        <field invisible="True" name="tax_amount"/>
                                     </tree>
+                                    <form string="Taxes">
+                                        <field  colspan="4" name="name"/>
+                                        <field name="tax_id" />
+                                        <field name="base" />
+                                        <field name="amount" />
+                                        <field name="amount_ret" />
+                                        <field name="company_id" />
+                                    </form>
                                 </field>
                             </group>
-                            <field name="move_id"/>
-                            <group col="2" colspan="2">
-                                <field name="amount_tax_ret"/>
-                                <field name="base_ret"/>
-                                <field name="amount_base_wh"/>
-                                <field name="amount_tax_wh"/>
-                            </group>
-                            <button name="check_a_retention" string="Validate Amount Retention" type="object"  icon="gtk-ok"/>
+                            <separator colspan='4'/>
+                            <field name="wh_iva_rate" colspan='2' invisible='True'/>
+                            <group col="2" colspan="2">
+                                <label
+                                    string='Please, if there are not taxes loaded, Click on Load Taxes'
+                                    colspan='2'
+                                     />
+                                <vpaned/>
+                                <field colspan='2' name="move_id"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <group col="2" colspan="2">
+                                    <button
+                                        name="load_taxes" 
+                                        string="Load Taxes" 
+                                        type="object"  
+                                        icon="gtk-ok"
+                                        colspan='2'
+                                        />
+                                </group>
+                                <separator/>
+                                <group col="2" colspan="2">
+                                    <field name="amount_tax_ret" colspan='2'/>
+                                    <field name="base_ret" colspan='2' />
+                                </group>
+                            </group>
                         </page>
                     </notebook>
                 </form>
@@ -156,8 +177,12 @@
                                 <button colspan="2" name="compute_amount_wh" states="draft" string="Compute Withholding Vat" type="object" icon="terp-stock_format-scientific"/>
                                 <field name="amount_base_ret"/>
                                 <field name="total_tax_ret"/>
+<!--
                                 <field name="tot_amount_base_wh" groups='l10n_ve_withholding_iva.group_account_wh_iva_manager'/>
+-->
+<!--
                                 <field name="tot_amount_tax_wh" groups='l10n_ve_withholding_iva.group_account_wh_iva_manager'/>
+-->
                             </group>
                         </page>
                         <page string="Other Information">
@@ -198,10 +223,19 @@
                                 <button name="wh_iva_confirmed" states="draft" string="Confirm" icon="gtk-execute"/>
                             </group>
                             <group col="2" colspan="2">
+<<<<<<< TREE
 <!--                                <field name="amount_base_ret"/>-->
 <!--                                <field name="total_tax_ret"/>-->
+=======
+                                <field name="amount_base_ret"/>                           
+                                <field name="total_tax_ret"/>
+<!--
+>>>>>>> MERGE-SOURCE
                                 <field name="tot_amount_base_wh"/>
+-->
+<!--
                                 <field name="tot_amount_tax_wh"/>
+-->
                             </group>
                         </page>
                         <page string="Other Information">

=== renamed file 'l10n_ve_withholding_iva/l10n_ve_withholding_iva_installer.xml' => 'l10n_ve_withholding_iva/wizard/l10n_ve_withholding_iva_installer.xml'
=== added directory 'l10n_ve_withholding_iva/workflow'
=== renamed file 'l10n_ve_withholding_iva/account_workflow.xml' => 'l10n_ve_withholding_iva/workflow/account_workflow.xml'
=== renamed file 'l10n_ve_withholding_iva/wh_iva_workflow.xml' => 'l10n_ve_withholding_iva/workflow/wh_iva_workflow.xml'
--- l10n_ve_withholding_iva/wh_iva_workflow.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/workflow/wh_iva_workflow.xml	2011-12-21 21:25:27 +0000
@@ -16,16 +16,16 @@
 
         <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="wh_iva_order"/>
+            <field name="action">write({'state':'confirmed'})</field>
+            <field name="kind">function</field>
+            <field name="name">confirmed</field>
+        </record>
+
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wh_iva_order"/>
             <field name="action">action_number()
 action_date_ret()
-write({'state':'confirmed'})</field>
-            <field name="kind">function</field>
-            <field name="name">confirmed</field>
-        </record>
-
-        <record id="act_done" model="workflow.activity">
-            <field name="wkf_id" ref="wh_iva_order"/>
-            <field name="action">action_move_create()
+action_move_create()
 write({'state':'done'})</field>
             <field name="kind">function</field>
             <field name="name">done</field>
@@ -34,6 +34,7 @@
         <record id="trans_draft_done" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirmed"/>
+            <field name="condition">check_vat_wh() and check_wh_taxes()</field>
             <field name="signal">wh_iva_confirmed</field>
         </record>