Merge lp:~vauxoo/openerp-venezuela-localization/jose-l10n_sale-purchase into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com]

[FIX] Stock.py to witholding concept add of the product in the invoices (l10n_ve_sale_purchase
[FIX] Method _witholdig_tax added to only give invoices with witholding vat(l10n_ve_witholding_iva)

=== modified file 'l10n_ve_sale_purchase/stock.py'
--- l10n_ve_sale_purchase/stock.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_sale_purchase/stock.py	2012-01-10 21:50:29 +0000
@@ -45,20 +45,11 @@
         invoice_id=data[picking_id]
         invoice_brw = self.pool.get('account.invoice').browse(cursor, user, invoice_id)
         picking_brw=self.browse(cursor, user, picking_id)
-        if type == 'in_invoice' or type == 'in_refund': #ORDENES DE COMPRA
-            for line_invoice in invoice_brw.invoice_line: #lineas de la factura
-                for line_orden in picking_brw.purchase_id.order_line: #lineas de la orden de compra
-                    if line_invoice.product_id==line_orden.product_id: #si es la misma linea
-                        self.pool.get('account.invoice.line').write(cursor, user, line_invoice.id, {'concept_id':line_orden.concept_id.id})       
-            return data 
-        #~ ORDENES DE VENTA
-        if type =='out_invoice' or type == 'out_refund':
-            for line_invoice in invoice_brw.invoice_line: #lineas de la factura
-                for line_orden in picking_brw.sale_id.order_line: #lineas de la orden de venta
-                    if line_invoice.product_id==line_orden.product_id: #si es la misma linea
-                        self.pool.get('account.invoice.line').write(cursor, user, line_invoice.id, {'concept_id':line_orden.concept_id.id})     
-            
-            return data 
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        for l in invoice_brw.invoice_line:
+            invoice_line_obj.write(cursor, user, l.id, {'concept_id':
+                l.product_id and l.product_id.concept_id and l.product_id.concept_id.id or False})       
+        return data 
 
     _columns = {
         'nro_ctrl': fields.char('Invoice ref.', size=32, readonly=True, states={'draft':[('readonly',False)]}, help="Invoice reference"),

=== modified file 'l10n_ve_withholding_iva/model/wh_iva.py'
--- l10n_ve_withholding_iva/model/wh_iva.py	2012-01-03 15:23:32 +0000
+++ l10n_ve_withholding_iva/model/wh_iva.py	2012-01-10 21:50:29 +0000
@@ -390,7 +390,13 @@
                     self.write(cr, uid, [ret.id], {'wh_lines':lines, 'period_id':period_id})
         
         return True
-
+    
+    def _withholdable_tax_(self, cr, uid, ids, context=None):
+        if context is None:
+            context={}
+        account_invo_obj = self.pool.get('account.invoice')
+        acc_id = [line.id for line in account_invo_obj.browse(cr, uid, ids, context=context) if line.tax_line for tax in line.tax_line if tax.tax_id.ret ]
+        return acc_id
 
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,context=None):
         if context is None: context = {}
@@ -417,7 +423,7 @@
         if inv_ids:
             #~ Get only the invoices which are not in a document yet
             inv_ids = [i for i in inv_ids if not wh_line_obj.search(cr, uid, [('invoice_id', '=', i)])]
-            
+        inv_ids = self._withholdable_tax_(cr, uid, inv_ids, context=None)
         if inv_ids:
             awil_obj = self.pool.get('account.wh.iva.line')
             res_wh_lines = [{