Merge lp:~vxkikevx/openerp-venezuela-localization/luiseev-wh_iva-fiscal_requirement into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Luis Escobar V. (Vauxoo)]

[IMP] add methods to validate invoice refund.
[FIX] add method to write wh vat id in sale invoices when confirm.

Unmerged revisions

=== modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py'
--- l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py	2012-01-18 20:30:13 +0000
+++ l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py	2012-01-19 15:20:30 +0000
@@ -238,27 +238,61 @@
             result['domain'] = invoice_domain
             return result
 
-    def validate_withholding(self, cr, uid, ids, context=None):
-        inv_obj = self.pool.get('account.invoice')
-        for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
-            riva = True
-            if inv.type in ('in_invoice','in_refund'):
+    def validate_total_payment_inv(self, cr, uid, ids, context=None):
+        """
+        Method that validate if invoice is totally paid.
+
+        return: True: if invoice is paid.
+                False: if invoice is not paid.
+        """
+        inv_obj = self.pool.get('account.invoice')
+        for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
+            if inv.reconciled:
+                raise osv.except_osv(_('Invoice Paid!'), \
+                                     _('The invoice refund can not be procesed because invoice "%s" was paid!' % inv.number))
+            else:
+                return True
+
+    def validate_wh_iva_done(self, cr, uid, ids, context=None):
+        """
+        Method that check if wh vat is validated in invoice refund.
+
+        return: True: the wh vat is validated.
+                False: the wh vat is not validated.
+        """
+        inv_obj = self.pool.get('account.invoice')
+        for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
+            if inv.type in ('out_invoice', 'out_refund') and not inv.islr_wh_doc_id:
+                rislr = True
+            else:
                 rislr = inv.islr_wh_doc_id and inv.islr_wh_doc_id.state in ('done') and True or False
                 if not rislr:
-                    raise osv.except_osv(_('Wh income validated !'), \
-                                         _('found a withholding income that is not validated!'))
+                    raise osv.except_osv(_('Error !'), \
+                                     _('The withholding income "%s" is not validated!' % inv.islr_wh_doc_id.code ))
                     return False
+
+    def validate_wh_income_done(self, cr, uid, ids, context=None):
+        """
+        Method that check if wh income is validated in invoice refund.
+
+        return: True: the wh income is validated.
+                False: the wh income is not validated.
+        """
+        inv_obj = self.pool.get('account.invoice')
+        for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
+            if inv.type in ('out_invoice', 'out_refund') and not inv.wh_iva_id:
+                riva = True
             else:
-                riva = inv.partner_id.wh_iva_agent 
-            if riva:
                 riva = inv.wh_iva_id and inv.wh_iva_id.state in ('done') and True or False
                 if not riva:
-                    raise osv.except_osv(_('Wh IVA validated !'), \
-                                         _('found a withholding IVA that is not validated!'))
+                    raise osv.except_osv(_('Error !'), \
+                                     _('The withholding VAT "%s" is not validated!' % inv.wh_iva_id.code ))
                     return False
 
     def invoice_refund(self, cr, uid, ids, context=None):
-        self.validate_withholding(cr, uid, ids, context=context)
+        self.validate_total_payment_inv(cr, uid, ids, context=context)
+        self.validate_wh_iva_done(cr, uid, ids, context=context)
+        self.validate_wh_income_done(cr, uid, ids, context=context)
         data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund']
         return self.compute_refund(cr, uid, ids, data_refund, context=context)
 

=== modified file 'l10n_ve_withholding_iva/model/wh_iva.py'
--- l10n_ve_withholding_iva/model/wh_iva.py	2012-01-19 01:29:02 +0000
+++ l10n_ve_withholding_iva/model/wh_iva.py	2012-01-19 15:20:30 +0000
@@ -300,6 +300,21 @@
             raise osv.except_osv(_('Invoices with Missing Withheld Taxes!'),note)
         return True
         
+    def write_wh_invoices(self, cr, uid, ids, context=None):
+        """
+        Method that writes the wh id in invoices.
+    
+        Return: True: write successfully.
+                False: write unsuccessfully.
+        """
+        inv_obj = self.pool.get('account.invoice')
+        obj = self.browse(cr, uid, ids[0])
+        if obj.type in ('out_invoice', 'out_refund'):
+            for wh_line in obj.wh_lines:
+                if not inv_obj.write(cr,uid,[wh_line.invoice_id.id],{'wh_iva_id':obj.id}):
+                    return False
+        return True
+
     def _check_partner(self, cr, uid, ids, context={}):
         agt = False
         obj = self.browse(cr, uid, ids[0])

=== modified file 'l10n_ve_withholding_iva/workflow/wh_iva_workflow.xml'
--- l10n_ve_withholding_iva/workflow/wh_iva_workflow.xml	2012-01-03 15:23:32 +0000
+++ l10n_ve_withholding_iva/workflow/wh_iva_workflow.xml	2012-01-19 15:20:30 +0000
@@ -34,7 +34,7 @@
         <record id="trans_draft_done" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirmed"/>
-            <field name="condition">check_vat_wh() and check_wh_taxes()</field>
+            <field name="condition">check_vat_wh() and check_wh_taxes() and write_wh_invoices()</field> 
             <field name="signal">wh_iva_confirmed</field>
         </record>