Merge lp:~vauxoo/openerp-venezuela-localization/hbto_wkf-wh-fix into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

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

[Nhomar - Vauxoo (nhomar)]

Por mi esta muy bien, creo que el resultado final es un buen merge de todos los conceptos discutidos, estoy haciendo el merge, ya lo probe en mi instancia y funciono perfecto.

review: Approve (merged)

[Nhomar - Vauxoo (nhomar)]

Hare otra propuesta de merge con el asunto de las vistas solamente

=== modified file 'l10n_ve_withholding/__openerp__.py'
--- l10n_ve_withholding/__openerp__.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding/__openerp__.py	2011-10-31 09:06:24 +0000
@@ -45,7 +45,8 @@
         'security/ir.model.access.csv',    
         'l10n_ve_withholding_data.xml',    
         'l10n_ve_withholding_view.xml',
-        'account_view.xml'
+        'account_view.xml',
+        'workflow/account_workflow.xml',
     ],
     'demo_xml': [],
     'test': [],

=== added directory 'l10n_ve_withholding/workflow'
=== added file 'l10n_ve_withholding/workflow/account_workflow.xml'
--- l10n_ve_withholding/workflow/account_workflow.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding/workflow/account_workflow.xml	2011-10-31 09:06:24 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        #----------------------------------------------
+        # Activity
+        #----------------------------------------------
+        <record id="act_wh_router" model="workflow.activity">
+            <field name="wkf_id" ref="account.wkf"/>
+            <field name="name">wh_router</field>
+            <field name="kind">dummy</field>
+	    <field name="split_mode">OR</field>
+        </record>
+        #----------------------------------------------
+        # Transitions
+        #----------------------------------------------
+        <record id="trans_open_wh_router" model="workflow.transition">
+            <field name="act_from" ref="account.act_open"/>
+            <field name="act_to" ref="act_wh_router"/>
+            <field name="condition">True</field>
+        </record>
+    </data>
+</openerp>

=== modified file 'l10n_ve_withholding_islr/invoice.py'
--- l10n_ve_withholding_islr/invoice.py	2011-10-31 04:58:31 +0000
+++ l10n_ve_withholding_islr/invoice.py	2011-10-31 09:06:24 +0000
@@ -575,13 +575,10 @@
     def action_ret_islr(self, cr, uid, ids, context={}):
         return self.pool.get('islr.wh.doc').action_ret_islr(cr,uid,ids,context)
 
-    def check_wh_islr_apply(self, cr, uid, ids, context=None):
-        '''
-        This Method test if given certain conditions it is
-        possible to create a new withholding document
-        '''
+    def _check_wh_islr(self, cr, uid, ids, context=None):
         if context is None:
             context={}
+        
         wh_apply=[]
         # The two function being called below should undergo overhauling
         # right now it takes an object as and argument instead of an integer
@@ -591,19 +588,69 @@
         wh_apply.append(wh)
         wh_apply.append(concept_list)
         
-        inv_brw = False
-        if all(wh_apply):
-            wh_dict = self._get_service_wh(cr, uid, invoice, concept_list)
-            residence = self._get_residence(cr, uid, vendor, buyer)
-            nature = self._get_nature(cr, uid, vendor)
-            dict_rate = self._get_rate_dict(cr, uid, concept_list, residence, nature,context=context)
-            self._pop_dict(cr,uid,concept_list,dict_rate,wh_dict)
-            context.update({'test_from_wkf':True})
-            dict_completo = self._get_wh_apply(cr,uid,dict_rate,wh_dict,nature,context=context)
-            inv_brw = self._get_inv_id(cr,uid,dict_completo)
-            
-        wh_apply.append(inv_brw)
-        return all(wh_apply)
+        return invoice, vendor, buyer, concept_list, all(wh_apply)
+
+    def _check_do_wh(self, cr, uid, ids, invoice, vendor, buyer, concept_list, context=None):
+        if context is None:
+            context={}
+        wh_dict = self._get_service_wh(cr, uid, invoice, concept_list)
+        residence = self._get_residence(cr, uid, vendor, buyer)
+        nature = self._get_nature(cr, uid, vendor)
+        dict_rate = self._get_rate_dict(cr, uid, concept_list, residence, nature,context=context)
+        self._pop_dict(cr,uid,concept_list,dict_rate,wh_dict)
+        dict_completo = self._get_wh_apply(cr,uid,dict_rate,wh_dict,nature,context=context)
+        inv_brw = self._get_inv_id(cr,uid,dict_completo)
+        
+        return bool(inv_brw)
+        
+    def check_wh_islr_apply(self, cr, uid, ids, context=None):
+        '''
+        This Method test if given certain conditions it is
+        possible to create a new withholding document
+        '''
+        if context is None:
+            context={}
+        
+        invoice, vendor, buyer, concept_list, wh_apply = self._check_wh_islr(cr, uid, ids, context=context)
+        
+        do_wh = False
+        if wh_apply:
+            context.update({'test_from_wkf':True})
+            do_wh = self._check_do_wh(cr, uid, ids, invoice, vendor, buyer, concept_list, context=context)
+            
+        return all([wh_apply,do_wh])
+
+    def check_wh_islr_xml(self, cr, uid, ids, context=None):
+        '''
+        This Method test if given certain conditions it is
+        __not__ possible to create a new withholding document
+        but the xml elements needed to create a legal report
+        '''
+        if context is None:
+            context={}
+        
+        invoice, vendor, buyer, concept_list, wh_apply = self._check_wh_islr(cr, uid, ids, context=context)
+        
+        do_wh = True
+        if wh_apply:
+            context.update({'test_from_wkf':True})
+            do_wh = self._check_do_wh(cr, uid, ids, invoice, vendor, buyer, concept_list, context=context)
+            
+        return all([wh_apply,not do_wh])
+
+    def action_islr_xml(self, cr, uid, ids, context=None):
+        '''
+        This Method creates the xml elements needed to provide a legal report
+        '''
+        if context is None:
+            context={}
+        
+        invoice, vendor, buyer, concept_list, wh_apply = self._check_wh_islr(cr, uid, ids, context=context)
+        
+        if wh_apply:
+            self._check_do_wh(cr, uid, ids, invoice, vendor, buyer, concept_list, context=context)
+            
+        return True
 
 account_invoice()
 

=== modified file 'l10n_ve_withholding_islr/workflow/account_workflow.xml'
--- l10n_ve_withholding_islr/workflow/account_workflow.xml	2011-10-31 01:02:55 +0000
+++ l10n_ve_withholding_islr/workflow/account_workflow.xml	2011-10-31 09:06:24 +0000
@@ -17,7 +17,19 @@
             <field name="action">action_ret_islr()</field>
         </record>
 
-        
+	<record id="act_islr_router" model="workflow.activity">
+            <field name="wkf_id" ref="account.wkf"/>
+            <field name="name">islr_router</field>
+            <field name="kind">dummy</field>
+	    <field name="split_mode">XOR</field>
+        </record>
+	
+	<record id="act_islr_xml" model="workflow.activity">
+            <field name="wkf_id" ref="account.wkf"/>
+            <field name="name">islr_xml</field>
+            <field name="kind">function</field>
+            <field name="action">action_islr_xml()</field>
+        </record>        
         #----------------------------------------------
         # Transitions
         #----------------------------------------------
@@ -28,13 +40,29 @@
 <!--            <field name="act_from" ref="account.act_withold_islr"/>-->
 <!--        </record>-->
 <!--        From Open to Withholdings-->
-        <record id="trans_open_wh_islr" model="workflow.transition">
-            <field name="act_from" ref="account.act_open"/>
+
+
+        <record id="trans_wh_router_wh_islr" model="workflow.transition">
+            <field name="act_from" ref="l10n_ve_withholding.act_wh_router"/>
+            <field name="act_to" ref="act_islr_router"/>
+            <field name="condition">True</field>
+            <field name="signal"></field>
+        </record>
+	
+        <record id="trans_wh_router_xml" model="workflow.transition">
+            <field name="act_from" ref="act_islr_router"/>
+            <field name="act_to" ref="act_islr_xml"/>
+            <field name="condition">check_wh_islr_xml()</field>
+            <field name="signal"></field>
+        </record>
+
+        <record id="trans_islr_router_wh_islr" model="workflow.transition">
+            <field name="act_from" ref="act_islr_router"/>
             <field name="act_to" ref="act_withold_islr"/>
             <field name="condition">check_wh_islr_apply()</field>
             <field name="signal"></field>
-        </record>
-<!--        From Withholdings to paid-->
+        </record>        
+        <!--        From Withholdings to paid-->
 
         <record id="trans_withhold_paid" model="workflow.transition">
             <field name="act_from" ref="act_withold_islr"/>

=== modified file 'l10n_ve_withholding_iva/account_workflow.xml'
--- l10n_ve_withholding_iva/account_workflow.xml	2011-10-30 04:26:37 +0000
+++ l10n_ve_withholding_iva/account_workflow.xml	2011-10-31 09:06:24 +0000
@@ -27,9 +27,9 @@
             <!--<field name="act_from" ref="act_open"/>-->
 <!--            <field name="act_from" ref="account.act_withold_vat"/>-->
 <!--        </record>-->
-<!--        From Open to Withholdings-->
-        <record id="trans_open_wh" model="workflow.transition">
-            <field name="act_from" ref="account.act_open"/>
+<!--        From WH_ROUTER to Withholdings-->
+        <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="signal"></field>