Merge lp:~inddiana/sisb/sisb_fix_configuracion_ctas_ret_municipal into lp:sisb

[[SISB] Aryrosa Fuentes]

[FIX] Ajuste en la creacion del asiento contable de la retencion municipal cuando es factura o nota de credito.

[lp:~inddiana/sisb/sisb_fix_configuracion_ctas_ret_municipal]

989. By [SISB] Aryrosa Fuentes on 2018-03-22

[FIX] Ajuste en la creacion del asiento contable de la retencion municipal cuando es factura o nota de credito.

=== modified file 'l10n_ve_withholding_muni/model/invoice.py'
--- l10n_ve_withholding_muni/model/invoice.py	2013-05-02 20:32:39 +0000
+++ l10n_ve_withholding_muni/model/invoice.py	2018-03-22 13:27:26 +0000
@@ -104,7 +104,7 @@
             direction = types[invoice.type]
 
             for tax_brw in to_wh:
-                if types[invoice.type]==1:
+                if invoice.type in ('in_invoice','in_refund'):
                     acc = tax_brw.wh_id.company_id.wh_muni_collected_account_id and tax_brw.wh_id.company_id.wh_muni_collected_account_id.id or False
                 else:
                     acc = tax_brw.wh_id.company_id.wh_muni_paid_account_id and tax_brw.wh_id.company_id.wh_muni_paid_account_id.id or False
@@ -120,7 +120,7 @@
                     'currency_id': False,
                     'name':name
                 }))
-        
+                
         return res
 
 account_invoice()

=== modified file 'l10n_ve_withholding_muni/model/wh_muni.py'
--- l10n_ve_withholding_muni/model/wh_muni.py	2013-08-07 19:29:16 +0000
+++ l10n_ve_withholding_muni/model/wh_muni.py	2018-03-22 13:27:26 +0000
@@ -348,7 +348,7 @@
 
     ] 
     
-    def onchange_invoice_id(self, cr, uid, ids, type, invoice_id=False,base_amount=0.0,wh_muni_rate=10.0,context=None):
+    def onchange_invoice_id(self, cr, uid, ids, type, invoice_id=False,base_amount=0.0,wh_muni_rate=0.10,context=None):
         if context is None: context = {}    
         res = {}
         inv_obj = self.pool.get('account.invoice')
@@ -364,7 +364,7 @@
         
         inv_brw = inv_obj.browse(cr, uid, invoice_id)
         base_amount = base_amount or inv_brw.amount_untaxed
-        wh_muni_rate = wh_muni_rate or inv_brw.wh_muni_rate or 10.0
+        wh_muni_rate = wh_muni_rate or inv_brw.wh_muni_rate or 0.10
         wh_amount = base_amount * wh_muni_rate/100.0
         inv_ref = inv_brw.reference or ''
         res = {'value': {