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

[[SISB] Edgar Rivero]

[FIX] Corregido formato del libro de retencion y cambiado ordenamiento
por comprobante.

[FIX] Corregido error en la Base Imponible, en el libro de retención y retenciones de IVA
que se encuentra en "Generar txt".

[FIX] Corregido formato de las lineas, del "Generar txt" de retención de IVA.

[Javier Duran (javieredm)]

Unido a la rama principal de la localización en la revisión:

revno: 668 [merge]
revision-id: javier@squezee-vir-20120510203417-mrzh5rtwkdpb76f9

review: Approve

[Javier Duran (javieredm)]

Unido a la rama principal de la localización en la revisión:

revno: 668 [merge]
revision-id: javier@squezee-vir-20120510203417-mrzh5rtwkdpb76f9

review: Approve

[Javier Duran (javieredm)]

Unido a la rama principal de la localización en la revisión:

revno: 668 [merge]
revision-id: javier@squezee-vir-20120510203417-mrzh5rtwkdpb76f9

review: Approve

=== modified file 'l10n_ve_fiscal_reports/report/wh_book.py'
--- l10n_ve_fiscal_reports/report/wh_book.py	2012-02-16 21:14:14 +0000
+++ l10n_ve_fiscal_reports/report/wh_book.py	2012-05-10 19:22:19 +0000
@@ -49,6 +49,7 @@
             'get_totals':self._get_totals,
             'get_total_excent':self._get_total_excent,
             'get_total_wh':self._get_total_wh,
+            'get_totals_base': self.get_totals_base,
         })
 
     def _get_partner_addr(self, idp=None):
@@ -100,7 +101,7 @@
             book_type='fiscal.reports.whs'
         data=[]
         fr_obj = self.pool.get(book_type)
-        fr_ids = fr_obj.search(self.cr,self.uid,[('ar_date_ret', '<=', d2), ('ar_date_ret', '>=', d1)])
+        fr_ids = fr_obj.search(self.cr,self.uid,[('ar_date_ret', '<=', d2), ('ar_date_ret', '>=', d1)], order='ar_number')
         data = fr_obj.browse(self.cr,self.uid, fr_ids)
         return data
 
@@ -163,7 +164,17 @@
             total_excent=total_excent+self._get_exc(d.ar_line_id)
         return total_excent
         
-    
+    def get_totals_base(self, form):
+        data = self._get_data(form)
+        total = 0
+        for base in data:
+            for line in base.ar_line_id.tax_line:
+                if line.base:
+                    if base.ai_id.type == 'in_refund':
+                        total += line.base * (-1)
+                    else:
+                        total += line.base
+        return total
       
 report_sxw.report_sxw(
     'report.fiscal.reports.whp.whp_seniat',

=== modified file 'l10n_ve_fiscal_reports/report/witholding_book.rml'
--- l10n_ve_fiscal_reports/report/witholding_book.rml	2012-02-16 21:14:14 +0000
+++ l10n_ve_fiscal_reports/report/witholding_book.rml	2012-05-10 19:22:19 +0000
@@ -106,10 +106,10 @@
           <para style="ENCABEZADO">Factura Afectada</para>
         </td>
         <td>
-          <para style="ENCABEZADO">Total Ventas</para>
+          <para style="ENCABEZADO">[[ (data['form']['model'] == 'wh_p') and "Total Compras" or "Total Ventas" ]]</para>
         </td>
         <td>
-          <para style="ENCABEZADO">Ventas Exentas</para>
+          <para style="ENCABEZADO">[[ (data['form']['model'] == 'wh_p') and "Compras Exentas" or "Ventas Exentas" ]]</para>
         </td>
         <td>
           <para style="ENCABEZADO">Impuesto</para>
@@ -219,7 +219,7 @@
                 <td>
                 </td>
                 <td>
-                    <para style="TOTALES">[[ formatLang(get_totals(data['form'])[1]) ]]</para>
+                    <para style="TOTALES">[[ formatLang(get_totals_base(data['form'])) ]]</para>
                 </td>
             </tr>
       </blockTable>

=== modified file 'l10n_ve_withholding_iva/model/generate_txt.py'
--- l10n_ve_withholding_iva/model/generate_txt.py	2012-02-16 19:12:15 +0000
+++ l10n_ve_withholding_iva/model/generate_txt.py	2012-05-10 19:22:19 +0000
@@ -54,7 +54,10 @@
         for txt in self.browse(cr,uid,ids,context):
             res[txt.id]= 0.0
             for txt_line in txt.txt_ids:
-                res[txt.id] += txt_line.untaxed
+                if txt_line.invoice_id.type in ['out_refund','in_refund']:
+                    res[txt.id] -= txt_line.untaxed
+                else:
+                    res[txt.id] += txt_line.untaxed
         return res
 
     _columns = {
@@ -125,6 +128,7 @@
             for voucher_lines in voucher.wh_lines:
                 
                 if voucher_lines.invoice_id.state in ['open','paid']:
+                    
                     txt_iva_obj.create(cr,uid,
                     {'partner_id':voucher.partner_id.id,
                     'voucher_id':voucher.id,