Merge lp:~vauxoo/addons-vauxoo/sale-order-report into lp:addons-vauxoo

[Miguel Delgado (Vauxoo)]

Se cambio el reporte de ordenes de venta de manera que si no existe algún campo en el formulario de las ordenes de venta no se produzcan errores en el reporte, adicional a esto se agregaron los impuestos al valor agregado para que aparezca reflejado en dicho reporte.

=== modified file 'vauxoo_reports/sale_order_report/report/vauxoo.py'
--- vauxoo_reports/sale_order_report/report/vauxoo.py	2012-05-23 22:47:49 +0000
+++ vauxoo_reports/sale_order_report/report/vauxoo.py	2012-05-24 15:13:39 +0000
@@ -37,20 +37,19 @@
         })
     
     def _get_imp(self, obj):
-        aux3={} 
-            
+        dict_imp={} 
+        lista=[]
         for l in obj.order_line:
-            print 'nombre de linea', l.name
             for tax in l.tax_id:
-                print 'nombre de impuesto', tax.name
-                if aux3.get(tax.name,False):
-                    aux3[tax.name]+= l.price_subtotal*tax.amount 
+                if dict_imp.get(tax.name,False):
+                    dict_imp[tax.name]+= l.price_subtotal*tax.amount 
                 else:
-                    aux3[tax.name] = l.price_subtotal*tax.amount 
-        
-        print 'aux3',aux3
-        
-        return True
+                    if tax.name != 'EXENTO':
+                        dict_imp[tax.name] = l.price_subtotal*tax.amount 
+        for i in dict_imp.keys():
+            lista.append((i,dict_imp[i]))
+        print 'listaaa',lista
+        return lista
     
     def _get_delay(self, obj):
         aux=[]
@@ -70,7 +69,12 @@
             return []
         addr_obj = self.pool.get('res.partner.address')
         res = ''
+        
         addr_ids = addr_obj.search(self.cr,self.uid,[('partner_id','=',idp),('type','=',type_r)])
+        
+        if not addr_ids:
+            addr_ids = addr_obj.search(self.cr,self.uid,[('partner_id','=',idp),('type','=','invoice')])
+        
         addr_inv={}
         lista=""
 

=== modified file 'vauxoo_reports/sale_order_report/report/vauxoo.rml'
--- vauxoo_reports/sale_order_report/report/vauxoo.rml	2012-05-24 12:57:50 +0000
+++ vauxoo_reports/sale_order_report/report/vauxoo.rml	2012-05-24 15:13:39 +0000
@@ -123,7 +123,6 @@
 
         <blockTableStyle id="TOTAL">
             <blockValign value="TOP"/>
-            <blockSpan start="0,0" stop="0,2"/>
             <lineStyle kind="GRID" colorName="#4d80b2" start="1,0" stop="-1,-1" thickness="0.5" />
         </blockTableStyle>
 
@@ -268,17 +267,28 @@
         </blockTable>
     </section>
 <!--TABLA DE TOTALES-->
+
         <blockTable colWidths="170mm,20mm,20mm"  style="TOTAL">
                 <tr>
                     <td><para></para></td>
                     <td><para style="ITEMSRIGHT">SUBTOTAL</para></td>
                     <td><para style="ITEMSCENTER">[[ formatLang(o.amount_untaxed ) ]]</para></td>
                 </tr>
+        </blockTable>
+        <blockTable colWidths="170mm,20mm,20mm"  style="TOTAL">
                 <tr>
+                    [[repeatIn(get_imp(o),'list')]]
                     <td><para></para></td>
+<<<<<<< TREE
                     <td><para style="ITEMSRIGHT">IVA(12%):</para></td>
                     <td><para style="ITEMSCENTER">[[ formatLang(o.amount_tax) ]]</para></td>
+=======
+                    <td><para style="ITEMSCENTER">[[ list[0] ]]:</para></td>
+                    <td><para style="ITEMSRIGHT">[[ list[1] ]]</para></td>
+>>>>>>> MERGE-SOURCE
                 </tr>
+        </blockTable>
+        <blockTable colWidths="170mm,20mm,20mm"  style="TOTAL">
                 <tr>
                     <td><para></para></td>
                     <td><para style="ITEMSRIGHT">TOTAL</para></td>