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

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

URGENT
This merge should be immediately applied
please, refer to bug description, where you
can find the needed info to test the right
behavior to this patch.
URGENTE
Este merge se deberia aplicar de inmediato
por favor dirijase a la descripcion del bug
donde podra encontrar la informacion necesaria
para probar el comportamiento adecuado de este
parche.

=== modified file 'l10n_ve_withholding/account.py'
--- l10n_ve_withholding/account.py	2012-01-26 20:23:30 +0000
+++ l10n_ve_withholding/account.py	2012-02-17 05:42:26 +0000
@@ -24,7 +24,7 @@
 ################################################################################
 
 from osv import fields, osv
-
+import time
 
 class account_journal(osv.osv):
     _inherit = 'account.journal'
@@ -39,4 +39,29 @@
 
 account_journal()
 
+class account_period(osv.osv):
+    _inherit = "account.period"
+
+    def find_fortnight(self, cr, uid, dt=None, context=None):
+        '''
+        This Function returns a tuple composed of 
+            *) period for the asked dt (int)
+            *) fortnight for the asked dt (boolean):
+                -) False: for the 1st. fortnight
+                -) True: for the 2nd. fortnight.
+            Example:
+            (3,True) => a period whose id is 3 in the second fortnight
+        '''
+        if context is None: context = {}
+        if not dt:
+            dt = time.strftime('%Y-%m-%d')
+        period_ids = self.find(cr,uid,dt=dt,context=context)
+        period_ids = self.search(cr,uid,[('special','=',False),('id','in',period_ids)])
+        if not period_ids:
+            raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create a fiscal year.')%dt)
+        
+        fortnight= False if int(dt.split('-')[2]) <= 15 else True
+        return (period_ids[0],fortnight)
+account_period()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_withholding_iva/model/invoice.py'
--- l10n_ve_withholding_iva/model/invoice.py	2012-02-06 19:05:01 +0000
+++ l10n_ve_withholding_iva/model/invoice.py	2012-02-17 05:42:26 +0000
@@ -230,6 +230,29 @@
             context={}
         return any([line.tax_id.ret for line in self.browse(cr, uid, ids[0], context=context).tax_line])
 
+    def check_withholdable(self, cr, uid, ids, context=None):
+        '''
+        This will test for Refund invoice trying to find out
+        if its regarding parent is in the same fortnight.
+        
+        return True if invoice is type 'in_invoice'
+        return True if invoice is type 'in_refund' and parent_id invoice
+                are both in the same fortnight.
+        return False otherwise
+        '''
+        per_obj = self.pool.get('account.period')
+        if context is None:
+            context={}
+        inv_brw = self.browse(cr,uid,ids[0],context=context)
+        if inv_brw.type == 'in_invoice':
+            return True
+        if inv_brw.type == 'in_refund' and inv_brw.parent_id:
+            dt_refund = inv_brw.date_invoice or time.strftime('%Y-%m-%d')
+            dt_invoice = inv_brw.parent_id.date_invoice
+            return  per_obj.find_fortnight(cr, uid, dt=dt_refund, context=context) == \
+                    per_obj.find_fortnight(cr, uid, dt=dt_invoice, context=context)
+        return False
+
     def check_wh_apply(self, cr, uid, ids, context=None):
         if context is None:
             context={}

=== modified file 'l10n_ve_withholding_iva/workflow/account_workflow.xml'
--- l10n_ve_withholding_iva/workflow/account_workflow.xml	2012-01-25 16:57:07 +0000
+++ l10n_ve_withholding_iva/workflow/account_workflow.xml	2012-02-17 05:42:26 +0000
@@ -31,7 +31,7 @@
         <record id="trans_wh_router_wh_vat" model="workflow.transition">
             <field name="act_from" ref="l10n_ve_withholding.act_wh_router"/>
             <field name="act_to" ref="act_withold_vat"/>
-            <field name="condition">check_wh_apply()</field>
+            <field name="condition">check_wh_apply() and check_withholdable()</field>
             <field name="signal"></field>
         </record>
 <!--        From Withholdings to paid-->