Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-whiva-delete-invoice-field into lp:openerp-venezuela-localization

[Katherine Zaoral (Vauxoo)]

[IMP] delete useless 'wh_iva_rate' field in invoice model (at iva module).

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

review: Approve

=== modified file 'l10n_ve_withholding_iva/model/invoice.py'
--- l10n_ve_withholding_iva/model/invoice.py	2013-06-10 18:36:25 +0000
+++ l10n_ve_withholding_iva/model/invoice.py	2013-06-11 18:54:30 +0000
@@ -106,7 +106,6 @@
                 'account.move.line': (_get_inv_from_line, None, 50),
                 'account.move.reconcile': (_get_inv_from_reconcile, None, 50),
             }, help="The account moves of the invoice have been retention with account moves of the payment(s)."),    
-        'wh_iva_rate': fields.float('Wh rate', digits_compute= dp.get_precision('Withhold'), readonly=True, states={'draft':[('readonly',False)]}, help="Vat Withholding rate"),
         'wh_iva_id': fields.function(_fnct_get_wh_iva_id, method=True,
             type='many2one', relation='account.wh.iva', 
             string='VAT Wh. Document', 
@@ -469,7 +468,10 @@
         for ait in inv.tax_line:
             amount_ret = 0.0
             if ait.tax_id.ret:
-                amount_ret = inv.wh_iva_rate and ait.tax_amount*inv.wh_iva_rate/100.0 or 0.00
+                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/view/account_invoice_view.xml'
--- l10n_ve_withholding_iva/view/account_invoice_view.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_iva/view/account_invoice_view.xml	2013-06-11 18:54:30 +0000
@@ -19,7 +19,6 @@
                     <newline/>
                         <group col="6" colspan="4">
                             <field name="wh_iva"/>
-                            <field name="wh_iva_rate"/>
                             <field name="wh_iva_id"/>
                         </group>
                 </xpath>
@@ -40,7 +39,6 @@
                     <newline/>
                     <group col="4" colspan="4">
                         <field name="wh_iva" string="Have this invoice been already VAT withheld?"/>
-                        <field name="wh_iva_rate"/>
                         <field name="wh_iva_id" string="VAT Withholding Document"/>
                         <newline/>
                         <field name="vat_apply" string="Exclude this document from VAT Withholding" readonly="1"/>