Merge lp:~vauxoo/openerp-venezuela-localization/nhomar_imp-with-islr-wkf into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Nhomar - Vauxoo]

Included the workflow for withholding ISLR to workflow of invoices, corrected search view to avoid problems with new records created on WH ISLR, moved one method from account.invoice to wh.islr.doc to have more consistency on structure of classes

Included the workflow for withholding ISLR to workflow of invoices, corrected search view to avoid problems with new records created on WH ISLR, moved one method from account.invoice to wh.islr.doc to have more consistency on structure of classes

=== modified file 'l10n_ve_islr_withholding/invoice.py'
--- l10n_ve_islr_withholding/invoice.py	2011-10-04 15:30:46 +0000
+++ l10n_ve_islr_withholding/invoice.py	2011-10-05 02:52:03 +0000
@@ -575,34 +575,10 @@
             pass
         return islr_wh_doc_id
 
-
     def action_ret_islr(self, cr, uid, ids, context={}):
-        invoices_brw = self.browse(cr, uid, ids, context)
-        wh_doc_list = []
-        for invoice in invoices_brw:
-            wh_doc_list = self.pool.get('islr.wh.doc.invoices').search(cr,uid,[('invoice_id','=',invoice.id)])  
-            if wh_doc_list: #Chequear que la factura no haya sido retenida.
-                raise osv.except_osv(_('Invalid action !'),_("The Withholding invoice '%s' has already been done!") % (invoice.number))
-            else: # 1.- Si la factura no ha sido retenida
-                wh_dict={}
-                dict_rate={}
-                dict_completo={}
-                vendor, buyer, apply_wh = self._get_partners(cr,uid,invoice) # Se obtiene el (vendedor, el comprador, si el comprador es agente de retencion)
-                concept_list = self._get_concepts(cr,uid,invoice)# Se obtiene la lista de conceptos de las lineas de la factura actual.
-                if concept_list:  # 2.- Si existe algun concepto de retencion en las lineas de la factura.
-                    if apply_wh:  # 3.- Si el comprador es agente de retencion
-                        wh_dict = self._get_service_wh(cr, uid, invoice, concept_list) # Se obtiene un dic con la lista de lineas de factura, si se aplico retencion alguna vez, el monto base total de las lineas.
-                        residence = self._get_residence(cr, uid, vendor, buyer) # Retorna el tipo de residencia del vendedor
-                        nature = self._get_nature(cr, uid, vendor) # Retorna la naturaleza del vendedor.
-                        dict_rate = self._get_rate_dict(cr, uid, concept_list, residence, nature,context) # Retorna las tasas por cada concepto
-                        self._pop_dict(cr,uid,concept_list,dict_rate,wh_dict) # Borra los conceptos y las lineas de factura que no tengan tasa asociada.
-                        dict_completo = self._get_wh_apply(cr,uid,dict_rate,wh_dict,nature) # Retorna el dict con todos los datos de la retencion por linea de factura.
-                        islr_wh_doc_id=self._logic_create(cr,uid,dict_completo,context.get('wh_doc_id',False))# Se escribe y crea en todos los modelos asociados al islr.
-                    else:
-                        raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the supplier '%s' withholding agent is not!") % (buyer.name))
-                else:
-                    raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the lines of the invoice has not concept withholding!"))
-        return islr_wh_doc_id
+        return self.pool.get('islr.wh.doc').action_ret_islr(cr,uid,ids,context)
+
+
 account_invoice()
 
 

=== modified file 'l10n_ve_islr_withholding/islr_wh_doc.py'
--- l10n_ve_islr_withholding/islr_wh_doc.py	2011-10-04 15:30:46 +0000
+++ l10n_ve_islr_withholding/islr_wh_doc.py	2011-10-05 02:52:03 +0000
@@ -8,7 +8,7 @@
 #    Coded by: Humberto Arocha           <[e-mail]>
 #              Maria Gabriela Quilarque  <[e-mail]>
 #              Javier Duran              <[e-mail]>
-#    Planified by: Nhomar Hernandez
+#    Planified by: Nhomar Hernandez <[e-mail]>
 #    Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
 #    Audited by: Humberto Arocha [e-mail]
 #############################################################################
@@ -382,6 +382,37 @@
         self.pool.get('account.invoice').write(cr, uid, invoice_id, {}, context=context)
         return {'move_id': move_id}
 
+
+    def action_ret_islr(self, cr, uid, ids, context={}):
+        inv_obj = self.pool.get('account.invoice')
+        invoices_brw = inv_obj.browse(cr, uid, ids, context)
+        wh_doc_list = []
+        for invoice in invoices_brw:
+            wh_doc_list = inv_obj.pool.get('islr.wh.doc.invoices').search(cr,uid,[('invoice_id','=',invoice.id)])  
+            if wh_doc_list: #Chequear que la factura no haya sido retenida.
+                raise osv.except_osv(_('Invalid action !'),_("The Withholding invoice '%s' has already been done!") % (invoice.number))
+            else: # 1.- Si la factura no ha sido retenida
+                wh_dict={}
+                dict_rate={}
+                dict_completo={}
+                vendor, buyer, apply_wh = inv_obj._get_partners(cr,uid,invoice) # Se obtiene el (vendedor, el comprador, si el comprador es agente de retencion)
+                concept_list = inv_obj._get_concepts(cr,uid,invoice)# Se obtiene la lista de conceptos de las lineas de la factura actual.
+                if concept_list:  # 2.- Si existe algun concepto de retencion en las lineas de la factura.
+                    if apply_wh:  # 3.- Si el comprador es agente de retencion
+                        wh_dict = inv_obj._get_service_wh(cr, uid, invoice, concept_list) # Se obtiene un dic con la lista de lineas de factura, si se aplico retencion alguna vez, el monto base total de las lineas.
+                        residence = inv_obj._get_residence(cr, uid, vendor, buyer) # Retorna el tipo de residencia del vendedor
+                        nature = inv_obj._get_nature(cr, uid, vendor) # Retorna la naturaleza del vendedor.
+                        dict_rate = inv_obj._get_rate_dict(cr, uid, concept_list, residence, nature,context) # Retorna las tasas por cada concepto
+                        inv_obj._pop_dict(cr,uid,concept_list,dict_rate,wh_dict) # Borra los conceptos y las lineas de factura que no tengan tasa asociada.
+                        dict_completo = inv_obj._get_wh_apply(cr,uid,dict_rate,wh_dict,nature) # Retorna el dict con todos los datos de la retencion por linea de factura.
+                        islr_wh_doc_id=inv_obj._logic_create(cr,uid,dict_completo,context.get('wh_doc_id',False))# Se escribe y crea en todos los modelos asociados al islr.
+                    else:
+                        raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the supplier '%s' withholding agent is not!") % (buyer.name))
+                else:
+                    raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the lines of the invoice has not concept withholding!"))
+        return islr_wh_doc_id
+
+
 islr_wh_doc()
 
 

=== modified file 'l10n_ve_islr_withholding/view/islr_wh_doc_view.xml'
--- l10n_ve_islr_withholding/view/islr_wh_doc_view.xml	2011-10-04 02:53:28 +0000
+++ l10n_ve_islr_withholding/view/islr_wh_doc_view.xml	2011-10-05 02:52:03 +0000
@@ -171,9 +171,6 @@
                         <field name="code"/>
                         <field name="partner_id"/>
                         <field name="journal_id"  select="1" widget="selection" string="Journal"/>
-                        <field name="user_id" select="1" widget="selection" string="Salesman">
-                        <filter domain="[('user_id','=',uid)]" help="My Withholding Income" icon="terp-personal" separator="1"/>
-                        </field>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
@@ -330,9 +327,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('type','=','in_invoice')]</field>
-            <field name="context">{'type':'in_invoice'}</field>
+            <field name="context">{'type':'in_invoice', 'search_default_draft': 1}</field>
             <field name="search_view_id" ref="view_wh_islr_filter_suppliers"/>
-            <field name="help">With Supplier Withholding  you can manage document withholding issued to your suppliers. OpenERP can also generate document withholding automatically from invoices. To generate the withholding income you must confirm and validate the document withholding.</field>
+            <field name="help">With Supplier Withholding  you can manage document withholding issued to your suppliers. OpenERP can Just generate document withholding for purchase process automatically from invoices. To generate the withholding income and all accounting process you must confirm and validate the document withholding.</field>
 
         </record>
         <record model="ir.actions.act_window.view" id="action_wh_islr_tree">