Merge lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_wh_core-dev-hbto into lp:openerp-venezuela-localization

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

[lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_wh_core-dev-hbto]

959. By hbto [Vauxoo] http://www.vauxoo.com on 2013-12-16

[FIX][l10n_ve_withholding_src] lp:~vauxoo/openerp-venezuela-localization/7.0-wh_src-dev_saul

960. By hbto [Vauxoo] http://www.vauxoo.com on 2013-12-17

[MERGE] From Trunk

961. By hbto [Vauxoo] http://www.vauxoo.com on 2013-12-17

[MERGE] From lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_wh_muni-dev-hbto

962. By hbto [Vauxoo] http://www.vauxoo.com on 2013-12-18

[MERGE] From lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_wh_islr-dev-hbto

963. By hbto [Vauxoo] http://www.vauxoo.com on 2013-12-18

[MERGE] From lp:~vauxoo/openerp-venezuela-localization/7.0-wh_islr-dev_saul

964. By hbto [Vauxoo] http://www.vauxoo.com on 2014-01-08

[MERGE] From lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_wh_src-dev-hbto/

965. By hbto [Vauxoo] http://www.vauxoo.com on 2014-01-08

[MERGE] From lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_FB-dev-hbto

966. By hbto [Vauxoo] http://www.vauxoo.com on 2014-01-08

[MERGE] From lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_imex-dev-hbto

Unmerged revisions

=== modified file 'l10n_ve_fiscal_book/model/fiscal_book.py'
--- l10n_ve_fiscal_book/model/fiscal_book.py	2013-06-14 16:36:37 +0000
+++ l10n_ve_fiscal_book/model/fiscal_book.py	2013-12-17 20:29:18 +0000
@@ -62,13 +62,15 @@
         @param field_name: field [get_partner_addr]
         """
         context = context or {}
+        rp_obj = self.pool.get('res.partner')
         res = {}.fromkeys(ids, 'NO HAY DIRECCION FISCAL DEFINIDA')
         #~ TODO: ASK: what company, fisal.book.company_id?
-        addr = self.pool.get('res.users').browse(
-            cr, uid, uid, context=context).company_id.partner_id
+        ru_obj = self.pool.get('res.users')
+        rc_brw = ru_obj.browse(cr, uid, uid, context=context).company_id
+        addr =  rp_obj._find_accounting_partner(rc_brw.partner_id)
         for fb_id in ids:
             if addr:
-                res[fb_id] = addr.type == 'invoice' and (addr.street or '') + \
+                res[fb_id] = (addr.street or '') + \
                     ' ' + (addr.street2 or '') + ' ' + (addr.zip or '') + ' ' \
                     + (addr.city or '') + ' ' + \
                     (addr.country_id and addr.country_id.name or '') + \
@@ -240,7 +242,7 @@
             " according to the Venezuelan RLIVA statement for fiscal" \
             " accounting books. Options:" \
             " - Art. 75: Pruchase Book." \
-            " - Art. 76: Sale Book. Reflects every individual operation datail." \
+            " - Art. 76: Sale Book. Reflects every individual operation detail." \
             " - Art. 77: Sale Book. Groups Non-Tax Payer operations in one " \
             " consolidated line. Only fiscal billing." \
             " - Art. 78: Sale Book. Hybrid for 76 and 77 article. Show" \
@@ -698,12 +700,13 @@
         """
         context = context or {}
         iwdl_obj = self.pool.get('account.wh.iva.line')
+        rp_obj = self.pool.get('res.partner')
         fb_brw = self.browse(cr, uid, fb_id, context=context)
         #~ Relate wh iva lines
         iwdl_ids = self._get_wh_iva_line_ids(cr, uid, fb_id, context=context)
 
-        if fb_brw.type == "purchase" and iwdl_ids \
-                and not fb_brw.company_id.partner_id.wh_iva_agent:
+        if fb_brw.type == "purchase" and iwdl_ids and not \
+                rp_obj._find_accounting_partner(fb_brw.company_id.partner_id).wh_iva_agent:
             raise osv.except_osv(_("Error!"),
                   _("You have withholdings registred but you are not a withholding agent"))
 
@@ -833,6 +836,7 @@
         cf_obj = self.pool.get('customs.form')
         fbl_obj = self.pool.get('fiscal.book.line')
         fb_brw = self.browse(cr, uid, fb_id, context=context)
+        rp_obj = self.pool.get('res.partner')
 
         #~ add book lines for withholding iva lines
         if fb_brw.iwdl_ids:
@@ -845,6 +849,7 @@
             t_type = fb_brw.type == 'sale' and 'tp' or 'do'
             for iwdl_brw in iwdl_obj.browse(cr, uid, iwdl_ids,
                                             context=context):
+                rp_brw =  rp_obj._find_accounting_partner(iwdl_brw.retention_id.partner_id)
                 values = {
                     'iwdl_id': iwdl_brw.id,
                     'rank': my_rank,
@@ -854,8 +859,8 @@
                     'doc_type': self.get_doc_type(cr, uid, iwdl_id=iwdl_brw.id,
                                                   context=context),
                     'wh_number': iwdl_brw.retention_id.number or False,
-                    'partner_name': iwdl_brw.retention_id.partner_id.name or False,
-                    'partner_vat': iwdl_brw.retention_id.partner_id.vat or False,
+                    'partner_name': rp_brw.name or 'N/A',
+                    'partner_vat': rp_brw.vat or 'N/A',
                     'affected_invoice': iwdl_brw.invoice_id.fiscal_printer
                         and iwdl_brw.invoice_id.invoice_printer
                         or (fb_brw.type == 'sale'
@@ -877,6 +882,7 @@
                                                 context=context)
             doc_type = self.get_doc_type(cr, uid, inv_id=inv_brw.id,
                                          context=context)
+            rp_brw =  rp_obj._find_accounting_partner(inv_brw.partner_id)
             values = {
                 'invoice_id': inv_brw.id,
                 'rank': my_rank,
@@ -899,9 +905,9 @@
                 'affected_invoice': (doc_type == "N/DE" or doc_type == "N/CR") \
                                     and (inv_brw.parent_id and inv_brw.parent_id.number or False) \
                                     or False,
-                'partner_name': inv_brw.partner_id.name or False,
-                'partner_vat': inv_brw.partner_id.vat \
-                               and inv_brw.partner_id.vat[2:] or 'N/A',
+                'partner_name': rp_brw.name or 'N/A',
+                'partner_vat': rp_brw.vat \
+                               and rp_brw.vat[2:] or 'N/A',
                 'invoice_number': inv_brw.fiscal_printer
                     and inv_brw.invoice_printer
                     or (fb_brw.type == 'sale'
@@ -928,7 +934,7 @@
         for cf_brw in fb_brw.cf_ids:
 
             cf_partner_brws = \
-                list(set([cfl_brw.tax_code.partner_id
+                list(set([rp_obj._find_accounting_partner(cfl_brw.tax_code.partner_id)
                  for cfl_brw in cf_brw.cfl_ids
                  if not cfl_brw.tax_code.vat_detail]))
 
@@ -943,7 +949,7 @@
             for partner_brw in cf_partner_brws:
                 values = common_values.copy()
                 values['rank'] = my_rank
-                values['partner_name'] = partner_brw.name or False
+                values['partner_name'] = partner_brw.name or 'N/A'
                 values['partner_vat'] = partner_brw.vat \
                                         and  partner_brw.vat[2:] or 'N/A'
                 values['total_with_iva'] = \
@@ -972,6 +978,7 @@
         @param cf_id: customs form id
         @param partner_id: partner id
         """
+        #KEEP AN EYE ON HERE, No check has been made on accounting partner
         context = context or {}
         cf_obj = self.pool.get('customs.form')
         cfl_brws = cf_obj.browse(cr, uid, cf_id, context=context).cfl_ids
@@ -1660,12 +1667,14 @@
         """
         context = context or {}
         inv_obj = self.pool.get('account.invoice')
+        rp_obj = self.pool.get('res.partner')
         inv_brw = inv_obj.browse(cr, uid, inv_id, context=context)
+        rp_brw =  rp_obj._find_accounting_partner(inv_brw.partner_id).id,
         fb_brw = self.browse(cr, uid, fb_id, context=context)
         return inv_brw.customs_form_id \
                and (fb_brw.type == 'sale' and 'ex' or 'im') \
                or (fb_brw.type == 'purchase' and 'do' \
-                  or (inv_brw.partner_id.vat_subjected and 'tp' or 'ntp' ))
+                  or (rp_brw.vat_subjected and 'tp' or 'ntp' ))
 
     def unlink(self, cr, uid, ids, context=None):
         """ Overwrite the unlink method to throw an exception if the book is

=== modified file 'l10n_ve_fiscal_book/wizard/fiscal_book_wizard.py'
--- l10n_ve_fiscal_book/wizard/fiscal_book_wizard.py	2013-05-30 21:11:54 +0000
+++ l10n_ve_fiscal_book/wizard/fiscal_book_wizard.py	2013-12-17 20:29:18 +0000
@@ -87,14 +87,16 @@
     def _do_new_record(self, control, inv_browse):
         invoice = [i for i in inv_browse if i.nro_ctrl == control][0]
         amount = (invoice.amount_tax * invoice.p_ret) / 100
+        rp_obj = self.pool.get('res.partner')
+        rp_brw =  rp_obj._find_accounting_partner(invoice.partner_id).id,
         return (invoice.date_invoice,
                 invoice.date_document,
-                invoice.partner_id.vat,
-                invoice.partner_id.id,
+                rp_brw.vat,
+                rp_brw.id,
                 invoice.number,
                 invoice.nro_ctrl,
                 amount,
-                invoice.partner_id.name)
+                rp_brw.name)
 
     def _do_sale_report(self, cr, uid, data, context=None):
         """

=== modified file 'l10n_ve_imex/model/customs_form.py'
--- l10n_ve_imex/model/customs_form.py	2013-06-14 13:39:39 +0000
+++ l10n_ve_imex/model/customs_form.py	2013-12-17 20:29:18 +0000
@@ -151,10 +151,12 @@
         context = context or {}
         company_id = context.get('f86_company_id')
         f86_cfg = context.get('f86_config')
+        rp_obj = self.pool.get('res.partner')
 
         #~ expenses
         for line in f86.cfl_ids:
             debits = []
+            acc_part_brw = rp_obj._find_accounting_partner(line.tax_code.partner_id)
             if line.tax_code.vat_detail:
                 for vat in line.imex_tax_line:
                     debits.append(
@@ -166,7 +168,7 @@
                                'amount': line.amount, 'tax_info': ''})
 
             credit_account_id = \
-                line.tax_code.partner_id.property_account_payable.id
+                acc_part_brw.property_account_payable.id
 
             for debit in debits:
                 if not debit['account_id'] or not credit_account_id:
@@ -176,13 +178,13 @@
                 lines.append(
                     self._gen_account_move_line(
                         company_id, debit['account_id'],
-                        line.tax_code.partner_id.id, '[%s] %s - %s%s'
+                        acc_part_brw.id, '[%s] %s - %s%s'
                         % (line.tax_code.code, line.tax_code.ref,
                            line.tax_code.name, debit['tax_info']),
                         debit['amount'], 0.0)
                 )
             lines.append(self._gen_account_move_line(
-                company_id, credit_account_id, line.tax_code.partner_id.id,
+                company_id, credit_account_id, acc_part_brw.id,
                 'F86 #%s - %s' % (f86.name, line.tax_code.name), 0.0,
                 line.amount))
 

=== modified file 'l10n_ve_imex/model/invoice.py'
--- l10n_ve_imex/model/invoice.py	2013-11-18 08:53:35 +0000
+++ l10n_ve_imex/model/invoice.py	2013-12-17 20:29:18 +0000
@@ -143,11 +143,13 @@
 
     def on_change_invoice_id(self, cr, uid, ids, invoice_id, context=None):
         context = context or {}
+        rp_obj = self.pool.get('res.partner')
         res = {}
         if invoice_id:
             obj_inv = self.pool.get('account.invoice')
-            inv = obj_inv.browse(cr, uid, invoice_id, context=context)
-            res = {'value': {'partner_id': inv.partner_id.id,
+            inv_brw = obj_inv.browse(cr, uid, invoice_id, context=context)
+            acc_part_brw = rp_obj._find_accounting_partner(inv_brw.partner_id)
+            res = {'value': {'partner_id': acc_part_brw.id,
                              'supplier_invoice_number': inv.supplier_invoice_number}}
         return res
 

=== modified file 'l10n_ve_withholding/model/invoice.py'
--- l10n_ve_withholding/model/invoice.py	2013-12-08 02:37:57 +0000
+++ l10n_ve_withholding/model/invoice.py	2013-12-17 20:29:18 +0000
@@ -49,6 +49,7 @@
         """
         if context is None:
             context = {}
+        rp_obj = self.pool.get('res.partner')
         
         #TODO check if we can use different period for payment and the writeoff line
         assert len(ids)==1, "Can only pay one invoice at a time"
@@ -62,7 +63,7 @@
             'debit': direction * pay_amount>0 and direction * pay_amount,
             'credit': direction * pay_amount<0 and - direction * pay_amount,
             'account_id': src_account_id,
-            'partner_id': invoice.partner_id.id,
+            'partner_id': rp_obj._find_accounting_partner(invoice.partner_id).id,
             'ref':invoice.number,
             'date': date,
             'currency_id': False,

=== modified file 'l10n_ve_withholding_islr/model/invoice.py'
--- l10n_ve_withholding_islr/model/invoice.py	2013-12-04 21:17:57 +0000
+++ l10n_ve_withholding_islr/model/invoice.py	2013-12-17 20:29:18 +0000
@@ -155,8 +155,10 @@
         wh_doc_obj = self.pool.get('islr.wh.doc')
         inv_obj = self.pool.get('account.invoice.line')
         rate_obj = self.pool.get('islr.rates')
+        rp_obj = self.pool.get('res.partner')
 
         row = self.browse(cr, uid, ids[0], context=context)
+        acc_part_id = rp_obj._find_accounting_partner(row.partner_id)
         context['type'] = row.type
         wh_ret_code = wh_doc_obj.retencion_seq_get(cr, uid)
 
@@ -164,7 +166,7 @@
             journal = wh_doc_obj._get_journal(cr, uid, context=context)
             islr_wh_doc_id = wh_doc_obj.create(cr, uid,
                                                {'name': wh_ret_code,
-                                                'partner_id': row.partner_id.id,
+                                                'partner_id': acc_part_id.id,
                                                 'period_id': row.period_id.id,
                                                 'account_id': row.account_id.id,
                                                 'type': row.type,
@@ -251,6 +253,7 @@
         @param name: description
         """
         context = context or {}
+        rp_obj = self.pool.get('res.partner')
         ids = isinstance(ids, (int, long)) and [ids] or ids
         res = super(account_invoice, self)._get_move_lines(cr, uid, ids, to_wh,
                                                            period_id, pay_journal_id, writeoff_acc_id, writeoff_period_id,
@@ -260,6 +263,7 @@
             return res
 
         inv_brw = self.browse(cr, uid, ids[0])
+        acc_part_id = rp_obj._find_accounting_partner(inv_brw.partner_id)
 
         types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1,
                  'in_refund': -1}
@@ -284,7 +288,7 @@
                 'credit': direction * iwdl_brw.amount > 0 and direction *
                 iwdl_brw.amount,
                 'account_id': acc,
-                'partner_id': inv_brw.partner_id.id,
+                'partner_id': acc_part_id.id,
                 'ref': inv_brw.number,
                 'date': date,
                 'currency_id': False,

=== modified file 'l10n_ve_withholding_islr/model/islr_wh_doc.py'
--- l10n_ve_withholding_islr/model/islr_wh_doc.py	2013-12-05 20:57:09 +0000
+++ l10n_ve_withholding_islr/model/islr_wh_doc.py	2013-12-17 20:29:18 +0000
@@ -297,9 +297,8 @@
         acc_id = False
         res = {}
         res_wh_lines = []
+        rp_obj = self.pool.get('res.partner')
         inv_obj = self.pool.get('account.invoice')
-        args = [('state', '=', 'open'), ('islr_wh_doc_id', '=', False),
-                ('partner_id', '=', partner_id)]
 
         # Unlink previous iwdi
         iwdi_obj = self.pool.get('islr.wh.doc.invoices')
@@ -318,14 +317,20 @@
             iwdl_ids = []
 
         if partner_id:
-            p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            acc_part_id = rp_obj._find_accounting_partner(rp_obj.browse(cr, uid, partner_id))
+            args = [('state', '=', 'open'),
+                    ('islr_wh_doc_id', '=', False),
+                    '|',
+                    ('partner_id', '=', acc_part_id.id),
+                    ('partner_id', 'child_of', acc_part_id.id),
+                    ]
             if type in ('out_invoice', 'out_refund'):
-                acc_id = p.property_account_receivable and \
-                    p.property_account_receivable.id
+                acc_id = acc_part_id.property_account_receivable and \
+                    acc_part_id.property_account_receivable.id
                 args += [('type', 'in', ('out_invoice', 'out_refund'))]
             else:
-                acc_id = p.property_account_payable and \
-                    p.property_account_payable.id
+                acc_id = acc_part_id.property_account_payable and \
+                    acc_part_id.property_account_payable.id
                 args += [('type', 'in', ('in_invoice', 'in_refund'))]
 
             inv_ids = inv_obj.search(cr, uid, args, context=context)
@@ -493,12 +498,14 @@
         @param name: withholding voucher name
         """
         inv_obj = self.pool.get('account.invoice')
+        rp_obj = self.pool.get('res.partner')
         ret = self.browse(cr, uid, ids)[0]
         if context is None:
             context = {}
         # TODO check if we can use different period for payment and the writeoff line
         #~ assert len(invoice_ids)==1, "Can only pay one invoice at a time"
         invoice = inv_obj.browse(cr, uid, invoice_id)
+        acc_part_id = rp_obj._find_accounting_partner(invoice.partner_id)
         src_account_id = invoice.account_id.id
         # Take the seq as name for move
         types = {'out_invoice': -1, 'in_invoice':
@@ -511,7 +518,7 @@
             'debit': direction * pay_amount > 0 and direction * pay_amount,
             'credit': direction * pay_amount < 0 and - direction * pay_amount,
             'account_id': src_account_id,
-            'partner_id': invoice.partner_id.id,
+            'partner_id': acc_part_id.id,
             'ref': invoice.number,
             'date': date,
             'currency_id': False,
@@ -520,7 +527,7 @@
             '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,
+            'partner_id': acc_part_id.id,
             'ref': invoice.number,
             'date': date,
             'currency_id': False,
@@ -907,13 +914,15 @@
         invoice and boolean field that determines whether the buyer is 
         retention agent.
         """
-        if invoice.type == 'in_invoice' or invoice.type == 'in_refund':
-            vendor = invoice.partner_id
-            buyer = invoice.company_id.partner_id
-            ret_code = invoice
+        rp_obj = self.pool.get('res.partner')
+        inv_part_id = rp_obj._find_accounting_partner(invoice.partner_id)
+        comp_part_id = rp_obj._find_accounting_partner(invoice.company_id.partner_id)
+        if invoice.type in ('in_invoice', 'in_refund'):
+            vendor = inv_part_id
+            buyer = comp_part_id
         else:
-            buyer = invoice.partner_id
-            vendor = invoice.company_id.partner_id
+            buyer = inv_part_id
+            vendor = comp_part_id
         return (vendor, buyer, buyer.islr_withholding_agent)
 
     def _get_residence(self, cr, uid, vendor, buyer):
@@ -935,12 +944,14 @@
         """ It obtained the nature of the seller from VAT, returns 
         True if natural person, and False if is legal.
         """
-        if not partner_id.vat:
+        rp_obj = self.pool.get('res.partner')
+        acc_part_id = rp_obj._find_accounting_partner(partner_id)
+        if not acc_part_id.vat:
             raise osv.except_osv(_('Invalid action !'), _(
-                "Impossible income withholding, because the partner '%s' has not vat associated!") % (partner_id.name))
+                "Impossible income withholding, because the partner '%s' has not vat associated!") % (acc_part_id.name))
             return False
         else:
-            if partner_id.vat[2:3] in 'VvEe' or partner_id.spn:
+            if acc_part_id.vat[2:3] in 'VvEe' or acc_part_id.spn:
                 return True
             else:
                 return False
@@ -972,17 +983,21 @@
         # DUE TO OPENER HAS CHANGED THE WAY PARTNER
         # ARE USED FOR ACCOUNT_MOVE
         context = context or {}
-        if not partner_id.country_id:
+        rp_obj = self.pool.get('res.partner')
+        acc_part_id = rp_obj._find_accounting_partner(partner_id)
+        if not acc_part_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))
+                "Impossible income withholding, because the partner '%s' country has not been defined in the address!") % (acc_part_id.name))
         else:
-            return partner_id.country_id.id
+            return acc_part_id.country_id.id
 
     def _get_xml_lines(self, cr, uid, ail_brw, context=None):
         """ Extract information from the document to generate xml lines
         @param ail_brw: invoice of the document
         """
         context = context or {}
+        rp_obj = self.pool.get('res.partner')
+        acc_part_id = rp_obj._find_accounting_partner(ail_brw.invoice_id.partner_id)
         vendor, buyer, wh_agent = self._get_partners(
             cr, uid, ail_brw.invoice_id)
         residence = self._get_residence(cr, uid, vendor, buyer)
@@ -1001,7 +1016,7 @@
             'period_id': False,  # We review the definition because it is in NOT NULL
             'invoice_number': ail_brw.invoice_id.supplier_invoice_number,
             'rate_id': rate_id,  # I get it too but from the rate
-            'partner_id': ail_brw.invoice_id.partner_id.id,  # Warning Depends if is a customer or supplier
+            'partner_id': acc_part_id.id,  # Warning Depends if is a customer or supplier
             'concept_id': ail_brw.concept_id.id,
             'partner_vat': vendor.vat[2:12],  # Warning Depends if is a customer or supplier
             'porcent_rete': rate_wh_perc,  # I get it too but from the rate

=== modified file 'l10n_ve_withholding_islr/model/islr_xml_wh.py'
--- l10n_ve_withholding_islr/model/islr_xml_wh.py	2013-12-05 21:44:49 +0000
+++ l10n_ve_withholding_islr/model/islr_xml_wh.py	2013-12-17 20:29:18 +0000
@@ -179,6 +179,7 @@
     def _xml(self, cr,uid,ids):
         """ Transform this document to XML format
         """
+        rp_obj = self.pool.get('res.partner')
         root = ''
         for id in ids:
             wh_brw = self.browse(cr,uid,id)
@@ -194,7 +195,7 @@
             xml_lines=cr.fetchall()
 
             root = Element("RelacionRetencionesISLR")
-            root.attrib['RifAgente'] = wh_brw.company_id.partner_id.vat[2:]
+            root.attrib['RifAgente'] = rp_obj._find_accounting_partner(wh_brw.company_id.partner_id).vat[2:]
             root.attrib['Periodo'] = period2
             for line in xml_lines:
                 partner_vat,control_number,porcent_rete,concept_code,invoice_number,base,inv_id=line
@@ -247,8 +248,9 @@
     def onchange_partner_vat(self, cr, uid, ids, partner_id, context={}):
         """ Changing the partner, the partner_vat field is updated.
         """
-        partner_brw = self.pool.get('res.partner').browse(cr,uid,partner_id)
-        return {'value' : {'partner_vat':partner_brw.vat[2:]}} 
+        rp_obj = self.pool.get('res.partner')
+        acc_part_brw = rp_obj._find_accounting_partner(rp_obj.browse(cr,uid,partner_id))
+        return {'value' : {'partner_vat':acc_part_brw.vat[2:]}} 
         
         
     def onchange_code_perc(self, cr, uid, ids, rate_id, context={}):

=== modified file 'l10n_ve_withholding_islr/view/islr_wh_doc_view.xml'
--- l10n_ve_withholding_islr/view/islr_wh_doc_view.xml	2013-12-02 23:13:31 +0000
+++ l10n_ve_withholding_islr/view/islr_wh_doc_view.xml	2013-12-17 20:29:18 +0000
@@ -110,7 +110,10 @@
                         <field name="journal_id" domain="[('type','=','islr_sale')]"/>
                         <field name="type"/>
                         <field name="code"/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" domain="[('islr_withholding_agent','=',True), ('customer','=',True)]"/>
+                        <field 
+                            name="partner_id" 
+                            on_change="onchange_partner_id(type,partner_id)" 
+                            domain="[('islr_withholding_agent','=',True),('customer','=',True),('parent_id','=',False)]"/>
                         <field name="currency_id" readonly="1"/>
                         <field name="date_ret"/>
                         <field name="account_id" domain="[('type','=', type in ('in_invoice','in_refund') and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
@@ -227,7 +230,10 @@
                         <field name="journal_id" domain="[('type','=','islr_purchase')]"/>
                         <field name="type"/>
                         <field name="code"/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" domain="[('supplier','=',True)]"/>
+                        <field 
+                            name="partner_id" 
+                            on_change="onchange_partner_id(type,partner_id)" 
+                            domain="[('supplier','=',True),('parent_id','=',False)]"/>
                         <field name="currency_id" readonly="1"/>
                         <field name="date_ret"/>
                         <field name="account_id" domain="[('type','=', type in ('in_invoice','in_refund') and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
@@ -264,7 +270,12 @@
                                     </field>
                                 </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"/>
+                                    <field 
+                                        name="islr_wh_doc_id" 
+                                        domain="[('partner_id','=',partner_id),('status','=','no_pro'),('state','in',['open','paid']),('type','in',['in_invoice','in_refund'])]" 
+                                        colspan="6" 
+                                        nolabel="1" 
+                                        widget="many2many"/>
                                 </page>
                                 <page string="Income Withholding Concepts">
                                     <field colspan="6" name="concept_ids" nolabel="1">

=== modified file 'l10n_ve_withholding_islr/view/islr_xml_wh.xml'
--- l10n_ve_withholding_islr/view/islr_xml_wh.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_islr/view/islr_xml_wh.xml	2013-12-17 20:29:18 +0000
@@ -17,7 +17,11 @@
                         <separator string="Supplier to Withhold" colspan="6"/>
                     <newline/>
                     <group col="4" colspan="4">
-                        <field name="partner_id" colspan="4" on_change="onchange_partner_vat(partner_id)"/>
+                        <field 
+                            name="partner_id" 
+                            domain="[('parent_id','=',False)]"
+                            colspan="4" 
+                            on_change="onchange_partner_vat(partner_id)"/>
                         <field name="partner_vat"/>
                     </group>
                     <newline/>
@@ -74,7 +78,7 @@
                             <field name="xml_ids" nolabel="1" colspan="4" widget="many2many" domain="[('period_id','=',period_id), ('islr_xml_wh_doc','=',False)]">
                                 <tree string="Detail of the XML">
                                     <field name="partner_vat"/>
-                                    <field name="partner_id"/>
+                                    <field name="partner_id" domain="[('parent_id','=',False)]"/>
                                     <field name="invoice_number"/>
                                     <field name="concept_code"/>
                                     <field name="base"/>
@@ -153,4 +157,4 @@
         <menuitem name="Generate file XML" id="menu_action_xml_islr" parent="l10n_ve_fiscal_requirements.menu_venezuela_reporting" action="action_xml_islr"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
--- l10n_ve_withholding_iva/__openerp__.py	2013-12-06 15:57:10 +0000
+++ l10n_ve_withholding_iva/__openerp__.py	2013-12-17 20:29:18 +0000
@@ -73,26 +73,13 @@
             ],
 
     'test': [
-#            'test/iva_purchase.yml',
-#            'test/iva_purchase_wh.yml',
-#            'test/iva_purchase_nret1.yml',
-#            'test/iva_purchase_nret2.yml',
-#            'test/iva_purchase_nret3.yml',
-#            'test/iva_sale.yml',
-#            'test/iva_sale_wh.yml',
-#            'test/iva_test_invoice.yml',
-#            'test/iva_test_wh.yml',
-#            'test/iva_test_wh_2.yml',
-#            'test/iva_test_wh_3.yml',
-#            'test/iva_test_wh_4.yml',
-
-
              'test/purchase_invoice_wh_iva.yml',
              'test/sale_invoice_wh_iva.yml',
              'test/sale_wh_iva.yml',
              'test/purchase_wh_iva.yml',
              'test/purchase_wh_iva_sequence.yml',
-             'test/sale_wh_iva_sequence.yml'
+             'test/sale_wh_iva_sequence.yml',
+             'test/purchase_wh_iva_txt.yml',
         ],
     'installable': True,
     'active': False,

=== modified file 'l10n_ve_withholding_iva/model/generate_txt.py'
--- l10n_ve_withholding_iva/model/generate_txt.py	2013-12-09 20:58:35 +0000
+++ l10n_ve_withholding_iva/model/generate_txt.py	2013-12-17 20:29:18 +0000
@@ -142,6 +142,7 @@
         """ Current lines are cleaned and rebuilt
         """
         context = context or {}
+        rp_obj = self.pool.get('res.partner')
         voucher_obj = self.pool.get('account.wh.iva')
         txt_iva_obj = self.pool.get('txt.iva.line')
         voucher_ids=''
@@ -156,14 +157,14 @@
             voucher_ids = voucher_obj.search(cr,uid,[('date_ret','>=',txt_brw.date_start),('date_ret','<=',txt_brw.date_end),('period_id','=',txt_brw.period_id.id),('state','=','done'),('type','in',['out_invoice','out_refund'])])
         
         for voucher in voucher_obj.browse(cr,uid,voucher_ids):
-            
+            acc_part_id = rp_obj._find_accounting_partner(voucher.partner_id)   
             for voucher_lines in voucher.wh_lines:
                 
                 if voucher_lines.invoice_id.state not in ['open','paid']: 
                     continue
                 for voucher_tax_line in voucher_lines.tax_line:
                     txt_iva_obj.create(cr,uid,
-                    {'partner_id':voucher.partner_id.id,
+                    {'partner_id':acc_part_id.id,
                     'voucher_id':voucher.id,
                     'invoice_id':voucher_lines.invoice_id.id,
                     'txt_id': txt_brw.id,
@@ -258,12 +259,15 @@
         @param txt: current txt document 
         @param txt_line: One line of the current txt document
         """
+        rp_obj = self.pool.get('res.partner')
+        vat_company = rp_obj._find_accounting_partner(txt.company_id.partner_id).vat[2:]
+        vat_partner = rp_obj._find_accounting_partner(txt_line.partner_id).vat[2:]
         if txt_line.invoice_id.type in ['out_invoice','out_refund']:
-            vendor = txt.company_id.partner_id.vat[2:]
-            buyer  = txt_line.partner_id.vat[2:]
+            vendor = vat_company
+            buyer  = vat_partner
         else:
-            buyer  = txt.company_id.partner_id.vat[2:]
-            vendor = txt_line.partner_id.vat[2:]
+            buyer  = vat_company
+            vendor = vat_partner
         return (vendor,buyer)
 
     def get_max_aliquot(self, cr, uid, txt_line):
@@ -294,8 +298,9 @@
         """
         context = context or {}
         txt_string = ''
+        rp_obj = self.pool.get('res.partner')
         for txt in self.browse(cr,uid,ids,context):
-            vat = txt.company_id.partner_id.vat[2:]
+            vat = rp_obj._find_accounting_partner(txt.company_id.partner_id).vat[2:]
             for txt_line in txt.txt_ids:
                 
                 vendor,buyer=self.get_buyer_vendor(cr,uid,txt,txt_line)

=== modified file 'l10n_ve_withholding_iva/model/invoice.py'
--- l10n_ve_withholding_iva/model/invoice.py	2013-12-06 22:36:33 +0000
+++ l10n_ve_withholding_iva/model/invoice.py	2013-12-17 20:29:18 +0000
@@ -166,18 +166,16 @@
         """
         context = context or {}
         wil_obj = self.pool.get('account.wh.iva.line')
+        rp_obj = self.pool.get('res.partner')
         inv_brw = self.browse(cr, uid, ids, context=context)
         wh_iva_rate = inv_brw.type in ('in_invoice', 'in_refund') \
-                      and inv_brw.partner_id.wh_iva_rate \
-                      or inv_brw.type in ('out_invoice', 'out_refund') \
-                      and inv_brw.company_id.partner_id.wh_iva_rate
+                and rp_obj._find_accounting_partner(inv_brw.partner_id).wh_iva_rate \
+                or rp_obj._find_accounting_partner(inv_brw.company_id.partner_id).wh_iva_rate
         values = {'name': inv_brw.name or inv_brw.number,
                   'invoice_id': inv_brw.id,
                   'wh_iva_rate': wh_iva_rate }
         return wil_obj.create(cr, uid, values, context=context)
 
-
-
     def action_wh_iva_supervisor(self, cr, uid, ids, context=None):
         """ Validate the currencys are equal
         """
@@ -195,7 +193,6 @@
                     raise osv.except_osv('Invalid Action !', _('The currency of the invoice does not match with the currency of the company. Check this please'))
         return True
 
-
     def action_wh_iva_create(self, cr, uid, ids, context=None):
         """ Create withholding objects """
         context = context or {}
@@ -242,14 +239,17 @@
         ids = isinstance(ids, (int, long)) and [ids] or ids
         wh_iva_obj = self.pool.get('account.wh.iva')
         per_obj = self.pool.get('account.period')
+        rp_obj = self.pool.get('res.partner')
         for inv_brw in self.browse(cr, uid, ids, context=context):
+            acc_part_id = rp_obj._find_accounting_partner(inv_brw.partner_id)
             inv_period, inv_fortnight = per_obj.find_fortnight(
                 cr, uid, inv_brw.date_invoice, context=context)
             ttype = inv_brw.type in ["out_invoice", "out_refund"] \
                     and "out_invoice" or "in_invoice"
             acc_wh_ids = wh_iva_obj.search(
-                cr, uid, [('state', '=', 'draft'), ('type', '=', ttype),
-                ('partner_id', '=', inv_brw.partner_id.id),
+                cr, uid, [('state', '=', 'draft'), ('type', '=', ttype), '|',
+                ('partner_id', '=', acc_part_id.id),
+                ('partner_id', 'child_of', acc_part_id.id),
                 ('period_id', '=', inv_period),
                 ('fortnight','=', str(inv_fortnight))], context=context)
             res.append(acc_wh_ids)
@@ -262,14 +262,16 @@
         context = context or {}
         wh_iva_obj = self.pool.get('account.wh.iva')
         per_obj = self.pool.get('account.period')
+        rp_obj = self.pool.get('res.partner')
         ids = isinstance(ids, (int, long)) and [ids] or ids
         res = list()
         for inv_brw in self.browse(cr, uid, ids, context=context):
+            acc_part_id = rp_obj._find_accounting_partner(inv_brw.partner_id)
             if inv_brw.type in ('out_invoice', 'out_refund'):
-                acc_id = inv_brw.partner_id.property_account_receivable.id
+                acc_id = acc_part_id.property_account_receivable.id
                 wh_type = 'out_invoice'
             else:
-                acc_id = inv_brw.partner_id.property_account_payable.id
+                acc_id = acc_part_id.property_account_payable.id
                 wh_type = 'in_invoice'
                 if not acc_id:
                     raise osv.except_osv('Invalid Action !',\
@@ -279,7 +281,7 @@
                 'name':_('ORIGIN %s'%(inv_brw.number)),
                 'type': wh_type,
                 'account_id': acc_id,
-                'partner_id': inv_brw.partner_id.id,
+                'partner_id': acc_part_id.id,
                 'period_id': inv_brw.period_id.id,
                 'wh_lines': [(4, ret_line_id)],
                 'fortnight': str(per_obj.find_fortnight(
@@ -319,10 +321,9 @@
         if context is None:
             context={}
         obj = self.browse(cr, uid, ids[0],context=context)
-        #No create withholding vat for customer invoice
-#        if obj.type in ('out_invoice', 'out_refund') and obj.partner_id.wh_iva_agent:
-#            return True
-        if obj.type in ('in_invoice', 'in_refund') and obj.company_id.partner_id.wh_iva_agent:
+        #No VAT withholding Documents are created for customer invoice & refunds
+        if obj.type in ('in_invoice', 'in_refund') and \
+            self.pool.get('res.partner')._find_accounting_partner(obj.company_id.partner_id).wh_iva_agent:
             return True 
         return False
 
@@ -389,6 +390,7 @@
                             name, context=context)
         if context.get('vat_wh',False):
             invoice = self.browse(cr, uid, ids[0])
+            acc_part_id = self.pool.get('res.partner')._find_accounting_partner(invoice.partner_id)
             
             types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
             direction = types[invoice.type]
@@ -404,7 +406,7 @@
                     '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,
+                    'partner_id': acc_part_id.id,
                     'ref':invoice.number,
                     'date': date,
                     'currency_id': False,
@@ -464,13 +466,15 @@
         context = context or {}
         res = {}
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)
+        rp_obj = self.pool.get('res.partner')
+        acc_part_id = inv.type in ['out_invoice', "out_refund"] and \
+                rp_obj._find_accounting_partner(inv.company_id.partner_id) or \
+                rp_obj._find_accounting_partner(inv.partner_id)
+        wh_iva_rate = acc_part_id.wh_iva_rate
 
         for ait in inv.tax_line:
             amount_ret = 0.0
             if ait.tax_id.ret:
-                wh_iva_rate = inv.type in ['out_invoice', "out_reunf"] \
-                    and inv.company_id.partner_id.wh_iva_rate \
-                    or inv.partner_id.wh_iva_rate
                 amount_ret = wh_iva_rate and ait.tax_amount*wh_iva_rate/100.0 or 0.00
             res[ait.id] = {'amount_ret': amount_ret, 'base_ret': ait.base_amount}
         return res

=== modified file 'l10n_ve_withholding_iva/model/wh_iva.py'
--- l10n_ve_withholding_iva/model/wh_iva.py	2013-12-17 16:40:51 +0000
+++ l10n_ve_withholding_iva/model/wh_iva.py	2013-12-17 20:29:18 +0000
@@ -92,6 +92,8 @@
         @param tax_id_brw: tax object
         """
         if context is None: context = {}
+        rp_obj = self.pool.get('res.partner')
+        acc_part_id = rp_obj._find_accounting_partner(tax_id_brw.invoice_id.partner_id)
         return {
             'inv_tax_id':tax_id_brw.id,
             'tax_id':tax_id_brw.tax_id.id,
@@ -99,7 +101,7 @@
             '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
+            'wh_iva_rate':acc_part_id.wh_iva_rate
         }
     
     def load_taxes(self, cr, uid, ids, context=None):
@@ -107,13 +109,14 @@
         """
         if context is None: context = {}
         awilt_obj = self.pool.get('account.wh.iva.line.tax')
+        rp_obj = self.pool.get('res.partner')
         
         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
+                rate = ret_line.retention_id.type == 'out_invoice' \
+                        and rp_obj._find_accounting_partner(ret_line.invoice_id.company_id.partner_id).wh_iva_rate \
+                        or rp_obj._find_accounting_partner(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:
@@ -411,13 +414,12 @@
     def _check_partner(self, cr, uid, ids, context={}):
         """ Determine if a given partner is a VAT Withholding Agent
         """
-        agt = False
         obj = self.browse(cr, uid, ids[0])
-        if obj.type in ('out_invoice', 'out_refund') and obj.partner_id.wh_iva_agent:
-            agt = True
-        if obj.type in ('in_invoice', 'in_refund') and obj.company_id.partner_id.wh_iva_agent:
-            agt = True
-        return agt
+        rp_obj = self.pool.get('res.partner')
+        if obj.type in ('out_invoice', 'out_refund'): 
+            return rp_obj._find_accounting_partner(obj.partner_id).wh_iva_agent
+        else:
+            return rp_obj._find_accounting_partner(obj.company_id.partner_id).wh_iva_agent
 
     _constraints = [
         (_check_partner, 'Error ! The partner must be withholding vat agent .', ['partner_id']),
@@ -572,27 +574,34 @@
             
         acc_id = False
         res = {}
+        rp_obj = self.pool.get('res.partner')
         inv_obj = self.pool.get('account.invoice')
         
         if partner_id:
-            p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            acc_part_id = rp_obj._find_accounting_partner(rp_obj.browse(cr, uid, partner_id))
             if type in ('out_invoice', 'out_refund'):
-                acc_id = p.property_account_receivable and p.property_account_receivable.id or False
+                acc_id = acc_part_id.property_account_receivable and acc_part_id.property_account_receivable.id or False
             else:
-                acc_id = p.property_account_payable and p.property_account_payable.id or False
+                acc_id = acc_part_id.property_account_payable and acc_part_id.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)
+
+        if not partner_id:
+            return {'value': res}
         
         ttype = type in ['out_invoice'] and ['out_invoice', 'out_refund'] \
                 or ['in_invoice', 'in_refund']
         inv_ids = inv_obj.search(cr,uid,[('state', '=', 'open'),
                                         ('wh_iva', '=', False),
                                         ('type', 'in', ttype),
-                                        ('partner_id','=',partner_id)],context=context)
+                                        '|',
+                                        ('partner_id', '=', acc_part_id.id),
+                                        ('partner_id', 'child_of', acc_part_id.id),
+            ],context=context)
         
         if inv_ids:
             #~ Get only the invoices which are not in a document yet
@@ -603,7 +612,7 @@
             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,
+                        'wh_iva_rate':  rp_obj._find_accounting_partner(inv_brw.partner_id).wh_iva_rate,
                         } for inv_brw in inv_obj.browse(cr,uid,inv_ids,context=context)]
         
         res = {'value': {
@@ -642,21 +651,21 @@
         @param period_id: period_id at current view
         @param fortnight: fortnight at current view
         """
-        #~ print '\n\n\n\n', 'onchange_lines_filter(', type, partner_id or 'no partner', period_id or 'no period', (isinstance(fortnight, (str)) and fortnight == 'False' and '1ra Fn' or '2da Fn') or 'EMPTY', ')'
         context = context or {}
         ai_obj = self.pool.get('account.invoice')
         per_obj = self.pool.get('account.period')
+        rp_obj = self.pool.get('res.partner')
         values_data = dict()
         res_wh_lines = []
         acc_id = False
 
         #~ pull account info
         if partner_id:
-            p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            acc_part_id = rp_obj._find_accounting_partner(rp_obj.browse(cr, uid, partner_id))
             if type in ('out_invoice', 'out_refund'):
-                acc_id = p.property_account_receivable and p.property_account_receivable.id or False
+                acc_id = acc_part_id.property_account_receivable and acc_part_id.property_account_receivable.id or False
             else:
-                acc_id = p.property_account_payable and p.property_account_payable.id or False
+                acc_id = acc_part_id.property_account_payable and acc_part_id.property_account_payable.id or False
             values_data['account_id'] = acc_id
 
         #~ clear lines 
@@ -672,7 +681,10 @@
         ai_ids = ai_obj.search(cr, uid, [
             ('state', '=', 'open'), ('wh_iva', '=', False),
             ('wh_iva_id', '=', False), ('type', 'in', ttype),
-            ('partner_id', '=', partner_id), ('period_id', '=', period_id)],
+            '|',
+            ('partner_id', '=', acc_part_id.id),
+            ('partner_id', 'child_of', acc_part_id.id),
+            ('period_id', '=', period_id)],
             context=context)
         ai_ids = [ai_brw.id
                   for ai_brw in ai_obj.browse(cr, uid, ai_ids, context=context)
@@ -684,7 +696,7 @@
             values_data['wh_lines'] = \
                 [{'invoice_id': inv_brw.id,
                   'name': inv_brw.name or _('N/A'),
-                  'wh_iva_rate': inv_brw.partner_id.wh_iva_rate}
+                  'wh_iva_rate': rp_obj._find_accounting_partner(inv_brw.partner_id).wh_iva_rate}
                  for inv_brw in ai_obj.browse(cr, uid, ai_ids, context=context)
                 ]
         return {'value': values_data}
@@ -695,15 +707,16 @@
         """
         context = context or {}
         ids = isinstance(ids, (int, long)) and [ids] or ids
+        rp_obj = self.pool.get('res.partner')
 
         for id in ids:
             inv_str = ''
             awi_brw = self.browse(cr, uid, id, context=context)
             for awil_brw in awi_brw.wh_lines:
-                if awil_brw.invoice_id and awil_brw.invoice_id.partner_id.id !=\
-                    awi_brw.partner_id.id:
-                        inv_str+= '%s'% '\n'+(awil_brw.invoice_id.name or
-                                awil_brw.invoice_id.number or '')
+                acc_part_id = rp_obj._find_accounting_partner(awil_brw.invoice_id.partner_id)
+                if acc_part_id.id != awi_brw.partner_id.id:
+                    inv_str+= '%s'% '\n'+(awil_brw.invoice_id.name or
+                        awil_brw.invoice_id.number or '')
 
             if inv_str:
                 raise osv.except_osv('Incorrect Invoices !',"The following invoices are not from the selected partner: %s " % (inv_str,))

=== modified file 'l10n_ve_withholding_iva/report/withholding_vat.py'
--- l10n_ve_withholding_iva/report/withholding_vat.py	2013-05-10 18:32:20 +0000
+++ l10n_ve_withholding_iva/report/withholding_vat.py	2013-12-17 20:29:18 +0000
@@ -109,6 +109,7 @@
         tot_iva_ret = {}
 
         comp_obj = self.pool.get('account.wh.iva')
+        rp_obj = self.pool.get('res.partner')
         comp = comp_obj.browse(self.cr,self.uid, comp_id)
         res = {}
         ttal = {}
@@ -154,7 +155,7 @@
                     'nro_ctrl': rl.invoice_id.nro_ctrl,
                     'nro_ncre': rl.invoice_id.supplier_invoice_number,
                     'nro_ndeb': rl.invoice_id.supplier_invoice_number,
-                    'porcenta': rl.invoice_id.partner_id.wh_iva_rate,
+                    'porcenta': rp_obj._find_accounting_partner(rl.invoice_id.partner_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,
@@ -195,7 +196,7 @@
                     'nro_ctrl': rl.invoice_id.nro_ctrl,
                     'nro_ncre': rl.invoice_id.supplier_invoice_number,
                     'nro_ndeb': rl.invoice_id.supplier_invoice_number,
-                    'porcenta': rl.invoice_id.partner_id.wh_iva_rate,
+                    'porcenta': rp_obj._find_accounting_partner(rl.invoice_id.partner_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,

=== removed file 'l10n_ve_withholding_iva/test/iva_invoice.yml'
--- l10n_ve_withholding_iva/test/iva_invoice.yml	2013-04-17 21:42:13 +0000
+++ l10n_ve_withholding_iva/test/iva_invoice.yml	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
--
-  In order to test Confirm Draft Invoice wizard I create an invoice and confirm it with this wizard
--
-  !record {model: account.invoice, id: account_invoice_state}:
-    account_id: account.a_recv
-    company_id: base.main_company
-    currency_id: base.VEB
-    invoice_line:
-      - product_id: product.product_product_3
-        account_id: account.a_sale
-        product_qty: 3
-        uos_id: product.product_uom_unit
-        price_unit: 10
-        name: PC3
-        taxes_id:
-        - iva0
-    journal_id: account.bank_journal
-    partner_id: base.res_partner_desertic_hispafuentes
-    reference_type: none
--
-  I check that Initially customer invoice state is "Draft"
--
-  !assert {model: account.invoice, id: account_invoice_state}:
-    - state == 'draft'
--
-  I called the "Confirm Draft Invoices" wizard
--
-  !record {model: account.invoice.confirm, id: account_invoice_confirm_0}:
-    {}
--
-  I clicked on Confirm Invoices Button
--
-  !python {model: account.invoice.confirm}: |
-    self.invoice_confirm(cr, uid, [ref("account_invoice_confirm_0")], {"lang": 'en_US',
-      "tz": False, "active_model": "account.invoice", "active_ids": [ref("account_invoice_state")],
-      "type": "out_invoice", "active_id": ref("account_invoice_state"), })
--
-  I check that customer invoice state is "Open"
--
-  !assert {model: account.invoice, id: account_invoice_state}:
-    - state == 'open'

=== removed file 'l10n_ve_withholding_iva/test/iva_purchase.yml'
--- l10n_ve_withholding_iva/test/iva_purchase.yml	2013-01-15 14:31:52 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase.yml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
--
-  1. Iva purchase test
--
-  1.1 I create IVA tax
--
-  !record {model: account.tax, id: iva_purchase0}:
-    name: 'IVA - Purchase'
-    amount: 0.12
-    type_tax_use: purchase
-    applicable_type: 'true'
-    company_id: base.main_company
-    ret: False
--
-  1.2 Test if tax was properly created
--
-  !assert {model: account.tax, id: iva_purchase0}:
-    - name
--
-  1.3 I update partner information
--
-  !record {model: res.partner, id: base.res_partner_23}:
-    wh_iva_agent: True
-    wh_iva_rate: 75
-    vat_subjected: True
--
-  1.4 Test if information was updated properly
--
-  !assert {model: res.partner, id: base.res_partner_23}:
-    - wh_iva_agent
-    - wh_iva_rate == 75
-    - vat_subjected
--
-  1.5 I update company information
--
-  !python {model: res.partner }: |
-    vals = {
-        'wh_iva_agent': True,
-        'wh_iva_rate': 75,
-        'vat_subjected': True
-        }
-    self.write(cr, uid, [ref("base.main_company")], vals)
--
-  1.6 Test if company information was updated properly
--
-  !assert {model: res.partner, id: base.main_company}:
-    - wh_iva_agent
-    - wh_iva_rate == 75
-    - vat_subjected
--
-  1.7 I update IVA tax (withholdable)
--
-  !python {model: account.tax }: |
-    vals = {
-        'ret': True,
-        'wh_vat_collected_account_id': ref("account.ova"),
-        'wh_vat_paid_account_id': ref("account.ova")
-        }
-    self.write(cr, uid, [ref("l10n_ve_fiscal_requirements.iva_purchase1")], vals)

=== removed file 'l10n_ve_withholding_iva/test/iva_purchase_nret1.yml'
--- l10n_ve_withholding_iva/test/iva_purchase_nret1.yml	2013-11-15 15:02:56 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase_nret1.yml	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
--
-  3. Iva tests purchase wh, wh should not be validated (test fails conditions)
--
-  3.1 Check conditions for creating the document, first main company configuration
--
-  !assert {model: res.partner, id: base.main_company}:
-    - wh_iva_agent
-    - wh_iva_rate
-    - vat_subjected
--
-  3.2 Check partner configuration
--
-  !assert {model: res.partner, id: base.res_partner_23}:
-    - wh_iva_agent
-    - wh_iva_rate
-    - vat_subjected
--
-  3.3 Check IVA configuration
--
-  !assert {model: account.tax, id: iva_purchase0}:
-    - amount
-    - type_tax_use == 'purchase'
-    - ret == False
-    - not wh_vat_collected_account_id
-    - not wh_vat_paid_account_id
--
-  3.4 I create a purchase invoice
--
-  !record {model: account.invoice, id: test_purchase_iva_nret01}:
-    type: out_invoice
-    company_id: base.main_company
-    date_invoice: !eval time.strftime('%Y-%m-%d')
-    partner_id: base.res_partner_23
-    reference_type: none
-    journal_id: account.expenses_journal
-    wh_iva: True
-    invoice_line:
-      - product_id: product.product_product_3
-        quantity: 3
-        uos_id: product.product_uom_unit
-        price_unit: 10
-        name: PC3
-        invoice_line_tax_id:
-        - l10n_ve_fiscal_requirements.iva_purchase1
-      - product_id: product.product_product_4
-        quantity: 5
-        uos_id: product.product_uom_unit
-        price_unit: 20
-        name: PC2
-        invoice_line_tax_id:
-        - l10n_ve_fiscal_requirements.iva_purchase1
--
-  3.5 I check that Initially customer invoice is in the "Draft" state
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret01}:
-    - state == 'draft'
--
-  3.6 I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
--
-  !workflow {model: account.invoice, action: invoice_proforma2, ref: test_purchase_iva_nret01}
--
-  3.7 I check that the invoice state is now "Proforma2"
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret01}:
-    - state == 'proforma2'
--
-  3.8 I create invoice by clicking on Create button
--
-  !workflow {model: account.invoice, action: invoice_open, ref: test_purchase_iva_nret01}
--
-  3.9 I check that the invoice state is "Open"
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret01, string: Invoice is not in open state}:
-    - state == 'open'
--
-  3.10 Set control number for the invoice
--
-  !python {model: account.invoice}: |
-    self.write(cr, uid, [ref("test_purchase_iva_nret01")], {'nro_ctrl':'iva002', 'journal_id':ref("account.expenses_journal")})
-    ai_brw = self.browse(cr, uid, ref("test_purchase_iva_nret01"))
-    assert ai_brw.nro_ctrl=='iva002' and ai_brw.journal_id.id == ref("account.expenses_journal"), 'Invoice wasn\'t updated properly'
--
-  3.11 Check if withhold document was not created
--
-  !python {model: account.invoice}: |
-    po = self.browse(cr, uid, ref("test_purchase_iva_nret01"))
-    assert not po.wh_iva_id, 'Withholding document shouldn\'t be created'

=== removed file 'l10n_ve_withholding_iva/test/iva_purchase_nret2.yml'
--- l10n_ve_withholding_iva/test/iva_purchase_nret2.yml	2013-11-15 15:02:56 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase_nret2.yml	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
--
-  4. Iva tests purchase wh, wh should not be validated (test fails conditions)
--
-  4.1 I update company information (not wh partner)
--
-  !python {model: res.partner}: |
-    vals = {
-        'wh_iva_agent' : False,
-        'wh_iva_rate' : 0,
-        'vat_subjected' : False
-        }
-    self.write(cr, uid, ref("base.main_company"), vals)
--
-  4.2 Check conditions for creating the document, first main company configuration
--
-  !assert {model: res.partner, id: base.main_company}:
-    - not wh_iva_agent
-    - wh_iva_rate == 0
-    - not vat_subjected 
--
-  4.3 Check partner configuration
--
-  !assert {model: res.partner, id: base.res_partner_23}:
-    - wh_iva_agent
-    - wh_iva_rate
-    - vat_subjected
--
-  4.4 Check IVA configuration
--
-  !assert {model: account.tax, id: l10n_ve_fiscal_requirements.iva_purchase1}:
-    - amount
-    - type_tax_use == 'purchase'
-    - ret
-    - wh_vat_collected_account_id
-    - wh_vat_paid_account_id
--
-  4.5 I create a purchase invoice
--
-  !record {model: account.invoice, id: test_purchase_iva_nret02}:
-    type: out_invoice
-    company_id: base.main_company
-    date_invoice: !eval time.strftime('%Y-%m-%d')
-    partner_id: base.res_partner_23
-    reference_type: none
-    journal_id: account.expenses_journal
-    wh_iva: True
-    invoice_line:
-      - product_id: product.product_product_3
-        quantity: 3
-        uos_id: product.product_uom_unit
-        price_unit: 10
-        name: PC3
-        invoice_line_tax_id:
-        - l10n_ve_fiscal_requirements.iva_purchase1
-      - product_id: product.product_product_4
-        quantity: 5
-        uos_id: product.product_uom_unit
-        price_unit: 20
-        name: PC2
-        invoice_line_tax_id:
-        - l10n_ve_fiscal_requirements.iva_purchase1
--
-  4.6 I check that Initially customer invoice is in the "Draft" state
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret02}:
-    - state == 'draft'
--
-  4.7 I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
--
-  !workflow {model: account.invoice, action: invoice_proforma2, ref: test_purchase_iva_nret02}
--
-  4.8 I check that the invoice state is now "Proforma2"
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret02}:
-    - state == 'proforma2'
--
-  4.8 I create invoice by clicking on Create button
--
-  !workflow {model: account.invoice, action: invoice_open, ref: test_purchase_iva_nret02}
--
-  4.10 I check that the invoice state is "Open"
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret02, string: Invoice is not in open state}:
-    - state == 'open'
--
-  4.11 Set control number for the invoice
--
-  !python {model: account.invoice}: |
-    self.write(cr, uid, [ref("test_purchase_iva_nret02")], {'nro_ctrl':'iva003', 'journal_id':ref("account.expenses_journal")})
-    ai_brw = self.browse(cr, uid, ref("test_purchase_iva_nret02"))
-    assert ai_brw.nro_ctrl=='iva003' and ai_brw.journal_id.id == ref("account.expenses_journal"), 'Invoice wasn\'t updated properly'
--
-  4.12 Check if withhold document was not created
--
-  !python {model: account.invoice}: |
-    po = self.browse(cr, uid, ref("test_purchase_iva_nret02"))
-    assert not po.wh_iva_id, 'Withholding document shouldn\'t be created'

=== removed file 'l10n_ve_withholding_iva/test/iva_purchase_nret3.yml'
--- l10n_ve_withholding_iva/test/iva_purchase_nret3.yml	2013-11-15 15:02:56 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase_nret3.yml	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
--
-  5. Iva tests purchase wh, wh should not be validated (test fails conditions)
--
-  5.1 I update company information
--
-  !python {model: res.partner}: |
-    vals = {
-        'wh_iva_agent' : True,
-        'wh_iva_rate' : 75,
-        'vat_subjected' : True
-        }
-    self.write(cr, uid, ref("base.main_company"), vals)
--
-  5.2 Check conditions for creating the document, first main company configuration
--
-  !assert {model: res.partner, id: base.main_company}:
-    - wh_iva_agent
-    - wh_iva_rate
-    - vat_subjected 
--
-  5.3 I update partner information
--
-  !python {model: res.partner}: |
-    vals = {
-        'wh_iva_agent' : False,
-        'wh_iva_rate' : 0,
-        'vat_subjected' : False
-        }
-    self.write(cr, uid, ref("base.res_partner_23"), vals)
--
-  5.4 Check partner configuration
--
-  !assert {model: res.partner, id: base.res_partner_23}:
-    - not wh_iva_agent
-    - wh_iva_rate == 0
-    - not vat_subjected
--
-  5.5 Check IVA configuration
--
-  !assert {model: account.tax, id: l10n_ve_fiscal_requirements.iva_purchase1}:
-    - amount
-    - type_tax_use == 'purchase'
-    - ret
-    - wh_vat_collected_account_id
-    - wh_vat_paid_account_id
--
-  5.6 I create a purchase invoice
--
-  !record {model: account.invoice, id: test_purchase_iva_nret03}:
-    type: out_invoice
-    company_id: base.main_company
-    date_invoice: !eval time.strftime('%Y-%m-%d')
-    partner_id: base.res_partner_23
-    reference_type: none
-    journal_id: account.expenses_journal
-    wh_iva: True
-    invoice_line:
-      - product_id: product.product_product_3
-        quantity: 3
-        uos_id: product.product_uom_unit
-        price_unit: 10
-        name: PC3
-        invoice_line_tax_id:
-        - l10n_ve_fiscal_requirements.iva_purchase1
-      - product_id: product.product_product_4
-        quantity: 5
-        uos_id: product.product_uom_unit
-        price_unit: 20
-        name: PC2
-        invoice_line_tax_id:
-        - l10n_ve_fiscal_requirements.iva_purchase1
--
-  5.7 I check that Initially customer invoice is in the "Draft" state
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret03}:
-    - state == 'draft'
--
-  5.8 I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
--
-  !workflow {model: account.invoice, action: invoice_proforma2, ref: test_purchase_iva_nret03}
--
-  5.9 I check that the invoice state is now "Proforma2"
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret03}:
-    - state == 'proforma2'
--
-  5.10 I create invoice by clicking on Create button
--
-  !workflow {model: account.invoice, action: invoice_open, ref: test_purchase_iva_nret03}
--
-  5.11 I check that the invoice state is "Open"
--
-  !assert {model: account.invoice, id: test_purchase_iva_nret03, string: Invoice is not in open state}:
-    - state == 'open'
--
-  5.12 Set control number for the invoice
--
-  !python {model: account.invoice}: |
-    self.write(cr, uid, [ref("test_purchase_iva_nret03")], {'nro_ctrl':'iva004', 'journal_id':ref("account.expenses_journal")})
-    ai_brw = self.browse(cr, uid, ref("test_purchase_iva_nret03"))
-    assert ai_brw.nro_ctrl=='iva004' and ai_brw.journal_id.id == ref("account.expenses_journal"), 'Invoice wasn\'t updated properly'
--
-  5.13 Check if withhold document was not created
--
-  !python {model: account.invoice}: |
-    po = self.browse(cr, uid, ref("test_purchase_iva_nret03"))
-    assert not po.wh_iva_id, 'Withholding document shouldn\'t be created'

=== removed file 'l10n_ve_withholding_iva/test/iva_purchase_wh.yml'
--- l10n_ve_withholding_iva/test/iva_purchase_wh.yml	2013-11-15 15:02:56 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase_wh.yml	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
--
-  2. Tests for iva purchase wh
--
-  2.1 Check conditions for creating the document, first main company configuration
--
-  !assert {model: res.partner, id: base.main_company}:
-    - wh_iva_agent
-    - wh_iva_rate
-    - vat_subjected
--
-  2.2 Check partner configuration
--
-  !assert {model: res.partner, id: base.res_partner_23}:
-    - wh_iva_agent
-    - wh_iva_rate
-    - vat_subjected
--
-  2.3 Check IVA configuration
--
-  !assert {model: account.tax, id: l10n_ve_fiscal_requirements.iva_purchase1}:
-    - amount
-    - type_tax_use == 'purchase'
-    - ret
-    - wh_vat_collected_account_id
-    - wh_vat_paid_account_id
--
-  2.4 I create a purchase invoice
--
-  !record {model: account.invoice, id: test_purchase_iva02, view: account.invoice_supplier_form, context:{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}}:
-    type: in_invoice
-    state: draft
-    company_id: base.main_company
-    date_invoice: !eval time.strftime('%Y-%m-%d')
-    partner_id: base.res_partner_23
-    reference_type: none
-    journal_id: 
-    wh_iva: True
-    invoice_line:
-      - product_id: product.product_product_3
-        quantity: 3
-        uos_id: product.product_uom_unit
-        price_unit: 10
-        name: PC3
-        invoice_line_tax_id:
-        - l10n_ve_fiscal_requirements.iva_purchase1
-      - product_id: product.product_product_4
-        quantity: 5
-        uos_id: product.product_uom_unit
-        price_unit: 20
-        name: PC2
-        invoice_line_tax_id:
-        - l10n_ve_fiscal_requirements.iva_purchase1
--
-  2.5 I check that Initially supplier invoice is in the "Draft" state
--
-  !python {model: account.invoice}: |
-    ap_obj=self.pool.get('account.period')
-    import time
-    period = ap_obj.find(cr, uid, time.strftime('%Y/%m/%d'), context={'company_id':ref("base.main_company")})
-    assert period, 'There aren\'t periods for this date'
-    ap_obj.write(cr, uid, period, {'special':False})
-    self.write(cr,uid,ref('test_purchase_iva02'),{'journal_id':ref('account.expenses_journal'),'type':'in_invoice'})
-    ai_brw = self.browse(cr,uid,ref('test_purchase_iva02'))
-    assert ai_brw.type == 'in_invoice', "Not the intended type. It should be 'in_invoice' not '%s'"%ai_brw.type
-    assert ai_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%ai_brw.state
-    assert ai_brw.journal_id.id == ref('account.expenses_journal'), "Not the intended Journal. It should be 'Expenses Journal - (test)' not '%s'"%ai_brw.journal_id.name
--
-  2.6 I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
--
-  !workflow {model: account.invoice, action: invoice_proforma2, ref: test_purchase_iva02}
--
-  2.7 I check that the invoice state is now "Proforma2"
--
-  !assert {model: account.invoice, id: test_purchase_iva02}:
-    - state == 'proforma2'
--
-  2.8 I create invoice by clicking on Create button
--
-  !workflow {model: account.invoice, action: invoice_open, ref: test_purchase_iva02}
--
-  2.9 I check that the invoice state is "Open"
--
-  !assert {model: account.invoice, id: test_purchase_iva02, string: Invoice is not in open state}:
-    - state == 'open'
--
-  2.10 Set control number for the invoice
--
-  !python {model: account.invoice}: |
-    self.write(cr, uid, [ref("test_purchase_iva02")], {'nro_ctrl':'iva002'})
-    ai_brw = self.browse(cr, uid, ref("test_purchase_iva02"))
-    assert ai_brw.nro_ctrl=='iva002', "Not the intended Control Number. It should be 'iva002' not '%s'"%ai_brw.nro_ctrl
-    assert ai_brw.journal_id.id == ref('account.expenses_journal'), "Not the intended Journal. It should be 'Expenses Journal - (test)' not '%s'"%ai_brw.journal_id.name

=== removed file 'l10n_ve_withholding_iva/test/iva_sale.yml'
--- l10n_ve_withholding_iva/test/iva_sale.yml	2013-01-15 14:31:52 +0000
+++ l10n_ve_withholding_iva/test/iva_sale.yml	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
--
-  6. Iva tests sale wh
--
-  6.1 I create IVA sale tax
--
-  !record {model: account.tax, id: iva_sale0}:
-    name: 'IVA - Sale'
-    amount: 0.12
-    type_tax_use: sale
-    applicable_type: 'true'
-    company_id: base.main_company
-    ret: False
--
-  6.2 Test if sale tax was properly created
--
-  !assert {model: account.tax, id: iva_purchase0}:
-    - name
--
-  6.3 I update partner information
--
-  !python {model: res.partner}: |
-    vals = {
-        'wh_iva_agent': True,
-        'wh_iva_rate': 75,
-        'vat_subjected': True
-        }
-    self.write(cr, uid, ref('base.res_partner_23'), vals)
--
-  6.4 Test if information was updated properly
--
-  !assert {model: res.partner, id: base.res_partner_23}:
-    - wh_iva_agent
-    - wh_iva_rate == 75
-    - vat_subjected
--
-  6.5 I update company information
--
-  !python {model: res.partner}: |
-    vals = {
-        'wh_iva_agent': True,
-        'wh_iva_rate': 75,
-        'vat_subjected': True
-        }
-    self.write(cr, uid, ref('base.main_company'), vals )
--
-  6.6 Test if company information was updated properly
--
-  !assert {model: res.partner, id: base.main_company}:
-    - wh_iva_agent
-    - wh_iva_rate == 75
-    - vat_subjected
--
-  6.7 I create IVA sale tax (withholdable)
--
-  !record {model: account.tax, id: iva_sale1}:
-    name: 'IVA - Sale (withholdable) 1'
-    amount: 0.12
-    type_tax_use: sale
-    applicable_type: 'true'
-    company_id: base.main_company
-    ret: True
-    wh_vat_collected_account_id: account.ova
-    wh_vat_paid_account_id: account.ova
--
-  6.8 Test if tax was properly created
--
-  !assert {model: account.tax, id: iva_sale1}:
-    - name

=== removed file 'l10n_ve_withholding_iva/test/iva_sale_2.yml'
--- l10n_ve_withholding_iva/test/iva_sale_2.yml	2012-05-10 20:09:06 +0000
+++ l10n_ve_withholding_iva/test/iva_sale_2.yml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
--
-  I create IVA sale tax with wrong values amount > 1 for type = percent
--
-  !python {model: account.tax}: |
-    vals = {
-      'name': 'Iva sale a',
-      'amount': 10.12,
-      'type_tax_use': 'sale',
-      'applicable_type': 'true',
-      'company_id': ref("base.main_company"),
-      'ret': False,
-      'type': 'percent'
-    }
-    try:
-      at_id = self.create(cr, uid, vals)
-    except Exception as e:
-      at_id = -1
-      pass
-    assert at_id == -1 or not at_id, 'Tax must not be saved because amount > 1 and type = percent'
--
-  I create IVA sale tax with wrong values amount < 0 for type = percent
--
-  !python {model: account.tax}: |
-    vals = {
-      'name': 'Iva sale B',
-      'amount': -10.12,
-      'type_tax_use': 'sale',
-      'applicable_type': 'true',
-      'company_id': ref("base.main_company"),
-      'ret': False,
-      'type': 'percent'
-    }
-    try:
-      at_id = self.create(cr, uid, vals)
-    except Exception as e:
-      at_id = -1
-      pass
-    assert at_id == -1 or not at_id, 'Tax must not be saved because amount < 0 and type = percent'
--
-  I create IVA sale tax with wrong values Withholdeable but not tax accounts
--
-  !python {model: account.tax}: |
-    vals = {
-      'name': 'Iva sale C',
-      'amount': 0.12,
-      'type_tax_use': 'sale',
-      'applicable_type': 'true',
-      'company_id': ref("base.main_company"),
-      'ret': True,
-      'type': 'percent'
-    }
-    at_id = -1
-    try:
-      at_id = self.create(cr, uid, vals)
-    except Exception as e:
-      at_id = -1
-      pass
-    assert at_id == -1 or not at_id, 'Tax must not be saved because has not accounts'

=== removed file 'l10n_ve_withholding_iva/test/iva_sale_wh.yml'
--- l10n_ve_withholding_iva/test/iva_sale_wh.yml	2013-11-15 15:02:56 +0000
+++ l10n_ve_withholding_iva/test/iva_sale_wh.yml	1970-01-01 00:00:00 +0000
@@ -1,205 +0,0 @@
--
-  7. Iva tests sale wh
--
-  7.1 In order to test account invoice I create a new customer invoice
--
-  !record {model: account.invoice, id: test_sale_iva_ret01}:
-    company_id: base.main_company
-    currency_id: base.EUR
-    date_invoice: !eval time.strftime('%Y-%m-%d')
-    account_id: account.a_recv
-    invoice_line:
-      - product_id: product.product_product_3
-        quantity: 3
-        uos_id: product.product_uom_unit
-        price_unit: 10
-        name: PC3
-        account_id: account.a_sale
-        invoice_line_tax_id:
-        - iva_sale1
-      - product_id: product.product_product_4
-        quantity: 5
-        uos_id: product.product_uom_unit
-        price_unit: 20
-        name: PC2
-        account_id: account.a_sale
-        invoice_line_tax_id:
-        - iva_sale1
-    journal_id: account.sales_journal
-    partner_id: base.res_partner_23
-    reference_type: none
--
-  7.2 I check that Initially customer invoice is in the "Draft" state
--
-  !assert {model: account.invoice, id: test_sale_iva_ret01}:
-    - state == 'draft'
--
-  7.3 I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
--
-  !workflow {model: account.invoice, action: invoice_proforma2, ref: test_sale_iva_ret01}
--
-  7.4 I check that the invoice state is now "Proforma2"
--
-  !assert {model: account.invoice, id: test_sale_iva_ret01}:
-    - state == 'proforma2'
--
-  7.5 I check that there is no move attached to the invoice
--
-  !python {model: account.invoice}: |
-    acc_id=self.browse(cr, uid, ref("test_sale_iva_ret01"))
-    assert (not acc_id.move_id), "Move falsely created at pro-forma"
--
-  7.6 I create invoice by clicking on Create button
--
-  !workflow {model: account.invoice, action: invoice_open, ref: test_sale_iva_ret01}
--
-  7.7 I check that the invoice state is "Open"
--
-  !assert {model: account.invoice, id: test_sale_iva_ret01}:
-    - state == 'open'
--
-  7.8 I check that now there is a move attached to the invoice
--
-  !python {model: account.invoice}: |
-    acc_id=self.browse(cr, uid, ref("test_sale_iva_ret01"))
-    assert acc_id.move_id, "Move not created for open invoice"
--
-  7.9 I check journal entries for the invoice
--
-  !python {model: account.invoice}: |
-    am_obj=self.pool.get('account.move')
-    ai = self.browse(cr, uid, ref("test_sale_iva_ret01"))
-    am_ids = am_obj.search(cr, uid, [('name', '=', ai.number)])
-    assert am_ids, 'Not found account move for the document'
-    am_brw = am_obj.browse(cr, uid, am_ids[0])
-    d = c = 0
-    for l in am_brw.line_id:
-      if l.account_id.id == ref("account.a_recv"):
-         d += l.debit
-      else:
-        c += l.credit
-      if l.tax_amount > 0:
-         assert l.tax_amount == 15.6, 'Tax is wrong'
-    assert c==d, 'Totals must match'
--
-  7.10 I generate a withholding vat customer
--
-  !record {model: account.wh.iva, id: wh_iva_sale01}:
-    journal_id: wh_sales_journal
-    partner_id: base.res_partner_23
-    number: 111222333
-    account_id: account.a_recv
-    name: 'IVA wh vat customer'
-    type: out_invoice
--
-  7.11 I check withholding vat customer
--
-  !assert {model: account.wh.iva, id: wh_iva_sale01}:
-    - state == 'draft'
--
-  7.12 I click on Calculate taxes button
--
-  !python {model: account.invoice}: |
-    self.button_reset_taxes(cr, uid, [ref("test_sale_iva_ret01")])
--
-  7.13 Before validating let's add the period
--
-  !python {model: account.wh.iva}: |
-    import time
-    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")})
-    assert period, 'There aren\'t periods for this date'
-    ap_obj.write(cr, uid, period, {'special':False})
-    ap_brw = ap_obj.browse(cr, uid, period[0])
-    if ap_brw.state == 'done':
-        ap.action_draft(cr, uid, period)
-        ap_brw = ap.browse(cr, uid, period[0])
-    assert ap_brw.state == 'draft', 'Period is not open as it should be'
-    assert ap_brw.special == False, 'Period is special. It should be'
-
-    self.write(cr, uid, ref("wh_iva_sale01"), {'period_id':period[0]})
--
-  7.14 I check period was modificated
--
-  !assert {model: account.wh.iva, id: wh_iva_sale01}:
-    - period_id
--
-  7.15 Check partner invoices
--
-  !python {model: account.wh.iva}: |
-    wil_obj=self.pool.get('account.wh.iva.line')
-    res = self.onchange_partner_id(cr, uid, [1], 'out_invoice', ref("base.res_partner_23"))
-    ind_id = res['value']['wh_lines'][0]['invoice_id']
-    res['value']['wh_lines'][0].update({'retention_id': ref("wh_iva_sale01")})
-    wil_id = wil_obj.create(cr, uid, res['value']['wh_lines'][0])
-    wil_obj.load_taxes(cr, uid, [wil_id])
-#~ -
-  #~ 7.16 I try to confirm the withholding vat customer (This test raise an exception - is ok - but its commented to pursue next steps in the test)
-#~ -
-  #~ !workflow {model: account.wh.iva, action: wh_iva_confirmed, ref: wh_iva_sale01}
--
-  7.17 I check withholding vat not is confirmed because invoice has not control number
--
-  !assert {model: account.wh.iva, id: wh_iva_sale01, string: Vat document cannot be in confirmed state}:
-    - state != 'confirmed'
--
-  7.18 Create wizard for adding control number
-- 
-  !record {model: wiz.nroctrl, id: wizard_nro_ctrl}:
-    name: '31010101'
-    sure: True
--
-  7.19 Execute wizard for control number
--
-  !python {model: wiz.nroctrl}: |
-    import time
-    ctx={}
-    ctx.update({'lang': u'en_US', 'active_model': 'ir.ui.menu', 'tz': False, 'active_ids': [ref("test_sale_iva_ret01"),], 'active_id': ref("test_sale_iva_ret01")})
-    data_dict = {'name':time.strftime('%m/%Y'), 'sure': True, 'model': 'wh_p'}
-    self.set_noctrl(cr, uid, [ref("wizard_nro_ctrl")], ctx)
--
-  7.20 Check if control number was properly updated
--
-  !assert {model: account.invoice, id: test_sale_iva_ret01, string: Control number was not propely updated}:
-    - nro_ctrl
--
-  7.21 I confirm the withholding vat customer after updater control number
--
-  !workflow {model: account.wh.iva, action: wh_iva_confirmed, ref: wh_iva_sale01}
--
-  7.22 I check withholding vat is confirmed
--
-  !assert {model: account.wh.iva, id: wh_iva_sale01, string: Wh documment eas not properly validated}:
-    - state == 'confirmed'
--
-  7.23 I mark it as done
--
-  !workflow {model: account.wh.iva, action: wh_iva_done, ref: wh_iva_sale01}
--
-  7.24 I check withholding vat is done
--
-  !assert {model: account.wh.iva, id: wh_iva_sale01}:
-    - state == 'done'
--
-  7.25 I check that the invoice has the wh document
--
-  !assert {model: account.invoice, id: test_sale_iva_ret01}:
-    - wh_iva_id
--
-  7.26 I check IVA sale journal entries
--
-  !python {model: account.wh.iva}: |
-    am_obj=self.pool.get('account.move')
-    ai_obj=self.pool.get('account.invoice')
-    acc_id=ai_obj.browse(cr, uid, ref("test_sale_iva_ret01"))
-    am_ids = am_obj.search(cr, uid, [('ref', '=', acc_id.number)])
-    assert am_ids, 'Not found account move for the document'
-    am_brw = am_obj.browse(cr, uid, am_ids[0])
-    assert len(am_brw.line_id) == 2, 'Must be 2 entries for this journal entry'
-    d = c = 0
-    for l in am_brw.line_id:
-      if l.account_id.id == ref("account.ova"):
-        c += l.debit
-      else:
-        d += l.credit
-    assert c==d, 'Totals must match'

=== removed file 'l10n_ve_withholding_iva/test/iva_sale_withholding.yml'
--- l10n_ve_withholding_iva/test/iva_sale_withholding.yml	2012-05-10 16:39:12 +0000
+++ l10n_ve_withholding_iva/test/iva_sale_withholding.yml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
--
-  I create IVA sale tax with wrong values amount > 1 for type = percent
--
-  !python {model: account.tax}: |
-    vals = {
-      'name': 'Iva sale a',
-      'amount': 10.12,
-      'type_tax_use': 'sale',
-      'applicable_type': 'true',
-      'company_id': ref("base.main_company"),
-      'ret': False,
-      'type': 'percent'
-    }
-    try:
-      at_id = self.create(cr, uid, vals)
-    except Exception as e:
-      at_id = -1
-      pass
-    assert at_id == -1 or not at_id, 'Tax must not be saved because amount > 1 and type = percent'
--
-  I create IVA sale tax with wrong values amount < 0 for type = percent
--
-  !python {model: account.tax}: |
-    vals = {
-      'name': 'Iva sale B',
-      'amount': -10.12,
-      'type_tax_use': 'sale',
-      'applicable_type': 'true',
-      'company_id': ref("base.main_company"),
-      'ret': False,
-      'type': 'percent'
-    }
-    try:
-      at_id = self.create(cr, uid, vals)
-    except Exception as e:
-      at_id = -1
-      pass
-    assert at_id == -1 or not at_id, 'Tax must not be saved because amount < 0 and type = percent'
--
-  I create IVA sale tax with wrong values Withholdeable but not tax accounts
--
-  !python {model: account.tax}: |
-    vals = {
-      'name': 'Iva sale C',
-      'amount': 0.12,
-      'type_tax_use': 'sale',
-      'applicable_type': 'true',
-      'company_id': ref("base.main_company"),
-      'ret': True,
-      'type': 'percent'
-    }
-    at_id = -1
-    try:
-      at_id = self.create(cr, uid, vals)
-    except Exception as e:
-      at_id = -1
-      pass
-    assert at_id == -1 or not at_id, 'Tax must not be saved because has not accounts'

=== removed file 'l10n_ve_withholding_iva/test/iva_test_invoice.yml'
--- l10n_ve_withholding_iva/test/iva_test_invoice.yml	2013-01-18 18:48:46 +0000
+++ l10n_ve_withholding_iva/test/iva_test_invoice.yml	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
--
-  8. Test iva sale
--
-  8.1 In order to test account invoice I create a new sale invoice with purchase tax
--
-  !record {model: account.invoice, id: test_iva01}:
-    company_id: base.main_company
-    currency_id: base.EUR
-    date_invoice: !eval time.strftime('%Y-%m-%d')
-    account_id: account.a_recv
-    invoice_line:
-      - product_id: product.product_product_3
-        quantity: 3
-        uos_id: product.product_uom_unit
-        price_unit: 10
-        name: PC3
-        account_id: account.a_sale
-        invoice_line_tax_id:
-        - iva_purchase0
-      - product_id: product.product_product_4
-        quantity: 5
-        uos_id: product.product_uom_unit
-        price_unit: 20
-        name: PC2
-        account_id: account.a_sale
-        invoice_line_tax_id:
-        - iva_purchase0
-    journal_id: account.sales_journal
-    partner_id: base.res_partner_23
-    reference_type: none
-    nro_ctrl: 56778211
--
-  8.2 I check that Initially customer invoice is in the "Draft" state
--
-  !assert {model: account.invoice, id: test_iva01}:
-    - state == 'draft'
--
-  8.3 I click on Calculate taxes button
--
-  !python {model: account.invoice}: |
-    acc_brw=self.browse(cr, uid, ref("test_iva01"))
-    self.button_reset_taxes(cr, uid, [ref("test_iva01")])
--
-  8.4 I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
--
-  !workflow {model: account.invoice, action: invoice_proforma2, ref: test_iva01}
--
-  8.5 I check that the invoice state is now "Proforma2"
--
-  !assert {model: account.invoice, id: test_iva01}:
-    - state == 'proforma2'
--
-  8.6 I check that there is no move attached to the invoice
--
-  !python {model: account.invoice}: |
-    acc_id=self.browse(cr, uid, ref("test_iva01"))
-    assert (not acc_id.move_id), "Move falsely created at pro-forma"
--
-  8.7 I try to create an invoice by clicking on Create button
--
-  !workflow {model: account.invoice, action: invoice_open, ref: test_iva01}
-#~ -
-  #~ 8.8 I check that the invoice state is not "Open"
-  # This test is failing. Is supposed to that "test_iva01" invoice remains in the proforma2 state, however it changes to open state
-#~ -
-  #~ !assert {model: account.invoice, id: test_iva01, string: Sale invoice has purchase tax. The invoice cannot be in open state}:
-    #~ - state != 'open'

=== removed file 'l10n_ve_withholding_iva/test/iva_test_wh.yml'
--- l10n_ve_withholding_iva/test/iva_test_wh.yml	2013-01-18 19:11:56 +0000
+++ l10n_ve_withholding_iva/test/iva_test_wh.yml	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
--
-  9. Test withholdeable iva
--
-  9.1 I update partner information
--
-  !record {model: res.partner, id: base.res_partner_23}:
-    wh_iva_agent: True
-    wh_iva_rate: 75
-    vat_subjected: True
--
-  9.2 I generate a withholding vat customer
--
-  !record {model: account.wh.iva, id: wh_iva_test01}:
-    journal_id: wh_sales_journal
-    partner_id: base.res_partner_23
-    number: 55668811
-    account_id: account.a_recv
-    name: 'IVA wh vat customer Vauxoo test'
-    type: out_invoice
--
-  9.3 I check withholding vat customer
--
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Wh was not saved}:
-    - state == 'draft'
--
-  9.4 Before validating let's add the period
--
-  !python {model: account.wh.iva}: |
-    import time
-    ap_obj=self.pool.get('account.period')
-    period = ap_obj.find(cr, uid, time.strftime('%Y/%m/%d'), {'company_id':ref('base.main_company')})
-    assert period, 'There aren\'t periods for this date'
-    self.write(cr, uid, ref("wh_iva_test01"), {'period_id':period[0]})
--
-  9.5 I check period was updated
--
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Period was not updated}:
-    - period_id
-#~ -
-  #~ 9.6 I confirm the withholding vat customer
-  #~ # This test case is commented because it raise the exception 'Invoices with Missing Withheld Taxes!' and interrupts the continuity of the other test cases
-#~ -
-  #~ !workflow {model: account.wh.iva, action: wh_iva_confirmed, ref: wh_iva_test01}
--
-  9.7 I check withholding vat is not confirmed
--
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Could not confirm the wh}:
-    - state != 'confirmed'
--
-  9.8 I try to mark it as done
--
-  !workflow {model: account.wh.iva, action: wh_iva_done, ref: wh_iva_test01}
--
-  9.9 I check withholding vat is not done
--
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Wh cannot be in done state}:
-    - state != 'done'

=== removed file 'l10n_ve_withholding_iva/test/iva_test_wh_2.yml'
--- l10n_ve_withholding_iva/test/iva_test_wh_2.yml	2013-11-15 15:02:56 +0000
+++ l10n_ve_withholding_iva/test/iva_test_wh_2.yml	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
--
-  10. Test not withholdeable iva
--
-  10.1 I update partner information
--
-  !record {model: res.partner, id: base.res_partner_23}:
-    wh_iva_agent: True
-    wh_iva_rate: 75
-    vat_subjected: True
--
-  10.2 I generate a withholding vat customer
--
-  !record {model: account.wh.iva, id: wh_iva_test02, view: view_wh_iva_form_customer, context: {'type':'out_invoice'}}:
-    journal_id: wh_sales_journal
-    partner_id: base.res_partner_23
-    number: 222444333000
-    account_id: account.a_recv
-    name: 'IVA wh vat customer Vauxoo test 2'
-    type: out_invoice
-    state: draft
--
-  10.3 I check withholding vat customer
--
-  !python {model: account.wh.iva}: |
-    values = {}
-    rp_obj = self.pool.get('res.partner')
-    rp_brw = rp_obj.browse(cr,uid,ref("base.res_partner_23"))
-    res = self.onchange_partner_id(cr, uid, [ref('wh_iva_test02')], 'out_invoice', rp_brw.id)
-    values['wh_lines'] = [(0,0,{'invoice_id':ref('test_iva01'), 'name':'N/A', 'wh_iva_rate':rp_brw.wh_iva_rate})]
-    values['account_id'] = res['value']['account_id']
-    values['type'] = 'out_invoice'
-    self.write(cr,uid,ref('wh_iva_test02'),values)
-    awi_brw = self.browse(cr,uid,ref('wh_iva_test02'))
-    assert awi_brw.type == 'out_invoice', "Not the intended type. It should be 'out_invoice' not '%s'"%awi_brw.type
-    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
-    assert awi_brw.wh_lines, "There are no lines to withhold"
-    self.compute_amount_wh(cr,uid,[ref('wh_iva_test02')])
--
-  10.4 I confirm the withholding vat customer
--
-  !python {model: account.wh.iva}: |
-    import netsvc
-    from openerp.osv import osv
-    wf_service = netsvc.LocalService("workflow")
-    try:
-      self.check_wh_lines_fortnights(cr, uid, [ref('wh_iva_test02')])
-      self.check_invoice_nro_ctrl(cr, uid, [ref('wh_iva_test02')])
-      self.check_vat_wh(cr, uid, [ref('wh_iva_test02')])
-      self.check_wh_taxes(cr, uid, [ref('wh_iva_test02')])
-      self.check_wh_taxes(cr, uid, [ref('wh_iva_test02')])
-      assert False, "An exception should have been raised, unwithholdable taxes  are not allowed to reach here!"
-    except osv.except_osv:
-      # exception was raised as expected
-      pass
--
-  10.5 I check withholding vat is not confirmed
-  # TODO: Check this test case, it fails. It means that something in the wh_iva_confirmed action is wrong.
--
-  !python {model: account.wh.iva}: |
-    awi_brw = self.browse(cr,uid,ref('wh_iva_test02'))
-    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
--
-  10.6 I try to mark it as done
--
-  !workflow {model: account.wh.iva, action: wh_iva_done, ref: wh_iva_test01}
--
-  10.7 I check withholding vat is not done
--
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Wh cannot be in done state}:
-    - state != 'done'

=== removed file 'l10n_ve_withholding_iva/test/iva_test_wh_3.yml'
--- l10n_ve_withholding_iva/test/iva_test_wh_3.yml	2013-11-15 15:02:56 +0000
+++ l10n_ve_withholding_iva/test/iva_test_wh_3.yml	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
--
-  11. Test not withholdeable iva
--
-  11.1 I update partner information
--
-  !record {model: res.partner, id: base.res_partner_23}:
-    wh_iva_agent: True
-    wh_iva_rate: 75
-    vat_subjected: True
--
-  11.2 I generate a withholding vat customer
--
-  !record {model: account.wh.iva, id: wh_iva_test03}:
-    journal_id: wh_sales_journal
-    partner_id: base.res_partner_23
-    account_id: account.a_recv
-    name: 'IVA wh vat customer Vauxoo test 3'
-    type: out_invoice
-    state: draft
--
-  11.3 I check withholding vat customer
--
-  !python {model: account.wh.iva}: |
-    self.write(cr,uid,ref('wh_iva_test03'),{'type':'out_invoice'})
-    awi_brw = self.browse(cr,uid,ref('wh_iva_test03'))
-    assert awi_brw.type == 'out_invoice', "Not the intended type. It should be 'out_invoice' not '%s'"%awi_brw.type
-    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
--
-  11.4 Before validating let's add the period
--
-  !python {model: account.wh.iva}: |
-    import time
-    ap_obj=self.pool.get('account.period')
-    period = ap_obj.find(cr, uid, time.strftime('%Y/%m/%d'), {'company_id':ref('base.main_company')})
-    assert period, 'There aren\'t periods for this date'
-    self.write(cr, uid, ref("wh_iva_test03"), {'period_id':period[0]})
--
-  11.5 I check period was updated
--
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Period was not updated}:
-    - period_id
--
-  11.6 I confirm the withholding vat customer
--
-  !workflow {model: account.wh.iva, action: wh_iva_confirmed, ref: wh_iva_test03}
--
-  11.7 I check withholding vat is not confirmed
-  # TODO: Check this test case, it fails. It means that something in the wh_iva_confirmed action is wrong.
--
-  !python {model: account.wh.iva}: |
-    awi_brw = self.browse(cr,uid,ref('wh_iva_test03'))
-    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
--
-  11.8 I try to mark it as done
--
-  !workflow {model: account.wh.iva, action: wh_iva_done, ref: wh_iva_test01}
--
-  11.9 I check withholding vat is not done
--
-  !python {model: account.wh.iva}: |
-    awi_brw = self.browse(cr,uid,ref('wh_iva_test03'))
-    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state

=== removed file 'l10n_ve_withholding_iva/test/iva_test_wh_4.yml'
--- l10n_ve_withholding_iva/test/iva_test_wh_4.yml	2013-11-15 15:02:56 +0000
+++ l10n_ve_withholding_iva/test/iva_test_wh_4.yml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
--
-  12. Test not withholdeable iva
--
-  12.1 I update partner information
--
-  !record {model: res.partner, id: base.res_partner_23}:
-    wh_iva_agent: True
-    wh_iva_rate: 75
-    vat_subjected: True
--
-  12.2 I generate a withholding vat customer
--
-  !record {model: account.wh.iva, id: wh_iva_test04}:
-    journal_id: wh_sales_journal
-    partner_id: base.res_partner_23
-    account_id: account.a_recv
-    name: 'IVA wh vat customer Vauxoo test 3'
-    type: out_invoice
-    state: draft
--
-  12.3 I check withholding vat customer
--
-  !python {model: account.wh.iva}: |
-    self.write(cr,uid,ref('wh_iva_test04'),{'type':'out_invoice'})
-    awi_brw = self.browse(cr,uid,ref('wh_iva_test04'))
-    assert awi_brw.type == 'out_invoice', "Not the intended type. It should be 'out_invoice' not '%s'"%awi_brw.type
-    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
--
-  12.4 Before validating let's add the period
--
-  !python {model: account.wh.iva}: |
-    import time
-    ap_obj=self.pool.get('account.period')
-    period = ap_obj.find(cr, uid, time.strftime('%Y/%m/%d'), {'company_id':ref('base.main_company')})
-    assert period, 'There aren\'t periods for this date'
-    self.write(cr, uid, ref("wh_iva_test04"), {'period_id':period[0], 'date':'2014/02/02'})
--
-  12.5 I check period was updated
--
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Period was not updated}:
-    - period_id
--
-  12.6 I confirm the withholding vat customer
--
-  !workflow {model: account.wh.iva, action: wh_iva_confirmed, ref: wh_iva_test04}
--
-  12.7 I check withholding vat is not confirmed
-  # TODO: Check this test case, it fails. It means that something in the wh_iva_confirmed action is wrong.
--
-  !assert {model: account.wh.iva, id: wh_iva_test04, string: Could not confirm the wh}:
-    - state != 'confirmed'
--
-  12.8 I try to mark it as done
--
-  !workflow {model: account.wh.iva, action: wh_iva_done, ref: wh_iva_test01}
--
-  12.9 I check withholding vat is not done
--
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Wh cannot be in done state}:
-    - state != 'done'

=== modified file 'l10n_ve_withholding_iva/test/purchase_invoice_wh_iva.yml'
--- l10n_ve_withholding_iva/test/purchase_invoice_wh_iva.yml	2013-12-04 13:24:44 +0000
+++ l10n_ve_withholding_iva/test/purchase_invoice_wh_iva.yml	2013-12-17 20:29:18 +0000
@@ -39,6 +39,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_ret_tax, view: account.invoice_supplier_form}:
         nro_ctrl: IVA RET AND NOT RET TAXES
+        supplier_invoice_number: IVA RET AND NOT RET TAXES
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
         account_id: account.a_pay
         company_id: base.main_company
@@ -107,6 +108,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_111, view: account.invoice_supplier_form}: &invoice
         nro_ctrl: 111-IVA
+        supplier_invoice_number: 111-IVA
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
         account_id: account.a_pay
         company_id: base.main_company
@@ -143,6 +145,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_110, view: account.invoice_supplier_form}:
         nro_ctrl: 110-IVA
+        supplier_invoice_number: 110-IVA
         invoice_line:
           - invoice_line_tax_id:
               - l10n_ve_fiscal_requirements.iva_purchase3
@@ -170,6 +173,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_011, view: account.invoice_supplier_form}:
         nro_ctrl: 011-IVA
+        supplier_invoice_number: 011-IVA
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_7
         <<: *invoice
 -
@@ -194,6 +198,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_010, view: account.invoice_supplier_form}:
         nro_ctrl: 010-IVA
+        supplier_invoice_number: 010-IVA
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_7
         invoice_line:
           - invoice_line_tax_id:
@@ -234,6 +239,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_101, view: account.invoice_supplier_form}:
         nro_ctrl: 101-IVA
+        supplier_invoice_number: 101-IVA
         <<: *invoice
 -
   I change invoice to Open state.
@@ -257,6 +263,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_100, view: account.invoice_supplier_form}:
         nro_ctrl: 100-IVA
+        supplier_invoice_number: 100-IVA
         invoice_line:
           - invoice_line_tax_id:
               - l10n_ve_fiscal_requirements.iva_purchase3
@@ -284,6 +291,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_001, view: account.invoice_supplier_form}:
         nro_ctrl: 001-IVA
+        supplier_invoice_number: 001-IVA
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_7
         <<: *invoice
 -
@@ -308,6 +316,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_000, view: account.invoice_supplier_form}:
         nro_ctrl: 000-IVA
+        supplier_invoice_number: 000-IVA
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_7
         invoice_line:
           - invoice_line_tax_id:
@@ -336,6 +345,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_00N, view: account.invoice_supplier_form}:
         nro_ctrl: 00N-IVA
+        supplier_invoice_number: 00N-IVA
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_7
         invoice_line:
           - product_id: product.product_product_4
@@ -366,6 +376,7 @@
 -
     !record {model: account.invoice, id: purchase_invoice_01N, view: account.invoice_supplier_form}:
         nro_ctrl: 01N-IVA
+        supplier_invoice_number: 01N-IVA
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
         invoice_line:
           - product_id: product.product_product_4

=== modified file 'l10n_ve_withholding_iva/test/purchase_wh_iva.yml'
--- l10n_ve_withholding_iva/test/purchase_wh_iva.yml	2013-12-05 17:33:58 +0000
+++ l10n_ve_withholding_iva/test/purchase_wh_iva.yml	2013-12-17 20:29:18 +0000
@@ -34,6 +34,7 @@
 -
     !record {model: account.invoice, id: wh_manual_purchase_awi_invoice}: &manual_purchase_awi_invoice
         nro_ctrl: AWI MANUAL PURCHASE INVOICE (WH COMPANY)
+        supplier_invoice_number: AWI MANUAL PURCHASE INVOICE (WH COMPANY)
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
         date_invoice: !eval time.strftime('%Y-%m-%d')
         company_id: base.main_company
@@ -160,7 +161,56 @@
         awi_brw = self.browse(cr, uid, awi_id)
         assert awi_brw.state == 'confirmed', 'The withholding document is not in confirmed state'
 -
-  4.3 When the Company is not a withholding agent.
+  4.3 When the withholding document have not withholding lines then it cannot
+  be confirm.
+-
+  I create a supplier withholding document manually.
+-
+    !record {model: account.wh.iva, id: supplier_no_lines_awi}: 
+        name: AWI MANUAL NO WH LINES
+        <<: *whc_awi_manual_purchase
+-
+  I check that the withholding document was correctly created.
+-
+    !assert {model: account.wh.iva, id: supplier_no_lines_awi, string: The withholding document should be of purchase type (in_invoice) and should be in draft state.}:
+        - type == 'in_invoice'
+        - state == 'draft'
+-
+  I search the current period and add it to the withholding doc.
+-
+  !python {model: account.wh.iva}: |
+    import time
+    awi_id = ref( 'supplier_no_lines_awi' )
+    company_id = ref('base.main_company')
+    period_obj = self.pool.get('account.period')
+    period = period_obj.find(
+        cr, uid, time.strftime('%Y/%m/%d'), {'company_id': company_id})
+    assert period, 'There aren\'t periods for this date'
+    self.write(cr, uid, awi_id, {'period_id':period[0]})
+-
+  I compute the taxes manually with the button 'Compute Withholding Vat'.
+-
+    !function {model: account.wh.iva, name: compute_amount_wh, id: supplier_no_lines_awi}:
+        - model: account.wh.iva
+          eval: "[ref('supplier_no_lines_awi')]"
+-
+  I try to confirm the supplier withholding document.
+-
+    !python {model: account.wh.iva}: |
+        awi_id = ref('supplier_no_lines_awi')
+        # Note: not use of workflow because it can not manage the exception.
+        try:
+            self.confirm_check(cr, uid, awi_id)
+            assert False, 'The withholding document can not be confirmed because has not wh lines associated.'
+        except Exception as e:
+            pass
+-
+  I check that the withholding document remains in draft.
+-
+    !assert {model: account.wh.iva, id: supplier_no_lines_awi, string: The withholding document can not be confirm because it haf no wh lines}:
+        - state == 'draft'
+-
+  4.4 When the Company is not a withholding agent.
 -
   I set company as a non-withholding agent.
 -
@@ -176,6 +226,7 @@
 -
     !record {model: account.invoice, id: nwh_manual_purchase_awi_invoice}:
         nro_ctrl: AWI MANUAL PURCHASE INVOICE (NON-WH COMPANY)
+        supplier_invoice_number: AWI MANUAL PURCHASE INVOICE (NON-WH COMPANY)
         <<: *manual_purchase_awi_invoice
 -
   I check that the invoice is of purchase type (in_invoice).

=== modified file 'l10n_ve_withholding_iva/test/purchase_wh_iva_sequence.yml'
--- l10n_ve_withholding_iva/test/purchase_wh_iva_sequence.yml	2013-12-05 18:30:14 +0000
+++ l10n_ve_withholding_iva/test/purchase_wh_iva_sequence.yml	2013-12-17 20:29:18 +0000
@@ -41,7 +41,7 @@
 -
   I check that the supplier that will be use exist.
 -
-    !assert {model: res.partner, id: l10n_ve_fiscal_requirements.f_req_partner_1, string: The partner used in this test exist}:
+    !assert {model: res.partner, id: l10n_ve_fiscal_requirements.f_req_partner_1, string: The supplier used in this test exist}:
         - id
 -
   I check that tax the that will be use is a withholding tax.
@@ -51,7 +51,7 @@
 -
   I check that the account that will be use is of payable type.
 -
-    !assert {model: account.account, id: account.a_pay, string: The account is not of receivable type}:
+    !assert {model: account.account, id: account.a_pay, string: The account is not of payable type}:
         - type == 'payable'
 -
   5.2 Check that the sequence is set only when the supplier withholding is set to done.
@@ -60,6 +60,7 @@
 -
     !record {model: account.invoice, id: supplier_seq_invoice_1, view: account.invoice_supplier_form}: &supplier_seq_invoice
         nro_ctrl: PURCHASE-IVA-SEQ-INVOICE-0001
+        supplier_invoice_number: PURCHASE-IVA-SEQ-INVOICE-0001
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
         account_id: account.a_pay
         company_id: base.main_company
@@ -145,6 +146,7 @@
 -
     !record {model: account.invoice, id: supplier_seq_invoice_2, view: account.invoice_supplier_form}:
         nro_ctrl: PURCHASE-IVA-SEQ-INVOICE-0002
+        supplier_invoice_number: PURCHASE-IVA-SEQ-INVOICE-0002
         << :  *supplier_seq_invoice
 -
   I check the invoice type, state and have not wh doc.
@@ -187,7 +189,7 @@
         - wh_iva_id.state == 'confirmed'
         - not wh_iva_id.number
 -
-  I set the withholding to done state.
+  I change the withholding to done state.
 -
     !python {model: account.invoice}: |
         inv_id = ref( 'supplier_seq_invoice_2' )
@@ -211,3 +213,207 @@
         awi_brw = self.browse(cr, uid, inv_id).wh_iva_id
         assert 'PURCHASE_TEST' in awi_brw.number, 'There was not used the supplier withholding sequence of the demo data. The sequence by type of withholding document is badly used.'
         assert '00001000' in awi_brw.number, 'The withholding documents are no creating consecutively'
+-
+  5.5  Using the supplier withholding generated in 5.4 I check if I cancel it
+  and then I re-used, the withholding number must remains and the sequence too.
+  I use two invoices.
+-
+  I check that the last withholding sequence number was '0001000'
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_2' )
+        awi_brw = self.browse(cr, uid, inv_id).wh_iva_id
+        assert '00001000' in awi_brw.number, 'The initial mark for this test is not correctly set, so it can continue'
+-
+  I update the invoice and withholding journals to be able to cancel entries.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_2' )
+        journal_obj = self.pool.get( 'account.journal' )
+        inv_brw = self.browse(cr, uid, inv_id)
+        inv_journal_id = inv_brw.journal_id.id
+        wh_journal_id = inv_brw.wh_iva_id.journal_id.id
+        journal_obj.write(
+            cr, uid, [inv_journal_id, wh_journal_id], {'update_posted': True})
+-
+  I create a supplier invoice.
+-
+    !record {model: account.invoice, id: supplier_seq_invoice_3, view: account.invoice_supplier_form}:
+        nro_ctrl: PURCHASE-IVA-SEQ-INVOICE-0003
+        supplier_invoice_number: PURCHASE-IVA-SEQ-INVOICE-0003
+        <<:  *supplier_seq_invoice
+-
+  I check the invoice type, state and have not wh doc.
+-
+    !assert {model: account.invoice, id: supplier_seq_invoice_3, string: The invoice was not correctly created. It need to be set in draft state, a supplier invoice type (in_invoice) and have not withholding document associaded.}:
+        - state == 'draft'
+        - type == 'in_invoice'
+        - not wh_iva_id
+-
+  I confirm the invoice to create the withholding document.
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: supplier_seq_invoice_3}
+-
+  I check that the invoice is confirmed and it generate a withholding doc.
+-
+    !assert {model: account.invoice, id: supplier_seq_invoice_3, string: The invoice was not correctly confirm. It need to change to open state (confirmed) and also generate and link a withholding document}:
+        - state == 'open'
+        - wh_iva_id
+-
+  I confirm the withholding document
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_3' )
+        inv_brw = self.browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        import netsvc
+        from openerp.osv import osv
+        wf_service = netsvc.LocalService( 'workflow' )
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'wh_iva_confirmed', cr)
+-
+  I check the withholding is confirm and that the wh number is not set.
+-
+    !assert {model: account.invoice, id: supplier_seq_invoice_3, string: The withholding was not correctly confirm.}:
+        - wh_iva_id.state == 'confirmed'
+        - not wh_iva_id.number
+-
+  I set the withholding to done state.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_3' )
+        inv_brw = self.browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        import netsvc
+        from openerp.osv import osv
+        wf_service = netsvc.LocalService( 'workflow' )
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'wh_iva_done', cr)
+-
+  I check the withholding is done and that the wh number is set.
+-
+    !assert {model: account.invoice, id: supplier_seq_invoice_3, string: The withholding was not correctly done.}:
+        - wh_iva_id.state == 'done'
+        - wh_iva_id.number
+-
+  I check if the withholding number use the sequence the consecutive number
+  00001001.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_3' )
+        awi_brw = self.browse(cr, uid, inv_id).wh_iva_id
+        assert '00001001' in awi_brw.number, 'The withholding documents are no creating consecutively ' + awi_brw.number
+-
+  I cancel the withholding document with sequence 00001001.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_3')
+        inv_brw = self.browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        import netsvc
+        from openerp.osv import osv
+        wf_service = netsvc.LocalService( 'workflow' )
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'cancel', cr)
+        awi_obj = self.pool.get('account.wh.iva')
+        awi_brw = awi_obj.browse(cr, uid, awi_id)
+        assert awi_brw.state == 'cancel', 'It does not change the withholding state to cancel'
+-
+  I cancel the withholding document with sequence 00001000, I set it to draft
+  and add two invoices.
+-
+    !python {model: account.wh.iva}: |
+        import netsvc
+        from openerp.osv import osv
+        wf_service = netsvc.LocalService( 'workflow' )
+
+        invoice_ids = [ref( 'supplier_seq_invoice_2'), ref( 'supplier_seq_invoice_3' )]
+        awi_id = self.pool.get( 'account.invoice' ).browse(
+            cr, uid, invoice_ids[0]).wh_iva_id.id
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'cancel', cr)
+
+        awi_brw = self.browse(cr, uid, awi_id)
+        assert awi_brw.state == 'cancel', 'It does not change the withholding state to cancel'
+        assert not awi_brw.wh_lines, 'when a withholding document have been cancel then all its lines are clean'
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'set_to_draft', cr)
+
+        awi_brw = self.browse(cr, uid, awi_id)
+        assert awi_brw.state == 'draft', 'The withholding document was not reset to draft %s' % (awi_brw.state, )
+
+        values = {'wh_lines': []}
+        for invoice_id in invoice_ids:
+            res = self.onchange_partner_id(
+                cr, uid, [awi_id], 'out_invoice', awi_brw.partner_id.id)
+            values['wh_lines'] += [
+                (0, 0, {'invoice_id': invoice_id,
+                        'name':'N/A',
+                        'wh_iva_rate': awi_brw.partner_id.wh_iva_rate})]
+            values['account_id'] = res['value']['account_id']
+        self.write(cr, uid, awi_id, values)
+-
+  I check that the withholding document sequence '00001000' state is draft and
+  that the two invoices was added, and also that the withholding number
+  remains.
+-
+    !assert {model: account.invoice, id: supplier_seq_invoice_2, string: )}:
+        - wh_iva_id.state == 'draft'
+        - wh_iva_id.wh_lines
+        - wh_iva_id.number
+-
+  I check that the re used withholding sequence number remains '0001000'.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_2' )
+        awi_brw = self.browse(cr, uid, inv_id).wh_iva_id
+        assert '00001000' in awi_brw.number, 'The initial mark for this test is not correctly set, so it can continue'
+-
+  I compute the taxes manually with the button 'Compute Withholding Vat'.
+-
+    !function {model: account.wh.iva, name: compute_amount_wh}:
+        - model: account.invoice
+          eval: "[obj(ref('supplier_seq_invoice_2')).wh_iva_id.id]"
+-
+  I confirm the withholding document
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_2' )
+        inv_brw = self.browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        import netsvc
+        from openerp.osv import osv
+        wf_service = netsvc.LocalService( 'workflow' )
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'wh_iva_confirmed', cr)
+-
+  I check the withholding is confirm and that the wh number is set.
+-
+    !assert {model: account.invoice, id: supplier_seq_invoice_2, string: The withholding was not correctly confirm.}:
+        - wh_iva_id.state == 'confirmed'
+        - wh_iva_id.number
+-
+  I check that the re used withholding sequence number remains '0001000'.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_2' )
+        awi_brw = self.browse(cr, uid, inv_id).wh_iva_id
+        assert '00001000' in awi_brw.number, 'The initial mark for this test is not correctly set, so it can continue'
+-
+  I set the withholding to done state.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_2' )
+        inv_brw = self.browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        import netsvc
+        from openerp.osv import osv
+        wf_service = netsvc.LocalService( 'workflow' )
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'wh_iva_done', cr)
+-
+  I check the withholding is done and that the wh number is set.
+-
+    !assert {model: account.invoice, id: supplier_seq_invoice_2, string: The withholding was not correctly done.}:
+        - wh_iva_id.state == 'done'
+        - wh_iva_id.number
+-
+  I check that the re used withholding sequence number remains '0001000'.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_seq_invoice_2' )
+        awi_brw = self.browse(cr, uid, inv_id).wh_iva_id
+        assert '00001000' in awi_brw.number, 'The initial mark for this test is not correctly set, so it can continue'

=== added file 'l10n_ve_withholding_iva/test/purchase_wh_iva_txt.yml'
--- l10n_ve_withholding_iva/test/purchase_wh_iva_txt.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_iva/test/purchase_wh_iva_txt.yml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,300 @@
+-
+  7. I make test over the txt docuemnts in purchase operations.
+-
+  7.1 I configure the enviroment.
+-
+  I configure the context for purchase operations.
+-
+    !context
+        'type': 'in_invoice'
+-
+  I set the company as a withholding agent (because is the only I can create a supplier withholdings).
+-
+    !record {model: res.partner, id: base.main_partner}:
+        wh_iva_agent: True
+-
+  I check that the company is withholding agent.
+-
+    !assert {model: res.partner, id: base.main_partner, string: The Company is not a withholding agent}:
+        - wh_iva_agent
+-
+  I check that the supplier that will be use exist.
+-
+    !assert {model: res.partner, id: l10n_ve_fiscal_requirements.f_req_partner_1, string: The supplier used in this test exist}:
+        - id
+-
+  I check that the tax that will be use is withholdeable.
+-
+    !assert {model: account.tax, id: l10n_ve_fiscal_requirements.iva_purchase1, string: The tax is not withholdeable}:
+        - ret
+-
+  I check that the account that will be use is payable type.
+-
+    !assert {model: account.account, id: account.a_pay, string: The account is not of payable type}:
+        - type == 'payable'
+-
+  7.2 I check that txt document with no txt lines can not be confirm.
+-
+  I create a txt document.
+-
+    !record {model: txt.iva, id: supplier_txt_iva_1}:
+        #name: auto fll generic
+        #period: current.
+        date_start: !eval time.strftime('%Y-%m-%d')
+        date_end: !eval time.strftime('%Y-%m-%d')
+-
+  I check that the txt document is in draft state with no txt lines.
+-
+    !assert {model: txt.iva, id: supplier_txt_iva_1, string: the txt document was not correctly created}:
+        - state == 'draft'
+        - not txt_ids
+-
+  I try to confirm the txt document with empty txt lines.
+-
+    !python {model: txt.iva}: |
+        txt_id = ref( 'supplier_txt_iva_1' )
+        try:
+            self.action_confirm(cr, uid, txt_id)
+            assert False, 'The txt document can be confirm when have empty txt lines.'
+        except Exception as e:
+            pass
+-
+  I check that the txt document remains in draft state.
+-
+    !assert {model: txt.iva, id: supplier_txt_iva_1, string: the txt document can not pass to confirm state}:
+        - state == 'draft'
+-
+  7.3 Using the txt document in 7.2 I check that only done withholding
+  documents can be add to a txt document.
+-
+  I create a supplier invoice.
+-
+    !record {model: account.invoice, id: supplier_txt_invoice_1, view: account.invoice_supplier_form}: &supplier_txt_invoice
+        nro_ctrl: PURCHASE-IVA-TXT-INVOICE-0001
+        supplier_invoice_number: PURCHASE-IVA-TXT-INVOICE-0001
+        partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
+        account_id: account.a_pay
+        company_id: base.main_company
+        currency_id: base.EUR
+        reference_type: none
+        invoice_line:
+          - product_id: product.product_product_4
+            quantity: 3
+            uos_id: product.product_uom_unit
+            price_unit: 3
+            account_id: account.a_pay
+            invoice_line_tax_id:
+            - l10n_ve_fiscal_requirements.iva_purchase1
+-
+  I check the invoice type, state and have not wh doc.
+-
+    !assert {model: account.invoice, id: supplier_txt_invoice_1, string: The invoice was not correctly created. It need to be set in draft state, a supplier invoice type (in_invoice) and have not withholding document associaded.}:
+        - state == 'draft'
+        - type == 'in_invoice'
+        - not wh_iva_id
+-
+  I confirm the invoice to create the withholding document.
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: supplier_txt_invoice_1}
+-
+  I check that the invoice is confirmed and it generate a withholding doc.
+-
+    !assert {model: account.invoice, id: supplier_txt_invoice_1, string: The invoice was not correctly confirm. It need to change to open state (confirmed) and also generate and link a withholding document}:
+        - state == 'open'
+        - wh_iva_id
+-
+  I check that the withholding document state is draft.
+-
+    !assert {model: account.invoice, id: supplier_txt_invoice_1, string: When creating a supplier withholding via supplier invoice confirmation the state of the withholding document must be draft, and the wh number is unset (they will be set when the withholding is confirmed)}:
+        - wh_iva_id.state == 'draft'
+-
+  I try to add the txt lines by pressing the 'Lines Generate TXT' button.
+-
+    !function {model: txt.iva, name: action_generate_lines_txt, id: supplier_txt_iva_1}:
+        - model: txt.iva
+          eval: "[ref('supplier_txt_iva_1')]"
+-
+  I check that only withholding documents in done state are added.
+-
+    !python {model: txt.iva}: |
+        txt_id = ref( 'supplier_txt_iva_1' )
+        txt_brw = self.browse(cr, uid, txt_id)
+        for txt_line_brw in txt_brw.txt_ids:
+            assert txt_line_brw.voucher_id.state == 'done', 'Error, only can add withholding documents in done state.'
+-
+  I confirm the withholding document.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_txt_invoice_1' )
+        inv_brw = self.browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        import netsvc
+        from openerp.osv import osv
+        wf_service = netsvc.LocalService( 'workflow' )
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'wh_iva_confirmed', cr)
+-
+  I check that the withholding document was confirm.
+-
+    !assert {model: account.invoice, id: supplier_txt_invoice_1, string: The withholding document was not correctly confirm}:
+        - wh_iva_id.state == 'confirmed'
+-
+  I try to add the txt lines by pressing the 'Lines Generate TXT' button.
+-
+    !function {model: txt.iva, name: action_generate_lines_txt, id: supplier_txt_iva_1}:
+        - model: txt.iva
+          eval: "[ref('supplier_txt_iva_1')]"
+-
+  I check that only withholding documents in done state are added.
+-
+    !python {model: txt.iva}: |
+        txt_id = ref( 'supplier_txt_iva_1' )
+        txt_brw = self.browse(cr, uid, txt_id)
+        for txt_line_brw in txt_brw.txt_ids:
+            assert txt_line_brw.voucher_id.state == 'done', 'Error, only can add withholding documents in done state.'
+-
+  I change the withholding document to done.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_txt_invoice_1' )
+        inv_brw = self.browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        import netsvc
+        from openerp.osv import osv
+        wf_service = netsvc.LocalService( 'workflow' )
+        wf_service.trg_validate(uid, 'account.wh.iva', awi_id, 'wh_iva_done', cr)
+-
+  I check that the withholding document was set to done.
+-
+    !assert {model: account.invoice, id: supplier_txt_invoice_1, string: The withholding document was not correctly confirm}:
+        - wh_iva_id.state == 'done'
+-
+  I try to add the txt lines by pressing the 'Lines Generate TXT' button.
+-
+    !function {model: txt.iva, name: action_generate_lines_txt, id: supplier_txt_iva_1}:
+        - model: txt.iva
+          eval: "[ref('supplier_txt_iva_1')]"
+-
+  I check that only withholding documents in done state are added.
+-
+    !python {model: txt.iva}: |
+        txt_id = ref( 'supplier_txt_iva_1' )
+        txt_brw = self.browse(cr, uid, txt_id)
+        for txt_line_brw in txt_brw.txt_ids:
+            assert txt_line_brw.voucher_id.state == 'done', 'Error, only can add withholding documents in done state.'
+-
+  I check that the txt lines where added.
+-
+    !assert {model: txt.iva, id: supplier_txt_iva_1, string: the txt lines were not added}:
+        - txt_ids
+-
+  7.4 I check that a withholding document can be cancel only when the txt
+  document associated are in draft state.
+-
+  I check that the txt document is in draft state.
+-
+    !assert {model: txt.iva, id: supplier_txt_iva_1, string: the txt document is not in draft state}:
+        - state == 'draft' 
+-
+  I confirm the txt document.
+-
+    !function {model: txt.iva, name: action_confirm, ref: supplier_txt_iva_1}:
+        - model: txt.iva
+          eval: "[ref('supplier_txt_iva_1')]"
+-
+  I check that the txt document is confirmed.
+-
+    !assert {model: txt.iva, id: supplier_txt_iva_1, string: the txt document is not in confirmed state}:
+        - state == 'confirmed'
+-
+  I update the invoice and withholding journals to be able to cancel entries.
+-
+    !python {model: account.invoice}: |
+        inv_id = ref( 'supplier_txt_invoice_1' )
+        journal_obj = self.pool.get( 'account.journal' )
+        inv_brw = self.browse(cr, uid, inv_id)
+        inv_journal_id = inv_brw.journal_id.id
+        wh_journal_id = inv_brw.wh_iva_id.journal_id.id
+        journal_obj.write(
+            cr, uid, [inv_journal_id, wh_journal_id], {'update_posted': True})
+-
+  I try to cancel the withholding document.
+-
+    !python {model: account.wh.iva}: |
+        inv_id = ref( 'supplier_txt_invoice_1')
+        inv_brw = self.pool.get('account.invoice').browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        # Note: not use of workflow because it can not manage the exception.
+        try:
+            self.cancel_check(cr, uid, awi_id)
+            assert False, 'The withholding document can not change to cancel state. because has a txt document associated in confirmed state.'
+
+            self.action_cancel(cr, uid, awi_id)
+        except Exception as e:
+            pass
+-
+  I check that the wihholding document remains in done state.
+-
+    !assert {model: account.invoice, id: supplier_txt_invoice_1, string: The withholding document can not be cancel}:
+        - wh_iva_id.state == 'done'
+-
+  I change the txt document to done state.
+-
+    !function {model: txt.iva, name: action_done, ref: supplier_txt_iva_1}:
+        - model: txt.iva
+          eval: "[ref('supplier_txt_iva_1')]"
+-
+  I check that the txt document is in done state.
+-
+    !assert {model: txt.iva, id: supplier_txt_iva_1, string: the txt document is not in confirmed state}:
+        - state == 'done'
+-
+  I try to cancel the withholding document.
+-
+    !python {model: account.wh.iva}: |
+        inv_id = ref( 'supplier_txt_invoice_1')
+        inv_brw = self.pool.get('account.invoice').browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        # Note: not use of workflow because it can not manage the exception.
+        try:
+            self.cancel_check(cr, uid, awi_id)
+            assert False, 'The withholding document can not change to cancel state. because has a txt document associated with done state.'
+            self.action_cancel(cr, uid, awi_id)
+        except Exception as e:
+            pass
+-
+  I check that the wihholding document remains in done state.
+-
+    !assert {model: account.invoice, id: supplier_txt_invoice_1, string: The withholding document can not be cancel}:
+        - wh_iva_id.state == 'done'
+-
+  I change the txt document to draft state.
+-
+    !function {model: txt.iva, name: action_anular, ref: supplier_txt_iva_1}:
+        - model: txt.iva
+          eval: "[ref('supplier_txt_iva_1')]"
+-
+  I check that the txt document is in draft state.
+-
+    !assert {model: txt.iva, id: supplier_txt_iva_1, string: the txt document is not in draft state}:
+        - state == 'draft'
+-
+  I try to cancel the withholding document. It change with no problems.
+-
+    !python {model: account.wh.iva}: |
+        inv_id = ref( 'supplier_txt_invoice_1')
+        inv_brw = self.pool.get('account.invoice').browse(cr, uid, inv_id)
+        awi_id = inv_brw.wh_iva_id.id
+        # Note: not use of workflow because it can not manage the exception.
+        try:
+            self.cancel_check(cr, uid, awi_id)
+            self.action_cancel(cr, uid, [awi_id])
+            assert self.browse(cr, uid, awi_id).state == 'cancel', 'The withholding document should change to cancel state.'
+        except Exception as e:
+            assert False, 'The withholding document can be change to cancel state and is not, so there is a problem in the code.'
+
+# To cancel a awi need to call:
+#  - from done state: cancel_check()
+#  - from the anothe states: nothing, only the signal 'cancel' to a signal 'cancel'
+# Need execute this actions:
+#   action_cancel()
+#   write state to cancel

=== modified file 'l10n_ve_withholding_iva/test/sale_wh_iva.yml'
--- l10n_ve_withholding_iva/test/sale_wh_iva.yml	2013-12-05 17:33:58 +0000
+++ l10n_ve_withholding_iva/test/sale_wh_iva.yml	2013-12-17 20:29:18 +0000
@@ -1087,3 +1087,51 @@
         assert False, 'This can not happend. Only Open and Paid invoices can be added.'
     except Exception as e:
         pass
+-
+  3.9 I check that can not confirm a customer withholding with no wh lines. 
+-
+  I create a customer withholding document manually.
+-
+    !record {model: account.wh.iva, id: customer_no_lines_awi, view: l10n_ve_withholding_iva.view_wh_iva_form_customer}:
+        name: MANUAL CUSTOMER AWI WITH NO WH LINES
+        <<: *awi_sale_011
+-
+  I check that the withholding document was correctly created.
+-
+    !assert {model: account.wh.iva, id: customer_no_lines_awi, string: The withholding document should be of sale type (out_invoice) and should be in draft state.}:
+        - type == 'out_invoice'
+        - state == 'draft'
+-
+  I search the current period and add it to the withholding doc.
+-
+  !python {model: account.wh.iva}: |
+    import time
+    awi_id = ref( 'customer_no_lines_awi' )
+    company_id = ref('base.main_company')
+    period_obj = self.pool.get('account.period')
+    period = period_obj.find(
+        cr, uid, time.strftime('%Y/%m/%d'), {'company_id': company_id})
+    assert period, 'There aren\'t periods for this date'
+    self.write(cr, uid, awi_id, {'period_id':period[0]})
+-
+  I compute the taxes manually with the button 'Compute Withholding Vat'.
+-
+    !function {model: account.wh.iva, name: compute_amount_wh, id: customer_no_lines_awi}:
+        - model: account.wh.iva
+          eval: "[ref('customer_no_lines_awi')]"
+-
+  I try to confirm the supplier withholding document.
+-
+    !python {model: account.wh.iva}: |
+        awi_id = ref('customer_no_lines_awi')
+        # Note: not use of workflow because it can not manage the exception.
+        try:
+            self.confirm_check(cr, uid, awi_id)
+            assert False, 'The withholding document can not be confirmed because has not wh lines associated.'
+        except Exception as e:
+            pass
+-
+  I check that the withholding document remains in draft.
+-
+    !assert {model: account.wh.iva, id: customer_no_lines_awi, string: The withholding document can not be confirm because it haf no wh lines}:
+        - state == 'draft'

=== modified file 'l10n_ve_withholding_iva/test/sale_wh_iva_sequence.yml'
--- l10n_ve_withholding_iva/test/sale_wh_iva_sequence.yml	2013-12-05 21:10:19 +0000
+++ l10n_ve_withholding_iva/test/sale_wh_iva_sequence.yml	2013-12-17 20:29:18 +0000
@@ -153,3 +153,130 @@
         awi_id = ref( 'awi_sale_seq_1' )
         awi_brw = self.browse(cr, uid, awi_id)
         assert 'SALE_TEST' in awi_brw.code, 'There was not used the customer withholding sequence of the demo data. The sequence by type of withholding document is badly used.'
+-
+  6.4 I check that the customer withholding sequence is used consecutively at the code field and it does not affect the withholding number.
+-
+  I create a customer withholding document.
+-
+    !record {model: account.wh.iva, id: awi_sale_seq_2}:
+        name: AWI SALE SEQ 002
+        number: TEST_MARK_2
+        <<: *awi_sale_seq
+-
+  I search the current period and add it to the withholding doc.
+-
+  !python {model: account.wh.iva}: |
+    import time
+    awi_id = ref( 'awi_sale_seq_2' )
+    company_id = ref('base.main_company')
+    period_obj = self.pool.get('account.period')
+    period = period_obj.find(
+        cr, uid, time.strftime('%Y/%m/%d'), {'company_id': company_id})
+    assert period, 'There aren\'t periods for this date'
+    self.write(cr, uid, awi_id, {'period_id':period[0]})
+-
+  I check that the withholding document state is draft and that the code field is set.
+-
+    !assert {model: account.wh.iva, id: awi_sale_seq_2, string: When creating a customer withholding the state of the withholding document must be draft, and the wh code set}:
+        - state == 'draft'
+        - code 
+-
+  I check that the withholding code is the consecutively one.
+-
+    !python {model: account.wh.iva}: |
+        awi_id = ref( 'awi_sale_seq_2' )
+        awi_brw = self.browse(cr, uid, awi_id)
+        assert 'SALE_TEST' in awi_brw.code, (
+            'There was not used the customer withholding sequence of the'
+            ' demo data. The sequence by type of withholding document is'
+            ' badly used.')
+        assert '00001000' in awi_brw.code, (
+            'The withholding documents are no creating consecutively')
+-
+  I create a customer invoice.
+-
+    !record {model: account.invoice, id: customer_seq_invoice_2, view: account.invoice_form}:
+        nro_ctrl: SALE-IVA-SEQ-INVOICE-0002
+        <<: *customer_seq_invoice
+-
+  I check the invoice type, state and have not wh doc.
+-
+    !assert {model: account.invoice, id: customer_seq_invoice_2, string: The invoice was not correctly created. It need to be set in draft state, a customer invoice type (out_invoice) and have not withholding document associaded.}:
+        - state == 'draft'
+        - type == 'out_invoice'
+        - not wh_iva_id
+-
+  I confirm the invoice.
+-
+    !workflow {model: account.invoice, action: invoice_open, ref: customer_seq_invoice_2}
+-
+  I check that the invoice is confirmed.
+-
+    !assert {model: account.invoice, id: customer_seq_invoice_2, string: The invoice was not correctly confirm.)}:
+        - state == 'open'
+-
+  I add the invoice to the withholding doc.
+-
+  !python {model: account.wh.iva}: |
+    awi_id = ref( 'awi_sale_seq_2' )
+    invoice_id = ref( 'customer_seq_invoice_2' )
+    values = {}
+    awi_brw = self.browse(cr, uid, awi_id)
+    res = self.onchange_partner_id(
+        cr, uid, [awi_id], 'out_invoice', awi_brw.partner_id.id)
+    values['wh_lines'] = [
+        (0, 0, {'invoice_id': invoice_id,
+                'name':'N/A',
+                'wh_iva_rate': awi_brw.partner_id.wh_iva_rate})]
+    values['account_id'] = res['value']['account_id']
+    self.write(cr, uid, awi_id, values)
+-
+  I compute the taxes manually with the button 'Compute Withholding Vat'.
+-
+    !function {model: account.wh.iva, name: compute_amount_wh, id: awi_sale_seq_2}:
+        - model: account.wh.iva
+          eval: "[ref('awi_sale_seq_2')]"
+-
+  I confirm the withholding document.
+-
+    !workflow {model: account.wh.iva, action: wh_iva_confirmed, ref: awi_sale_seq_2}
+-
+  I check the withholding is confirm and that the withholding number remains.
+-
+    !assert {model: account.wh.iva, id: awi_sale_seq_2, string: The withholding was not correctly confirm.}:
+        - state == 'confirmed'
+        - number == 'TEST_MARK_2'
+-
+  I check that the withholding code remains.
+-
+    !python {model: account.wh.iva}: |
+        awi_id = ref( 'awi_sale_seq_2' )
+        awi_brw = self.browse(cr, uid, awi_id)
+        assert 'SALE_TEST' in awi_brw.code, (
+            'The withholding code have been change when confirming the'
+            ' withholdng document. Is not the correct one (the sales type).')
+        assert '00001000' in awi_brw.code, (
+            'The withholding code have been change when confirming the'
+            ' withholding document. It increments when it need to remains.')
+-
+  I change the withholding to done state.
+-
+    !workflow {model: account.wh.iva, action: wh_iva_done, ref: awi_sale_seq_2}
+-
+  I check the withholding is done and that the wh number remains.
+-
+    !assert {model: account.wh.iva, id: awi_sale_seq_2, string: The withholding was not correctly done.}:
+        - state == 'done'
+        - number == 'TEST_MARK_2'
+-
+  I check that the withholding code remains.
+-
+    !python {model: account.wh.iva}: |
+        awi_id = ref( 'awi_sale_seq_2' )
+        awi_brw = self.browse(cr, uid, awi_id)
+        assert 'SALE_TEST' in awi_brw.code, (
+            'The withholding code have been change when confirming the'
+            ' withholdng document. Is not the correct one (the sales type).')
+        assert '00001000' in awi_brw.code, (
+            'The withholding code have been change when confirming the'
+            ' withholding document. It increments when it need to remains.')

=== modified file 'l10n_ve_withholding_iva/view/wh_iva_view.xml'
--- l10n_ve_withholding_iva/view/wh_iva_view.xml	2013-12-02 22:49:32 +0000
+++ l10n_ve_withholding_iva/view/wh_iva_view.xml	2013-12-17 20:29:18 +0000
@@ -15,7 +15,11 @@
                 <tree string="Withholding Lines">
                     <button name="load_taxes" string="Load Taxes" type="object" icon="gtk-ok" colspan="2" help="Click on this button to ensure the invoice related compute correctly taxes for this line of withholding, it is necesary looking to allow manually force if your are not agreed with automatic computation."/>
                     <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), ('type', '=', parent.type)]"/>
+                    <field 
+                        name="invoice_id" 
+                        on_change="invoice_id_change(invoice_id)" 
+                        domain="[('state', '=', 'open'), ('wh_iva', '=', False), ('type', '=', parent.type), '|', ('partner_id','=',parent.partner_id), ('partner_id','child_of',parent.partner_id)]"
+                        />
 <!--                    <field name="retention_rate" />-->
                     <field name="amount_tax_ret"/>
                     <field name="wh_iva_rate"/>
@@ -33,7 +37,11 @@
                     <notebook>
                         <page string="Withheld Invoice">
                             <group colspan="4">
-                                <field name="invoice_id" on_change="invoice_id_change(invoice_id)" domain="[('state', '=', 'open'), ('wh_iva', '=', False), ('partner_id','=',parent.partner_id), ('type', '=', parent.type)]"/>
+                            <field 
+                                name="invoice_id" 
+                                on_change="invoice_id_change(invoice_id)" 
+                                domain="[('state', '=', 'open'), ('wh_iva', '=', False), ('type', '=', parent.type), '|', ('partner_id','=',parent.partner_id), ('partner_id','child_of',parent.partner_id)]"
+                                />
                                 <field name="name"/>
                                 <field name="move_id"/>
                             </group>
@@ -148,7 +156,10 @@
                         <field name="journal_id" select="2" domain="[('type','=','iva_purchase')]"/>
                         <field name="type"/>
                         <field name="code"/>
-                        <field name="partner_id" on_change="onchange_lines_filter(type, partner_id, period_id, fortnight)" domain="[('supplier','=',True)]"/>
+                        <field 
+                            name="partner_id" 
+                            on_change="onchange_lines_filter(type, partner_id, period_id, fortnight)" 
+                            domain="[('supplier','=',True),('parent_id','=',False)]"/>
                         <field name="currency_id"/>
                         <field name="date_ret" readonly="1"/>
                         <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
@@ -198,7 +209,10 @@
                         <field name="journal_id" select="2" domain="[('type','=','iva_sale')]"/>
                         <field name="type" select="2"/>
                         <field name="code" select="1"/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" select="1" domain="[('wh_iva_agent','=',True), ('customer','=',True)]"/>
+                        <field 
+                            name="partner_id" 
+                            on_change="onchange_partner_id(type,partner_id)" 
+                            domain="[('wh_iva_agent','=',True), ('customer','=',True), ('parent_id','=',False)]"/>
                         <field name="currency_id"/>
                         <field name="date_ret" attrs="{'readonly':[('state','!=','draft')]}"/>
                         <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>

=== modified file 'l10n_ve_withholding_muni/__openerp__.py'
--- l10n_ve_withholding_muni/__openerp__.py	2013-12-02 17:31:34 +0000
+++ l10n_ve_withholding_muni/__openerp__.py	2013-12-17 20:29:18 +0000
@@ -46,9 +46,13 @@
         'data/wh_muni_sequence.xml',
     ],
     'demo_xml': [
+        'demo/demo_accounts.xml',
+        'demo/demo_partners.xml',
         'demo/demo_journal.xml',
     ],
     'test': [
+        'test/awm_supplier.yml',
+        'test/awm_customer.yml'
     ],
     'installable': True,
     'active': False,

=== modified file 'l10n_ve_withholding_muni/data/wh_muni_sequence.xml'
--- l10n_ve_withholding_muni/data/wh_muni_sequence.xml	2013-12-02 17:31:34 +0000
+++ l10n_ve_withholding_muni/data/wh_muni_sequence.xml	2013-12-17 20:29:18 +0000
@@ -5,24 +5,24 @@
         <!-- Sequences type for account.wh.munici --> 
         <record id="seq_type_account_wh_muni_purchase" model="ir.sequence.type">
             <field name="name">Withholding local.purchase</field>
-            <field name="code">account.journal.wh.purchase</field>
+            <field name="code">account.wh.muni.in_invoice</field>
         </record>
         <record id="seq_type_account_wh_muni_sale" model="ir.sequence.type">
             <field name="name">Withholding local.sale</field>
-            <field name="code">account.journal.wh.sale</field>
+            <field name="code">account.wh.muni.out_invoice</field>
         </record>
 
         <!-- Sequences -->
         <record id="seq_wh_purchase_journal" model="ir.sequence">
             <field name="name">Retencion Municipal de Compra</field>                 
-            <field name="code">account.journal.wh.purchase</field>            
+            <field name="code">account.wh.muni.in_invoice</field>            
             <field name="prefix">RMC-</field>                                    
             <field name="padding">8</field>                                     
             <field name="number_increment">1</field>                            
         </record>
         <record id="seq_wh_sale_journal" model="ir.sequence">
             <field name="name">Retencion Municipal de Venta</field>                 
-            <field name="code">account.journal.wh.sale</field>            
+            <field name="code">account.wh.muni.out_invoice</field>            
             <field name="prefix">RMV-</field>                                    
             <field name="padding">8</field>                                     
             <field name="number_increment">1</field>                            

=== added file 'l10n_ve_withholding_muni/demo/demo_accounts.xml'
--- l10n_ve_withholding_muni/demo/demo_accounts.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_muni/demo/demo_accounts.xml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+    <data noupdate="1">
+        <!-- Minimal Accounts for demo 
+             -->
+        <record id="muni_rec" model="account.account">
+            <field name="code">X11050</field>
+            <field name="name">Muni withheld by Customers</field>
+            <field ref="account.cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+        
+        <record id="muni_pay" model="account.account">
+            <field name="code">X1155</field>
+            <field name="name">Muni withheld to Suppliers</field>
+            <field ref="account.cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+        </record>
+   </data>
+</openerp>
+

=== added file 'l10n_ve_withholding_muni/demo/demo_partners.xml'
--- l10n_ve_withholding_muni/demo/demo_partners.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_muni/demo/demo_partners.xml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+    <data>
+        <!-- Due to the need of country in main_partner to validate the WithHolding. We change the 
+             Country of its invoice address and VAT due to the mandatory VAT number for partners 
+             in VE.
+        -->
+        <record id="base.main_partner" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <!--BEGIN PARTNERS -->
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_1" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_2" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_3" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_4" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_5" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_6" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <!-- An orphan contact without parent_id this record shoudl be used to test this case
+             fiscally-->
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_7" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_8" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_9" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <!-- I will add contacts to Vauxoo, due to they are from Venezuela, the vat is mandatory. 
+             -->
+        <record id="base.res_partner_23" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <!-- Test a contact in a country with one invoice address different to the main company 
+             Forced to have a vat just to pass TODO: remove vat when the contraint s fixed.     
+        -->
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_10" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <!-- Test a contact in a country with one contact address different to the main company -->
+        <record id="l10n_ve_fiscal_requirements.f_req_partner_10" model="res.partner">
+            <field name="property_wh_munici_receivable" ref="muni_rec"/>
+            <field name="property_wh_munici_payable" ref="muni_pay"/>
+        </record>
+        
+        <!--END PARTNERS -->
+    </data>
+</openerp>
+

=== modified file 'l10n_ve_withholding_muni/model/invoice.py'
--- l10n_ve_withholding_muni/model/invoice.py	2013-11-18 02:06:26 +0000
+++ l10n_ve_withholding_muni/model/invoice.py	2013-12-17 20:29:18 +0000
@@ -25,6 +25,7 @@
 
 import time
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 
 class account_invoice(osv.osv):
@@ -51,6 +52,8 @@
                             writeoff_period_id, writeoff_journal_id, date,
                             name, context=context)
         if context.get('muni_wh', False):
+            rp_obj = self.pool.get('res.partner')
+            acc_part_brw = rp_obj._find_accounting_partner(to_wh.invoice_id.partner_id)
             invoice = self.browse(cr, uid, ids[0])
             types = {
               'out_invoice': -1,
@@ -59,17 +62,23 @@
               'in_refund': -1
             }
             direction = types[invoice.type]
+            if to_wh.retention_id.type == 'in_invoice':
+                acc = acc_part_brw.property_wh_munici_payable and acc_part_brw.property_wh_munici_payable.id or False
+            else:
+                acc = acc_part_brw.property_wh_munici_receivable and acc_part_brw.property_wh_munici_receivable.id or False
+            if not acc:
+                raise osv.except_osv(_('Missing Local Account in Partner!'),_("Partner [%s] has missing Local account. Please, fill the missing field") % (acc_part_brw.name,))
             res.append((0, 0, {
                 'debit': direction * to_wh.amount < 0 and
                          - direction * to_wh.amount,
                 'credit': direction * to_wh.amount > 0 and
                           direction * to_wh.amount,
-                'partner_id': invoice.partner_id.id,
+                'partner_id': acc_part_brw.id,
                 'ref': invoice.number,
                 'date': date,
                 'currency_id': False,
                 'name': name,
-                'account_id': to_wh.retention_id.account_id.id,
+                'account_id': acc,
             }))
         return res
 
@@ -142,6 +151,22 @@
                           [('move_id', 'in', move.keys())], context=context)
         return invoice_ids
 
+    def action_cancel(self, cr, uid, ids, context=None):
+        """ Verify first if the invoice have a non cancel local withholding doc.
+        If it has then raise a error message. """
+        context = context or {}
+        for inv_brw in self.browse(cr, uid, ids, context=context):
+            if not inv_brw.wh_muni_id:
+                super(account_invoice, self).action_cancel(cr, uid, ids,
+                                                           context=context)
+            else:
+                raise osv.except_osv(_("Error!"),
+                _("You can't cancel an invoice that have non cancel"
+                  " Local Withholding Document. Needs first cancel the invoice"
+                  " Local Withholding Document and then you can cancel this"
+                  " invoice."))
+        return True
+
     _columns = {
         'wh_local': fields.function(_retenida_munici, method=True,
             string='Local Withholding', type='boolean',

=== modified file 'l10n_ve_withholding_muni/model/wh_muni.py'
--- l10n_ve_withholding_muni/model/wh_muni.py	2013-12-02 18:50:07 +0000
+++ l10n_ve_withholding_muni/model/wh_muni.py	2013-12-17 20:29:18 +0000
@@ -110,6 +110,41 @@
         ('ret_num_uniq', 'unique (number)', 'number must be unique !')
     ]
 
+    def action_cancel(self, cr, uid, ids, context=None):
+        """ Call cancel_move and return True
+        """
+        context = context or {}
+        self.cancel_move(cr, uid, ids)
+        self.clear_munici_line_ids(cr, uid, ids, context=context)
+        return True
+
+    def cancel_move(self,cr,uid,ids, *args):
+        """ Delete move lines related with withholding vat and cancel
+        """
+        ret_brw = self.browse(cr, uid, ids)
+        account_move_obj = self.pool.get('account.move')
+        for ret in ret_brw:
+            if ret.state == 'done':
+                for ret_line in ret.munici_line_ids:
+                    ret_line.move_id and account_move_obj.button_cancel(cr, uid, [ret_line.move_id.id])
+                    ret_line.move_id and account_move_obj.unlink(cr, uid,[ret_line.move_id.id])
+            self.write(cr, uid, ret.id, {'state':'cancel'})
+        return True
+
+    def clear_munici_line_ids(self, cr, uid, ids, context=None):
+        """ Clear lines of current withholding document and delete wh document
+        information from the invoice.
+        """
+        context = context or {}
+        wml_obj = self.pool.get('account.wh.munici.line')
+        ai_obj = self.pool.get('account.invoice')
+        if ids:
+            wml_ids = wml_obj.search(cr, uid, [('retention_id', 'in', ids)], context=context)
+            ai_ids = wml_ids and [ wml.invoice_id.id for wml in wml_obj.browse(cr, uid, wml_ids, context=context) ]
+            ai_ids and ai_obj.write(cr, uid, ai_ids, {'wh_muni_id': False}, context=context)
+            wml_ids and wml_obj.unlink(cr, uid, wml_ids, context=context)
+        return True
+
     def action_confirm(self, cr, uid, ids, context=None):
         """ Verifies the amount withheld and the document is confirmed
         """
@@ -165,10 +200,11 @@
                         "You must omit the follow invoice '%s' !") % (line.invoice_id.name,))
                     return False
 
-            acc_id = ret.partner_id.property_wh_munici_payable.id
+            acc_id = ret.account_id.id
             if not ret.date_ret:
                 self.write(cr, uid, [ret.id], {'date_ret':
                            time.strftime('%Y-%m-%d')})
+                ret = self.browse(cr, uid, ret.id, context = context)
 
             period_id = ret.period_id and ret.period_id.id or False
             journal_id = ret.journal_id.id
@@ -202,94 +238,59 @@
                         cr, uid, [line.invoice_id.id], {'wh_muni_id': ret.id})
         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):
         """ Changing the partner is again determinated accounts and lines retain for document                                                      
         @param type: invoice type                                               
         @param partner_id: vendor or buyer                                      
         """        
+        context = context or {}
         acc_id = False
+        rp_obj = self.pool.get('res.partner')
         if partner_id:
-            p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            acc_part_brw = rp_obj._find_accounting_partner(rp_obj.browse(cr, uid, partner_id))
             if type in ('out_invoice', 'out_refund'):
-                acc_id = p.property_account_receivable and p.property_account_receivable.id or False
+                acc_id = acc_part_brw.property_account_receivable and acc_part_brw.property_account_receivable.id or False
             else:
-                acc_id = p.property_account_payable and p.property_account_payable.id or False
-
-        self._update_check(cr, uid, ids, partner_id)
+                acc_id = acc_part_brw.property_account_payable and acc_part_brw.property_account_payable.id or False
         result = {'value': {
             'account_id': acc_id}
         }
-
         return result
 
-    def _update_check(self, cr, uid, ids, partner_id, context=None):
+    def _update_check(self, cr, uid, ids, context=None):
         """ Check if the invoices are selected partner
         """
-        if context is None:
-            context = {}
-        if ids:
-            ret = self.browse(cr, uid, ids[0])
-            inv_str = ''
-            for line in ret.munici_line_ids:
-                if line.invoice_id.partner_id.id != partner_id:
-                    inv_str += '%s' % '\n' + line.invoice_id.name
-
-            if inv_str:
-                raise osv.except_osv('Incorrect Invoices !',
-                                     "The following invoices are not the selected partner: %s " % (inv_str,))
-
-        return True
-
-    def _new_check(self, cr, uid, values, context=None):
-        """ Check amount withheld and Check if the invoices are selected partner
-        """
-        if context is None:
-            context = {}
-        lst_inv = []
-
-        if 'munici_line_ids' in values and values['munici_line_ids']:
-            if 'partner_id' in values and values['partner_id']:
-                for l in values['munici_line_ids']:
-                    if 'invoice_id' in l[2] and l[2]['invoice_id']:
-                        lst_inv.append(l[2]['invoice_id'])
-
-        if lst_inv:
-            invoices = self.pool.get(
-                'account.invoice').browse(cr, uid, lst_inv)
-            inv_str = ''
-            for inv in invoices:
-                if inv.partner_id.id != values['partner_id']:
-                    inv_str += '%s' % '\n' + inv.name
-
-            if inv_str:
-                raise osv.except_osv('Incorrect Invoices !',
-                                     "The following invoices are not the selected partner: %s " % (inv_str,))
-
-        return True
-
-    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        rp_obj = self.pool.get('res.partner')
+        for id in ids:
+            inv_str = ''
+            awm_brw = self.browse(cr, uid, id, context=context)
+            for line in awm_brw.munici_line_ids:
+                acc_part_brw = rp_obj._find_accounting_partner(line.invoice_id.partner_id)
+                if acc_part_brw.id != awm_brw.partner_id.id:
+                    inv_str+= '%s'% '\n'+(line.invoice_id.name or line.invoice_id.number or '')
+            if inv_str:
+                raise osv.except_osv('Incorrect Invoices !', "The following invoices are not from the selected partner: %s " % (inv_str,))
+
+        return True
+
+    def write(self, cr, uid, ids, vals, context=None):
         """ Validate invoices before update records
         """
-        if context is None:
-            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_munici, self).write(cr, uid, ids, vals, context=context)
-
-    def create(self, cr, uid, vals, context=None, check=True):
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        res = super(account_wh_munici,self).write(cr, uid, ids, vals, context=context)
+        self._update_check(cr, uid, ids, context=context)
+        return res
+
+    def create(self, cr, uid, vals, context=None):
         """ Validate before create record
         """
-        if context is None:
-            context = {}
-        if check:
-            self._new_check(cr, uid, vals, context)
-
-        return super(account_wh_munici, self).create(cr, uid, vals, context)
+        context = context or {}
+        new_id = super(account_wh_munici, self).create(cr, uid, vals, context=context)
+        self._update_check(cr, uid, new_id, context=context)
+        return new_id
 
     def unlink(self, cr, uid, ids, context=None):
         """ Overwrite the unlink method to throw an exception if the
@@ -303,6 +304,28 @@
                 super(account_wh_munici, self).unlink(cr, uid, ids, context=context)
         return True
 
+    def confirm_check(self, cr, uid, ids, context=None):
+        '''
+        Unique method to check if we can confirm the Withholding Document
+        '''
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+
+        if not self.check_wh_lines(cr, uid, ids, context=context):
+            return False
+        return True
+
+    def check_wh_lines(self, cr, uid, ids, context=None):
+        """ Check that wh muni has withholding lines"""
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        awm_brw = self.browse(cr, uid, ids[0], context=context)
+        if not awm_brw.munici_line_ids:
+            raise osv.except_osv(
+                _("Missing Values !"),
+                _("Missing Withholding Lines!"))
+        return True
+
 class account_wh_munici_line(osv.osv):
 
     def default_get(self, cr, uid, fields, context=None):
@@ -341,7 +364,7 @@
          'The invoice has already assigned in local withholding, you cannot assigned it twice!')
     ]
 
-    def onchange_invoice_id(self, cr, uid, ids, invoice_id, context=None):
+    def onchange_invoice_id(self, cr, uid, ids, invoice_id, wh_loc_rate=3.0, context=None):
         """ Validate that the bill is no longer assigned to retention
         @param invoice_id: invoice id
         """
@@ -352,20 +375,20 @@
         if hasattr(self, 'munici_context') and ('lines' in self.munici_context):
             lines = [x[2] for x in self.munici_context['lines']]
         if not invoice_id:
-            return {'value': {'amount': 0.0}}
+            return {'value': {'amount': 0.0,
+                              'wh_loc_rate': 0.0}}
         else:
-            ok = True
             res = self.pool.get(
                 'account.invoice').browse(cr, uid, invoice_id, context)
             cr.execute('select retention_id from account_wh_munici_line where invoice_id=%s',
                 (invoice_id,))
             ret_ids = cr.fetchone()
-            ok = ok and bool(ret_ids)
-            if ok:
+            if bool(ret_ids):
                 ret = self.pool.get(
                     'account.wh.munici').browse(cr, uid, ret_ids[0], context)
                 raise osv.except_osv('Assigned Invoice !',
                                      "The invoice has already assigned in local withholding code: '%s' !" % (ret.code,))
 
-            total = res.amount_total
-            return {'value': {'amount': total}}
+            total = res.amount_total * wh_loc_rate / 100.0
+            return {'value': {'amount': total,
+                              'wh_loc_rate': wh_loc_rate}}

=== added directory 'l10n_ve_withholding_muni/test'
=== added file 'l10n_ve_withholding_muni/test/awm_customer.yml'
--- l10n_ve_withholding_muni/test/awm_customer.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_muni/test/awm_customer.yml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,104 @@
+-
+  In order to test account withholding I create a new customer invoice
+-
+  I set the context that will be used for the encoding of all the invoices of this file
+-
+  !context
+    'type': 'out_invoice'
+-
+  I create a customer invoice
+-
+  !record {model: account.invoice, id: account_invoice_customer0, view: account.invoice_form }:
+    name: '0 yaml test account invoice customer 0'
+    account_id: account.a_recv
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: 'Test product description'
+        price_unit: 25.0
+        product_id: product.product_product_3
+        quantity: 100.0
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_6 
+    reference_type: none
+    type: 'out_invoice'
+-
+  I check that Initially customer invoice state is "Draft"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0}:
+    - state == 'draft'
+-
+  I check that the customer invoice is a "Customer Invoice"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0, string: This is not a customer invoice}:
+    - type == 'out_invoice'
+-
+  I change the state of invoice to open by clicking Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_customer0}
+-
+  I check that the invoice state is now "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0}:
+    - state == 'open'
+-
+  I create a customer withholding muni without wh lines
+-
+  !record {model: account.wh.munici, id: account_wh_customer01, view: l10n_ve_withholding_muni.view_wh_muni_form}: &awm_01
+    name: '0 yaml test account withholding customer 0'
+    account_id: account.a_pay
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: wh_purchase_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_6 
+    type: 'out_invoice'
+    number: '1122334455'
+-
+  I  change the state of muni withholding to Confirmed by clicking Confirmed button
+-
+  !python {model: account.wh.munici}: |
+    from openerp.osv import osv
+    awm_id = ref('account_wh_customer01')
+    awm_brw = self.browse(cr, uid, awm_id)
+    try:
+      awm_brw.confirm_check()
+    except osv.except_osv:
+      pass
+-
+  I check that the muni withholding state remains in Draft state
+-
+  !assert {model: account.wh.munici, id: account_wh_customer01}:
+    - state == 'draft'
+-
+  I create a customer withholding muni with wh lines
+-
+  !record {model: account.wh.munici, id: account_wh_customer02, view: l10n_ve_withholding_muni.view_wh_muni_form}: 
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_1 
+    number: '0102030405'
+    munici_line_ids:
+      - name: 'Test munici wh line'
+        invoice_id: account_invoice_customer0
+        wh_loc_rate: 100.0
+        amount: 200.0
+    <<: *awm_01
+-
+  I change the state of muni withholding to Confirmed by clicking Confirmed button
+-
+  !workflow {model: account.wh.munici, action: wh_muni_confirmed, ref: account_wh_customer02}
+-
+  I check that the muni withholding state change to Confirmed state
+-
+  !assert {model: account.wh.munici, id: account_wh_customer02}:
+    - state == 'confirmed'
+-
+  I change the state of muni withholding to Done by clicking Done button
+-
+  !workflow {model: account.wh.munici, action: wh_muni_done, ref: account_wh_customer02}
+-
+  I check that the muni withholding state change to Done state
+-
+  !assert {model: account.wh.munici, id: account_wh_customer02}:
+    - state == 'done'
+

=== added file 'l10n_ve_withholding_muni/test/awm_supplier.yml'
--- l10n_ve_withholding_muni/test/awm_supplier.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_muni/test/awm_supplier.yml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,100 @@
+-
+  In order to test account withholding I create a new supplier invoice
+-
+  I set the context that will be used for the encoding of all the invoices of this file
+-
+  !context
+    'type': 'in_invoice'
+-
+  I create a supplier invoice
+-
+  !record {model: account.invoice, id: account_invoice_supplier0, view: account.invoice_supplier_form }:
+    name: '0 yaml test account invoice supplier 0'
+    account_id: account.a_pay
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_expense
+        name: 'Test product description'
+        price_unit: 80.0
+        product_id: product.product_product_3
+        quantity: 100.0
+        uos_id: product.product_uom_unit
+    journal_id: account.expenses_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
+    reference_type: none
+    type: 'in_invoice'
+-
+  I check that Initially supplier invoice state is "Draft"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
+    - state == 'draft'
+-
+  I check that the supplier invoice is a "Supplier Invoice"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0, string: This is not a supplier invoice}:
+    - type == 'in_invoice'
+-
+  I change the state of invoice to open by clicking Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_supplier0}
+-
+  I check that the invoice state is now "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
+    - state == 'open'
+-
+  I create a supplier withholding muni without wh lines
+-
+  !record {model: account.wh.munici, id: account_wh_supplier01, view: l10n_ve_withholding_muni.view_wh_muni_form}: &awm_01
+    name: '0 yaml test account withholding supplier 0'
+    account_id: account.a_pay
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: wh_purchase_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
+    type: 'in_invoice'
+-
+  I  change the state of muni withholding to Confirmed by clicking Confirmed button
+-
+  !python {model: account.wh.munici}: |
+    from openerp.osv import osv
+    awm_id = ref('account_wh_supplier01')
+    awm_brw = self.browse(cr, uid, awm_id)
+    try:
+      awm_brw.confirm_check()
+    except osv.except_osv:
+      pass
+-
+  I check that the muni withholding state remains in Draft state
+-
+  !assert {model: account.wh.munici, id: account_wh_supplier01}:
+    - state == 'draft'
+-
+  I create a supplier withholding muni with wh lines
+-
+  !record {model: account.wh.munici, id: account_wh_supplier02, view: l10n_ve_withholding_muni.view_wh_muni_form}: 
+    munici_line_ids:
+      - name: 'Test munici wh line'
+        invoice_id: account_invoice_supplier0
+        wh_loc_rate: 100.0
+        amount: 200.0
+    <<: *awm_01
+-
+  I change the state of muni withholding to Confirmed by clicking Confirmed button
+-
+  !workflow {model: account.wh.munici, action: wh_muni_confirmed, ref: account_wh_supplier02}
+-
+  I check that the muni withholding state change to Confirmed state
+-
+  !assert {model: account.wh.munici, id: account_wh_supplier02}:
+    - state == 'confirmed'
+-
+  I change the state of muni withholding to Done by clicking Done button
+-
+  !workflow {model: account.wh.munici, action: wh_muni_done, ref: account_wh_supplier02}
+-
+  I check that the muni withholding state change to Done state
+-
+  !assert {model: account.wh.munici, id: account_wh_supplier02}:
+    - state == 'done'

=== modified file 'l10n_ve_withholding_muni/view/partner_view.xml'
--- l10n_ve_withholding_muni/view/partner_view.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_muni/view/partner_view.xml	2013-12-17 20:29:18 +0000
@@ -19,8 +19,8 @@
                     <notebook>
                         <page string="Local Withholdings">
                             <group col="4" colspan="2">
-                                    <field name="property_wh_munici_payable"/>
-                                    <field name="property_wh_munici_receivable"/>
+                                <field name="property_wh_munici_payable" attrs="{'required':'True'}"/>
+                                <field name="property_wh_munici_receivable" attrs="{'required':'True'}"/>
                             </group>
                         </page>
                     </notebook>
@@ -29,4 +29,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'l10n_ve_withholding_muni/view/wh_muni_view.xml'
--- l10n_ve_withholding_muni/view/wh_muni_view.xml	2013-12-02 21:53:10 +0000
+++ l10n_ve_withholding_muni/view/wh_muni_view.xml	2013-12-17 20:29:18 +0000
@@ -15,7 +15,7 @@
                 <tree string="Local Withholding line " editable="bottom">
                     <field name="name"/>
                     <field name="invoice_id" on_change="onchange_invoice_id(invoice_id)" domain="[('state', '=', 'open'), ('partner_id','=',parent.partner_id), ('wh_local', '=', False)]"/>
-                    <field name="wh_loc_rate"/>
+                    <field name="wh_loc_rate" on_change="onchange_invoice_id(invoice_id, wh_loc_rate)"/>
                     <field name="amount"/>
                     <field name="move_id"/>
                 </tree>
@@ -31,7 +31,7 @@
                         <page string="Linea">
                             <field name="invoice_id" on_change="onchange_invoice_id(invoice_id)" domain="[('state', '=', 'open'), ('partner_id','=',parent.partner_id), ('wh_local', '=', False)]"/>
                             <field colspan="4" name="name" select="1"/>
-                            <field name="wh_loc_rate"/>
+                            <field name="wh_loc_rate" on_change="onchange_invoice_id(invoice_id, wh_loc_rate)"/>
                             <field name="amount"/>
                             <field name="move_id"/>  
                         </page>
@@ -104,6 +104,13 @@
             <field name="model">account.wh.munici</field>
             <field name="arch" type="xml">
                 <form string="Local Withholding" version="7.0">
+                    <header>
+                        <button name="wh_muni_confirmed" states="draft" string="Confirm" icon="gtk-go-forward"/>
+                        <button name="wh_muni_done" states="confirmed" string="Done" icon="gtk-execute"/>
+                        <button name="cancel" colspan="2" states="confirmed,draft,done" string="Cancel" icon="gtk-cancel"/>
+                        <button name="set_to_draft" colspan="2" states="cancel" string="Set to draft" icon="terp-stock_effects-object-colorize"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors="{&quot;confirmed&quot;:&quot;blue&quot;}"/>
+                    </header>
                     <group colspan="4" col="6">
                         <field name="journal_id" select="2" domain="[('type','=','mun_purchase')]"/>
                         <field name="type"/>
@@ -121,11 +128,6 @@
                     <notebook colspan="4">
                         <page string="Withholding">
                             <field name="munici_line_ids" default_get="{'lines': munici_line_ids }" colspan="4" nolabel="1" height="275"/>
-                            <group col="4" colspan="2">
-                                <field name="state"/>
-                                <button name="wh_muni_confirmed" states="draft" string="Confirm" icon="gtk-execute"/>
-                                <button name="wh_muni_done" states="confirmed" string="Done" icon="gtk-execute"/>
-                            </group>
                         </page>
                         <page string="Other Information">
                             <field name="company_id"/>

=== modified file 'l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml'
--- l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml	2013-12-17 20:29:18 +0000
@@ -11,6 +11,8 @@
         <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wh_muni_order"/>
             <field name="flow_start">True</field>
+            <field name="action">write({'state':'draft'})</field>
+            <field name="kind">function</field>
             <field name="name">draft</field>
         </record>
 
@@ -32,10 +34,19 @@
             <field name="name">done</field>
         </record>
 
+        <record id="act_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wh_muni_order"/>
+            <field name="action">
+                action_cancel()
+            </field>
+            <field name="kind">function</field>
+            <field name="name">cancel</field>
+        </record>
 
         <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">confirm_check()</field>
             <field name="signal">wh_muni_confirmed</field>
         </record>
 
@@ -45,6 +56,29 @@
             <field name="signal">wh_muni_done</field>
         </record>
 
+        <record id="trans_draft_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel</field>
+        </record>
+
+        <record id="trans_confirmed_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirmed"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel</field>
+        </record>
+
+        <record id="trans_done_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel</field>
+        </record>
+        
+        <record id="trans_cancel_draft" model="workflow.transition">
+            <field name="act_from" ref="act_cancel"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">set_to_draft</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'l10n_ve_withholding_src/__openerp__.py'
--- l10n_ve_withholding_src/__openerp__.py	2013-11-18 04:14:18 +0000
+++ l10n_ve_withholding_src/__openerp__.py	2013-12-17 20:29:18 +0000
@@ -51,8 +51,13 @@
                 ],
     "init_xml" : [],
     "demo_xml" : [
-
+        'demo/demo_accounts.xml',
+        'demo/demo_company.xml',
     ], 
+    "test": [
+        'test/aws_customer.yml',
+        'test/aws_supplier.yml',
+    ],
     "update_xml" : [
         'security/wh_src_security.xml',
         'security/ir.model.access.csv',

=== added directory 'l10n_ve_withholding_src/demo'
=== added file 'l10n_ve_withholding_src/demo/demo_accounts.xml'
--- l10n_ve_withholding_src/demo/demo_accounts.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_src/demo/demo_accounts.xml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+    <data noupdate="1">
+        <!-- Minimal Accounts for demo 
+             -->
+        <record id="src_rec" model="account.account">
+            <field name="code">X11060</field>
+            <field name="name">SRC Withheld by Customers</field>
+            <field ref="account.cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+        
+        <record id="src_pay" model="account.account">
+            <field name="code">X1165</field>
+            <field name="name">SRC Withheld to Suppliers</field>
+            <field ref="account.cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+        </record>
+   </data>
+</openerp>
+
+

=== added file 'l10n_ve_withholding_src/demo/demo_company.xml'
--- l10n_ve_withholding_src/demo/demo_company.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_src/demo/demo_company.xml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+    <data>
+        <!--    Company    -->
+        <record id="base.main_company" model="res.company">
+            <field name="wh_src_collected_account_id" ref="src_rec"/>
+            <field name="wh_src_paid_account_id" ref="src_pay"/>
+        </record>
+    </data>
+</openerp>

=== modified file 'l10n_ve_withholding_src/model/invoice.py'
--- l10n_ve_withholding_src/model/invoice.py	2013-11-18 04:14:18 +0000
+++ l10n_ve_withholding_src/model/invoice.py	2013-12-17 20:29:18 +0000
@@ -41,19 +41,17 @@
         @param partner_bank_id: Partner bank id of the invoice                  
         @param company_id: Company id  
         """
-        p = self.pool.get('res.partner').browse(cr, uid, partner_id)
-        u= self.pool.get('res.users').browse(cr, uid, uid)
-        c = u.company_id.partner_id
+        rp_obj = self.pool.get('res.partner')
         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
+        if type in ('out_invoice',):
+            p = rp_obj._find_accounting_partner(rp_obj.browse(cr, uid, partner_id))
+            res['value']['wh_src_rate'] = p.wh_src_agent and p.wh_src_rate or 0
         else:
-            res['value']['wh_src_rate'] = 0
-            
+            u= self.pool.get('res.users').browse(cr, uid, uid)
+            c = rp_obj._find_accounting_partner(u.company_id.partner_id)
+            res['value']['wh_src_rate'] = c.wh_src_agent and c.wh_src_rate or 0
         return res
     
     def _retenida(self, cr, uid, ids, name, args, context):
@@ -143,9 +141,10 @@
                             pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
                             name, context=context)
+        rp_obj = self.pool.get('res.partner')
         if context.get('wh_src',False):
             invoice = self.browse(cr, uid, ids[0])
-            
+            acc_part_brw = rp_obj._find_accounting_partner(invoice.partner_id)
             types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
             direction = types[invoice.type]
 
@@ -155,15 +154,32 @@
                 else:
                     acc = tax_brw.wh_id.company_id.wh_src_paid_account_id and tax_brw.wh_id.company_id.wh_src_paid_account_id.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.wh_id.company_id.name,))
+                    raise osv.except_osv(_('Missing Account in Company!'),_("Your Company [%s] has missing account. Please, fill the missing fields") % (tax_brw.wh_id.company_id.name,))
                 res.append((0,0,{
                     'debit': direction * tax_brw.wh_amount<0 and - direction * tax_brw.wh_amount,
                     'credit': direction * tax_brw.wh_amount>0 and direction * tax_brw.wh_amount,
                     'account_id': acc,
-                    'partner_id': invoice.partner_id.id,
+                    'partner_id': acc_part_brw.id,
                     'ref':invoice.number,
                     'date': date,
                     'currency_id': False,
                     'name':name
                 }))
         return res
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """ Verify first if the invoice have a non cancel src withholding doc.
+        If it has then raise a error message. """
+        context = context or {}
+        for inv_brw in self.browse(cr, uid, ids, context=context):
+            if not inv_brw.wh_src_id:
+                super(account_invoice, self).action_cancel(cr, uid, ids,
+                                                           context=context)
+            else:
+                raise osv.except_osv(_("Error!"),
+                _("You can't cancel an invoice that have non cancel"
+                  " Src Withholding Document. Needs first cancel the invoice"
+                  " Src Withholding Document and then you can cancel this"
+                  " invoice."))
+        return True
+

=== modified file 'l10n_ve_withholding_src/model/wh_src.py'
--- l10n_ve_withholding_src/model/wh_src.py	2013-12-03 15:04:59 +0000
+++ l10n_ve_withholding_src/model/wh_src.py	2013-12-17 20:29:18 +0000
@@ -58,26 +58,27 @@
         return false in otherwise
         """
         context = context or {}
-        user_wh_agent = self.pool.get('res.users').browse(cr, uid, uid, context = context).company_id.partner_id.wh_src_agent
-        return user_wh_agent
+        rp_obj = self.pool.get('res.partner')
+        ru_obj = self.pool.get('res.users')
+        ru_brw = ru_obj.browse(cr, uid, uid, context = context)
+        acc_part_brw = rp_obj._find_accounting_partner(ru_brw.company_id.partner_id)
+        return acc_part_brw.wh_src_agent
 
     def _get_partner_agent(self, cr, uid, context=None):
         """ Return a list of browse partner depending of invoice type
         """
-        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
+        args = [('parent_id','=',False)]
+        context = context or {}
+        res = []
+        
+        if context.get('type') in ('out_invoice',):
+            args.append(('wh_src_agent','=',True))
+        partner_ids = obj_partner.search(cr, uid, args)
+        if partner_ids:
+            partner_brw = obj_partner.browse(cr, uid, partner_ids, context=context)
+            res = map(lambda x: x.id, partner_brw)
+        return res
 
     def default_get(self, cr, uid, fields, context=None):
         """ Update fields uid_wh_agent and partner_list to the create a
@@ -168,28 +169,34 @@
         @param partner_id: partner id
         """
         if context is None: context = {}    
+        acc_part_brw = False
         acc_id = False
         res = {}
         inv_obj = self.pool.get('account.invoice')
+        rp_obj = self.pool.get('res.partner')
         wh_line_obj = self.pool.get('account.wh.src.line')
         
         if partner_id:
-            p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            acc_part_brw = rp_obj._find_accounting_partner(rp_obj.browse(cr, uid, partner_id))
             if type in ('out_invoice', 'out_refund'):
-                acc_id = p.property_account_receivable and p.property_account_receivable.id or False
+                acc_id = acc_part_brw.property_account_receivable and acc_part_brw.property_account_receivable.id or False
             else:
-                acc_id = p.property_account_payable and p.property_account_payable.id or False
-        
-        wh_lines = ids and wh_line_obj.search(cr, uid, [('wh_id', '=', ids[0])]) or False
-        p_id_prv = ids and self.browse(cr, uid, ids[0], context=context).partner_id.id or False
-        if wh_lines and p_id_prv != partner_id:
-            wh_line_obj.unlink(cr, uid, wh_lines)
-        
-        res = {'value': {
-            'account_id': acc_id,
-            }
+                acc_id = acc_part_brw.property_account_payable and acc_part_brw.property_account_payable.id or False
+
+        part_brw = ids and rp_obj._find_accounting_partner(self.browse(cr, uid, ids[0], context=context).partner_id)
+        wh_lines = ids and wh_line_obj.search(cr, uid, [('wh_id', '=', ids[0])])
+        if not partner_id: 
+            wh_lines and wh_line_obj.unlink(cr, uid, wh_lines)
+            wh_lines = []
+        if part_brw and acc_part_brw and part_brw.id != acc_part_brw.id:
+            wh_lines and wh_line_obj.unlink(cr, uid, wh_lines)
+            wh_lines = []
+        
+        return {'value': {
+                    'line_ids':wh_lines,
+                    'account_id': acc_id,
+                }
         }
-        return res
         
 
     def action_date_ret(self,cr,uid,ids,context=None):
@@ -255,12 +262,65 @@
         
         return self.write(cr,uid,ids,{'state':'done'})
         
-    def action_cancel(self,cr,uid,ids,context={}):
-        """ Still not allowed to cancel these withholdings
-        """
-        raise osv.except_osv(_('Invalid Procedure!'),_("For the moment, the systmen does not allow cancell these withholdings."))
-        return True
-        
+    def _dummy_cancel_check(self, cr, uid, ids, context=None):
+        '''
+        This will be the method that another developer should use to create new
+        check on Withholding Document
+        Make super to this method and create your own cases
+        '''
+        return True
+
+    def cancel_check(self, cr, uid, ids, context=None):
+        '''
+        Unique method to check if we can cancel the Withholding Document
+        '''
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+
+        if not self._dummy_cancel_check(cr, uid, ids, context=context):
+            return False
+        return True
+
+    def cancel_move(self,cr,uid,ids, *args):
+        """ Delete move lines related with withholding vat and cancel
+        """
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        am_obj = self.pool.get('account.move')
+        for ret in self.browse(cr, uid, ids):
+            if ret.state == 'done':
+                for ret_line in ret.line_ids:
+                    ret_line.move_id and am_obj.button_cancel(cr, uid, [ret_line.move_id.id])
+                    ret_line.move_id and am_obj.unlink(cr, uid,[ret_line.move_id.id])
+            ret.write({'state':'cancel'})
+        return True    
+
+    def clear_wh_lines(self, cr, uid, ids, context=None):
+        """ Clear lines of current withholding document and delete wh document
+        information from the invoice.
+        """
+        context = context or {}
+        awsl_obj = self.pool.get('account.wh.src.line')
+        ai_obj = self.pool.get('account.invoice')
+        if ids:
+            awsl_ids = awsl_obj.search(cr, uid, [('wh_id', 'in', ids)],
+                    context=context)
+            ai_ids = awsl_ids and [ awsl.invoice_id.id
+                for awsl in awsl_obj.browse(cr, uid, awsl_ids, context=context) ]
+            ai_ids and ai_obj.write(cr, uid, ai_ids,
+                                    {'wh_src_id': False}, context=context)
+            awsl_ids and awsl_obj.unlink(cr, uid, awsl_ids, context=context)
+
+        return True
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """ Call cancel_move and return True
+        """
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        context = context or {}
+        self.cancel_move(cr, uid, ids)
+        self.clear_wh_lines(cr, uid, ids, context=context)
+        return True
+
     def copy(self,cr,uid,id,default,context=None):
         """ Lines can not be duplicated in this model
         """
@@ -302,7 +362,17 @@
         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)])
+            #Due to the fact that demo data for periods sets 'special' as True on them, this little
+            #hack is necesary if this issue is solved we should ask directly for the 
+            #refer to this bug for more information 
+            #https://bugs.launchpad.net/openobject-addons/+bug/924200
+            demo_enabled = self.pool.get('ir.module.module').search(cr, uid,
+                                                            [('name', '=', 'base'),
+                                                             ('demo', '=', True)])
+            args = [('id','in',period_id)]
+            if not demo_enabled:
+                args.append(('special','=',False))
+            period_id = per_obj.search(cr,uid,args)
             if not period_id:
                 raise osv.except_osv(_('Missing Periods!'),\
                 _("There are not Periods created for the pointed day: %s!") %\

=== modified file 'l10n_ve_withholding_src/report/wh_src_report.py'
--- l10n_ve_withholding_src/report/wh_src_report.py	2013-04-12 20:19:03 +0000
+++ l10n_ve_withholding_src/report/wh_src_report.py	2013-12-17 20:29:18 +0000
@@ -21,10 +21,11 @@
     def get_empresa(self, partner_id):
         """ Get information company
         """
-        obj_addr = self.pool.get('res.partner')
-        res = {}
-        for row in obj_addr.browse(self.cr, self.uid, partner_id):
-            res = row.type == 'invoice' and {
+        partner_id = isinstance(partner_id, (int,long)) and [partner_id] or partner_id
+        rp_obj = self.pool.get('res.partner')
+        row = rp_obj.browse(self.cr, self.uid, partner_id[0])
+        row = rp_obj._find_accounting_partner(row)
+        return {
             'street':row.street,
             'phone':row.phone,
             'fax':row.fax,
@@ -33,7 +34,6 @@
             'name':row.name,
             'country':row.country_id.name,
             } 
-        return res
 
 report_sxw.report_sxw('report.wh.src.report',
                     'account.wh.src',

=== added directory 'l10n_ve_withholding_src/test'
=== added file 'l10n_ve_withholding_src/test/aws_customer.yml'
--- l10n_ve_withholding_src/test/aws_customer.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_src/test/aws_customer.yml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,104 @@
+-
+  In order to test account withholding SRC I create a new customer invoice
+-
+  I set the context that will be used for the encoding of all the invoices of this file
+-
+  !context
+    'type': 'out_invoice'
+-
+  I create a customer invoice
+-
+  !record {model: account.invoice, id: account_invoice_customer0, view: account.invoice_form }:
+    name: 'wh src test account invoice customer'
+    account_id: account.a_recv
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: 'Test product description'
+        price_unit: 23.0
+        product_id: product.product_product_3
+        quantity: 1000.0
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_6 
+    reference_type: none
+    type: 'out_invoice'
+-
+  I check that Initially customer invoice state is "Draft"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0}:
+    - state == 'draft'
+-
+  I check that the customer invoice is a "Customer Invoice"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0, string: This is not a customer invoice}:
+    - type == 'out_invoice'
+-
+  I change the state of invoice to open by clicking Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_customer0}
+-
+  I check that the invoice state is now "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0}:
+    - state == 'open'
+-
+  I create a customer src withholding without wh lines
+-
+  !record {model: account.wh.src, id: account_wh_customer01, view: l10n_ve_withholding_src.view_wh_src_form}: &aws_01
+    name: 'wh src yaml test account withholding customer'
+    account_id: account.a_pay
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: withholding_src_sale_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_6 
+    type: 'out_invoice'
+    number: '0908070605'
+-
+  I  change the state of src withholding to Confirmed by clicking Confirmed button
+-
+  !python {model: account.wh.src}: |
+    from openerp.osv import osv
+    aws_id = ref('account_wh_customer01')
+    aws_brw = self.browse(cr, uid, aws_id)
+    try:
+      aws_brw.action_confirm()
+    except osv.except_osv:
+      pass
+-
+  I check that the src withholding state remains in Draft state
+-
+  !assert {model: account.wh.src, id: account_wh_customer01}:
+    - state == 'draft'
+-
+  I create a customer withholding src with wh lines and properly calculated wh amount
+-
+  !record {model: account.wh.src, id: account_wh_customer02, view: l10n_ve_withholding_src.view_wh_src_form}: 
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_1 
+    number: '0102030405'
+    wh_amount: 690.0 
+    line_ids:
+      - name: 'Test src wh line'
+        invoice_id: account_invoice_customer0
+        wh_src_rate: 3.0
+    <<: *aws_01
+-
+  I change the state of src withholding to Confirmed by clicking Confirmed button
+-
+  !workflow {model: account.wh.src, action: wh_src_confirmed, ref: account_wh_customer02}
+-
+  I check that the src withholding state change to Confirmed state
+-
+  !assert {model: account.wh.src, id: account_wh_customer02}:
+    - state == 'confirmed'
+-
+  I change the state of src withholding to Done by clicking Done button
+-
+  !workflow {model: account.wh.src, action: wh_src_done, ref: account_wh_customer02}
+-
+  I check that the src withholding state change to Done state
+-
+  !assert {model: account.wh.src, id: account_wh_customer02}:
+    - state == 'done'
+

=== added file 'l10n_ve_withholding_src/test/aws_supplier.yml'
--- l10n_ve_withholding_src/test/aws_supplier.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_src/test/aws_supplier.yml	2013-12-17 20:29:18 +0000
@@ -0,0 +1,104 @@
+-
+  In order to test account withholding I create a new supplier invoice
+-
+  I set the context that will be used for the encoding of all the invoices of this file
+-
+  !context
+    'type': 'in_invoice'
+-
+  I create a supplier invoice
+-
+  !record {model: account.invoice, id: account_invoice_supplier0, view: account.invoice_form }:
+    name: '0 yaml test account invoice supplier 0'
+    account_id: account.a_recv
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: 'Test product description'
+        price_unit: 180.0
+        product_id: product.product_product_4
+        quantity: 10.0
+        uos_id: product.product_uom_unit
+    journal_id: account.expenses_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_8 
+    reference_type: none
+    type: 'in_invoice'
+-
+  I check that Initially supplier invoice state is "Draft"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
+    - state == 'draft'
+-
+  I check that the supplier invoice is a "Supplier Invoice"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0, string: This is not a supplier invoice}:
+    - type == 'in_invoice'
+-
+  I change the state of invoice to open by clicking Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_supplier0}
+-
+  I check that the invoice state is now "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
+    - state == 'open'
+-
+  I create a supplier src withholding without wh lines
+-
+  !record {model: account.wh.src, id: account_wh_supplier01, view: l10n_ve_withholding_src.view_wh_src_form}: &aws_01
+    name: 'wh src yaml test account withholding supplier'
+    account_id: account.a_pay
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: withholding_src_sale_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_8 
+    type: 'in_invoice'
+    number: '1112131415'
+-
+  I  change the state of src withholding to Confirmed by clicking Confirmed button
+-
+  !python {model: account.wh.src}: |
+    from openerp.osv import osv
+    aws_id = ref('account_wh_supplier01')
+    aws_brw = self.browse(cr, uid, aws_id)
+    try:
+      aws_brw.action_confirm()
+    except osv.except_osv:
+      pass
+-
+  I check that the src withholding state remains in Draft state
+-
+  !assert {model: account.wh.src, id: account_wh_supplier01}:
+    - state == 'draft'
+-
+  I create a supplier withholding src with wh lines and properly calculated wh amount
+-
+  !record {model: account.wh.src, id: account_wh_supplier02, view: l10n_ve_withholding_src.view_wh_src_form}: 
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_3 
+    number: '1514131211'
+    wh_amount: 36.0 
+    line_ids:
+      - name: 'Test src wh line'
+        invoice_id: account_invoice_supplier0
+        wh_src_rate: 2.0
+    <<: *aws_01
+-
+  I change the state of src withholding to Confirmed by clicking Confirmed button
+-
+  !workflow {model: account.wh.src, action: wh_src_confirmed, ref: account_wh_supplier02}
+-
+  I check that the src withholding state change to Confirmed state
+-
+  !assert {model: account.wh.src, id: account_wh_supplier02}:
+    - state == 'confirmed'
+-
+  I change the state of src withholding to Done by clicking Done button
+-
+  !workflow {model: account.wh.src, action: wh_src_done, ref: account_wh_supplier02}
+-
+  I check that the src withholding state change to Done state
+-
+  !assert {model: account.wh.src, id: account_wh_supplier02}:
+    - state == 'done'
+

=== modified file 'l10n_ve_withholding_src/view/wh_src_view.xml'
--- l10n_ve_withholding_src/view/wh_src_view.xml	2013-12-03 14:25:17 +0000
+++ l10n_ve_withholding_src/view/wh_src_view.xml	2013-12-17 20:29:18 +0000
@@ -14,7 +14,10 @@
             <field name="arch" type="xml">
                 <tree string="Social Responsibility Commitment Withholding Lines" editable="bottom">
                     <field name="name"/>
-                    <field name="invoice_id" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" domain="[('wh_src_id', '=', False),('state', '=', 'open'),('partner_id','=',parent.partner_id),]"/>
+                    <field 
+                        name="invoice_id" 
+                        on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" 
+                        domain="[('wh_src_id', '=', False),('state', '=', 'open'),'|',('partner_id','=',parent.partner_id),('partner_id','child_of',parent.partner_id)]"/>
                     <field name="base_amount" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" sum="Total Base a Retener"/>
                     <field name="wh_src_rate" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)"/>
                     <field name="wh_amount" sum="Total Retenido"/>
@@ -30,7 +33,10 @@
                 <form string="Social Responsibility Commitment Withholding Lines" version="7.0">
                     <notebook>
                         <page string="Linea">
-                            <field name="invoice_id" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" domain="[('wh_src_id', '=', False),('state', '=', 'open'),('partner_id','=',parent.partner_id),]"/>
+                            <field 
+                                name="invoice_id" 
+                                on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" 
+                                domain="[('wh_src_id', '=', False),('state', '=', 'open'),'|', ('partner_id','=',parent.partner_id), ('partner_id','child_of',parent.partner_id)]"/>
                             <field colspan="4" name="name" select="1"/>
                             <field name="base_amount" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)"/>
                             <field name="wh_src_rate" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)"/>
@@ -102,13 +108,26 @@
             <field name="model">account.wh.src</field>
             <field name="arch" type="xml">
                 <form string="Social Responsibility Commitment Withholding" version="7.0">
-                    <field name="uid_wh_agent" invisible="1"/>
-                    <field name="partner_list" string="Partners List" context="{'partner_list': partner_list} " invisible="1"/>
+                    <header>
+                        <button name="wh_src_confirmed" states="draft" string="Confirm"/>
+                        <button name="wh_src_done" states="confirmed" string="Done"/>
+                        <button name="wh_src_cancel" states="draft,confirmed,done" string="Cancel"/>
+                        <button name="wh_src_draft" states="cancel,confirmed" string="Set to draft"/>
+                        <field 
+                            name="state" 
+                            widget="statusbar" 
+                            statusbar_visible="draft,confirmed,done" 
+                            statusbar_colors="{&quot;confirmed&quot;:&quot;blue&quot;}"/>
+                    </header>
                     <group colspan="4" col="6">
                         <field name="journal_id"/>
                         <field name="type" readonly="1"/>
                         <field name="code"/>
-                        <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="partner_id" 
+                            on_change="onchange_partner_id(type,partner_id)" 
+                            attrs="{'readonly':['|','&amp;',('uid_wh_agent','=',False),('type','=','in_invoice'),('state','!=','draft')]}" 
+                            domain="[('id','in',context.get('partner_list' , False))]"/>
                         <field name="currency_id"/>
                         <field name="date_ret"/>
                         <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
@@ -116,27 +135,30 @@
                         <field name="period_id"/>
                         <field name="number" attrs="{'readonly':[('type','=','in_invoice')],'required':[('type','in',['out_invoice','out_refund'])]}"/>
                         <field name="date"/>
-                        <field name="wh_amount"/>
+                        <field 
+                            name="wh_amount"
+                            attrs="{'readonly':[('state','!=','draft')]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Withholding">
-                            <field name="line_ids" default_get="{'lines': line_ids }" colspan="4" nolabel="1" height="275">
-<!--
-                            <field name="invoice_id" domain="[('wh_src_id', '!=', False),('state', '=', 'open'), ('partner_id','=',parent.partner_id),]"/>                            
--->
-                            </field>
-                            <group col="4" colspan="2">
-                                <field name="state"/>
-                            </group>
-                            <group col="4" colspan="2">
-                                <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>
+                            <field 
+                                name="line_ids" 
+                                default_get="{'lines': line_ids }" 
+                                colspan="4" 
+                                nolabel="1" 
+                                height="275"
+                                attrs="{'readonly':[('state','!=','draft')]}"/>
                         </page>
                         <page string="Other Information">
-                            <field name="company_id"/>
+                            <field 
+                                name="company_id"
+                                attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="uid_wh_agent" invisible="1"/>
+                            <field 
+                                name="partner_list" 
+                                string="Partners List" 
+                                context="{'partner_list': partner_list} " 
+                                invisible="1"/>
                         </page>
                     </notebook>
                 </form>

=== modified file 'l10n_ve_withholding_src/workflow/l10n_ve_wh_src_wf.xml'
--- l10n_ve_withholding_src/workflow/l10n_ve_wh_src_wf.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_src/workflow/l10n_ve_wh_src_wf.xml	2013-12-17 20:29:18 +0000
@@ -26,8 +26,7 @@
         
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wh_src_wkf"/>
-            <field name="action">action_cancel()
-                write({'state':'cancel'})</field>
+            <field name="action">action_cancel()</field>
             <field name="kind">function</field>
             <field name="name">cancel</field>
         </record>
@@ -39,12 +38,23 @@
             <field name="name">done</field>
         </record>
 
-
         <record id="trans_draft_done" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirmed"/>
             <field name="signal">wh_src_confirmed</field>
         </record>
+
+        <record id="trans_confirmed_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirmed"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">wh_src_cancel</field>
+        </record>
+
+        <record id="trans_draft_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">wh_src_cancel</field>
+        </record>
         
         <record id="trans_done_cancel" model="workflow.transition">
             <field name="act_from" ref="act_done"/>
@@ -72,4 +82,4 @@
 
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>