Merge lp:~team-cluster/openerp-venezuela-localization/ovl70-jperez-wh-islr-report into lp:openerp-venezuela-localization

[Eduardo Ochoa - Cluster Brands]

Placement of logo top left, address field correction, previously not showing the address of the company or provider, correction tax base in cases of natural persons.

[Eduardo Ochoa - Cluster Brands (eochoa)]

Hi Humberto,
Please rember see this merge proposal.

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

review: Approve

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Sorry for being late,
the proposal has been approved,
Soon will be merged and released.

Regards.

=== modified file 'l10n_ve_withholding_islr/report/wh_islr.py'
--- l10n_ve_withholding_islr/report/wh_islr.py	2013-04-26 23:55:44 +0000
+++ l10n_ve_withholding_islr/report/wh_islr.py	2013-08-22 13:50:10 +0000
@@ -37,22 +37,21 @@
         })
 
     def _get_partner_addr(self, idp=False):
-        """ Return address of the partner
+        """ Return address partner
         """
         if not idp:
             return []
-
+        
         addr_obj = self.pool.get('res.partner')
-        addr_inv = _('NO INVOICE ADDRESS DEFINED')
+        addr_inv = _('NO FISCAL ADDRESS DEFINED')
         addr_inv={}
         if idp:                
             addr = addr_obj.browse(self.cr,self.uid, idp)
-            addr_inv = addr.type == 'invoice' and (addr.street and ('%s, '%addr.street.title()) or '')    + \
+            addr_inv = addr.type == 'default' and (addr.street and ('%s, '%addr.street.title()) or '')    + \
             (addr.zip and ('Codigo Postal: %s, '%addr.zip) or '')        +\
+            (addr.city and ('%s, '%addr.city.title()) or '')+ \
             (addr.state_id and ('%s, '%addr.state_id.name.title()) or '')+ \
-            (addr.city and ('%s, '%addr.city.title()) or '')+ \
             (addr.country_id and ('%s '%addr.country_id.name.title()) or '') or _('NO INVOICE ADDRESS DEFINED')
-
             #~ addr_inv = (addr.street or '')+' '+(addr.street2 or '')+' '+(addr.zip or '')+ ' '+(addr.city or '')+ ' '+ (addr.country_id and addr.country_id.name or '')+ ', TELF.:'+(addr.phone or '')
         return addr_inv 
 

=== modified file 'l10n_ve_withholding_islr/report/wh_islr_report.rml'
--- l10n_ve_withholding_islr/report/wh_islr_report.rml	2013-05-10 18:25:44 +0000
+++ l10n_ve_withholding_islr/report/wh_islr_report.rml	2013-08-22 13:50:10 +0000
@@ -1,193 +1,274 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(216.0mm,280.0mm)" title="Test" author="Martin Simon" allowSplitting="20" showBoundary='0'>
-    <pageTemplate id="first">
-        <pageGraphics>
-            <setFont name="Courier-Bold" size="12.0"/>
-
-            <place x="3.50mm"  y="235.0mm"  width="203.0mm"  height="40.0mm">
-                
-                <blockTable colWidths="90.0mm,56.0mm,56.0mm" style="TABLATITULO">
-                    <tr>
-                        <td>
-                            <para style="TITULOLEFT">[[ o.company_id and o.company_id.name.upper() or '']]</para>
-                            <para style="RIFLEFT">[[(o.company_id.partner_id.vat and ('RIF:%s-%s-%s'%(o.company_id.partner_id.vat[2:3],o.company_id.partner_id.vat[3:11],o.company_id.partner_id.vat[11:12])) or removeParentNode('para'))]]</para>
-                        </td>
-                        <td>
-                            <para style="TITULOCENTER">COMPROBANTE DE RETENCION DE IMPUESTO SOBRE LA RENTA</para>
-                        </td>
-                        <td><para style="TITULOCENTER"></para></td>
-                    </tr>
-                    <tr>
-                        <td><para style="TITULOCENTER"></para></td>
-                        <td><para style="TITULOCENTER"></para></td>
-                        <td><para style="TITULOCENTER"></para></td>
-                    </tr>
-                    <tr>
-                        <td><para style="TITULOCENTER"></para></td>
-                        <td><para style="TITULOCENTER"></para></td>
-                        <td><para style="TITULOCENTER"></para></td>
-                    </tr>
-                    <tr>
-                        <td><para style="TCENTER"></para></td>
-                        <td><para style="TCENTER"><b>Fecha de Retención</b></para></td>
-                        <td><para style="TCENTER"><b>No. de Comprobante</b></para></td>
-                    </tr>
-                    <tr>
-                        <td><para style="TCENTER"> </para></td>
-                        <td><para style="TCENTER"><b>[[ o.date_ret ]]</b></para></td>
-                        <td><para style="TCENTER"><b>[[ o.number ]]</b></para></td>
-                    </tr>
-                </blockTable>
-                <blockTable colWidths="202.0mm">
-                    <tr>
-                        <td><para style="RIFLEFT">[[ o.company_id.partner_id.id and get_partner_addr(o.company_id.partner_id.id) or '' ]]</para></td>
-                    </tr>
-                </blockTable>
-            </place>
-                <place x="3.50mm"  y="225.0mm"  width="203.0mm"  height="25.0mm">>
-                    <blockTable colWidths="202.0mm">
-                        <tr>
-                            <td>
-                                <para style="RIFLEFT">[[ o.partner_id and ('CONTRIBUYENTE: %s,'%(o.partner_id.name)) or 'SIN CONTRI' ]][[ o.partner_id.vat and (' RIF.:%s-%s-%s'%(o.partner_id.vat[2:3],o.partner_id.vat[3:11],o.partner_id.vat[11:12])) or 'SIN RIF' ]]</para>
-                                <para style="RIFLEFT">DIRECCION: [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.street and  ('%s,'%(o.invoice_id.address_invoice_id.street)) or '') or '') or '']][[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.zip and ('Codigo Postal: %s,'%(o.invoice_id.address_invoice_id.zip)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.city and ('%s,'%(o.invoice_id.address_invoice_id.city)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.name and ('%s '%(o.invoice_id.address_invoice_id.country_id.name)) or '') or '') or '']][[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.phone and ('Telf: %s '%(o.invoice_id.address_invoice_id.phone)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.fax and ('Fax: %s'%(o.invoice_id.address_invoice_id.fax)) or '') or '') or '']] </para>
-<!--
-                                <para style="RIFLEFT">DIRECCION: [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.street and  ('%s,'%(o.invoice_id.address_invoice_id.street)) or '') or '') or '']][[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.zip and ('Codigo Postal: %s,'%(o.invoice_id.address_invoice_id.zip)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.city_id and ('%s,'%(o.invoice_id.address_invoice_id.city_id.name)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.name and ('%s '%(o.invoice_id.address_invoice_id.country_id.name)) or '') or '') or '']][[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.phone and ('Telf: %s '%(o.invoice_id.address_invoice_id.phone)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.fax and ('Fax: %s'%(o.invoice_id.address_invoice_id.fax)) or '') or '') or '']] </para>
--->
-                            </td>
-                        </tr>
-                    </blockTable>
-                </place>
-
-            <place x="3.50mm"  y="130.0mm"  width="150.0mm"  height="30.0mm">
-                <blockTable colWidths="150.0mm" rowHeights="6mm"  style="TARTICULO">
-                    <tr>
-                        <td>
-                            <para style="TCENTER">Según Artículo No. 24 de la Gaceta Oficial de la República de Venezuela No. 36203 del 125997</para>
-                        </td>
-                    </tr>
-                </blockTable>
-            </place>
-
-            <place x="157.0mm"  y="135.0mm"  width="50.0mm"  height="30.0mm">
-                <blockTable colWidths="50.0mm" rowHeights="13mm"  style="Tabla3">
-                    <tr><td><para></para></td></tr>
-                </blockTable>
-                <blockTable colWidths="50.0mm" rowHeights="6mm"  style="Tabla3">
-                    <tr>
-                        <td>
-                            <para style="TCENTER">AGENTE DE RETENCION</para>
-                            <para style="TCENTER">FIRMA Y SELLO</para>
-                        </td>
-                    </tr>
-                </blockTable>
-            </place>
-      </pageGraphics>
-      
-    <frame id="first" x1="3.50mm" y1="160.0mm" width="203.0mm" height="75.0mm"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-  
-    <blockTableStyle id="TABLATITULO">
-        <blockSpan start="0,0" stop="0,-1"/>
-        <blockSpan start="1,0" stop="2,1"/>
-        <blockAlignment value="LEFT"/>
-        <blockValign value="TOP"/>
-        <blockValign value="MIDDLE"/>
-    </blockTableStyle>
-  
-    <blockTableStyle id="Tabla3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black" start="0,0" stop="-1,-1" thickness="0.1"/>
-      <blockValign value="MIDDLE"/>
-      <blockLeading start="0,0" stop="-1,-1" length="5"/>
-    </blockTableStyle>
-    <blockTableStyle id="TARTICULO">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockValign value="MIDDLE"/>
-      <blockLeading start="0,0" stop="-1,-1" length="5"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="Tablatotalgeneral">
-      <blockAlignment value="RIGHT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black" start="1,0" stop="-1,-1" thickness="0.1"/>
-      <blockValign value="MIDDLE"/>
-    </blockTableStyle>  
-
-      <paraStyle name="TCENTER" fontName="Courier" fontSize="8.0" leading="8" spaceBefore="1.0" spaceAfter="-3.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="CENTER"/>
-      <paraStyle name="TLEFT" fontName="Courier" fontSize="8.0" leading="8" spaceBefore="-3.0" spaceAfter="-3.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="LEFT"/>
-      <paraStyle name="RIFLEFT" fontName="Courier" fontSize="8.0" leading="8" spaceBefore="1.0" spaceAfter="1.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="LEFT"/>
-      <paraStyle name="TRIGHT" fontName="Courier" fontSize="8.0" leading="8" spaceBefore="1.0" spaceAfter="-3.0" rigthIdent="-4.0" leftIndent="-4.0"  alignment="RIGHT"/>
-      <paraStyle name="TOTALRIGHT" fontName="Courier-Bold" fontSize="9.0" leading="9" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
-      <paraStyle name="TITULOLEFT" fontName="Courier-Bold" fontSize="16.0" leading="16.0" spaceBefore="1.0" spaceAfter="1.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="LEFT"/>
-      <paraStyle name="TITULOCENTER" fontName="Courier-Bold" fontSize="10.0" leading="10.0" spaceBefore="0.0" spaceAfter="0.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="CENTER"/>
-  </stylesheet>
-  <images/>
-
-  <story>
-    <para>[[repeatIn(objects,'o')]]</para>
-    <para>[[ setLang(o.company_id.partner_id.lang) ]]</para> 
-    <blockTable colWidths="20.0mm,25.0mm,25.0mm,10.0mm,63.0mm,25.0mm,15.0mm,20.0mm" style="Tabla3" >
-      <tr>
-        <td><para style="TCENTER">Fecha de Doc.</para></td>   
-        <td><para style="TCENTER">No. Doc.</para></td>  
-        <td><para style="TCENTER">No. Control</para></td>
-        <td><para style="TCENTER">Tipo Doc.</para></td>
-        <td><para style="TCENTER">Concepto</para></td>
-        <td><para style="TCENTER">Base Imponible</para></td>
-        <td><para style="TCENTER">% Rete.</para></td>
-        <td><para style="TCENTER">I.S.L.R. Retenido</para></td>
-      </tr>
-    </blockTable>
+    <template pageSize="(216.0mm,280.0mm)" title="Test" author="Martin Simon" allowSplitting="20" showBoundary='0'>
+        <pageTemplate id="first">
+            <pageGraphics>
+                <image x="3.50mm" y="250.00mm" height="25mm" width="96mm">
+                    [[o.company_id.logo and o.company_id.logo or removeParentNode('image')]]
+                </image>
+                <place x="3.50mm"  y="215.0mm"  width="150.0mm"  height="30.0mm">
+                    <blockTable colWidths="100mm" rowHeights="6mm"  style="TABLATITULO">
+                        <tr>
+                            <td>
+
+                                <para style="TITULOLEFT">[[ o.company_id and o.company_id.name.upper() or '']]</para>
+                                <para style="RIFLEFT">
+                                    [[(o.company_id.partner_id.vat and ('RIF:%s-%s-%s'%(o.company_id.partner_id.vat[2:3],o.company_id.partner_id.vat[3:11],o.company_id.partner_id.vat[11:12])) or removeParentNode('para'))]]
+                                </para>
+                                <para style="RIFLEFT">[[ get_partner_addr(o.company_id.partner_id.id) or '' ]]</para>
+
+                            </td>
+                        </tr>
+                    </blockTable>
+                </place>
+
+                <place x="3.50mm"  y="235.0mm"  width="203.0mm"  height="40.0mm">
+                    <blockTable colWidths="90.0mm,56.0mm,56.0mm" style="TABLATITULO">
+                        <tr>
+                            <td>
+                                <para style="TITULOCENTER"></para>
+                            </td>
+                            <td>
+                                <para style="TITULOCENTER">COMPROBANTE DE RETENCION DE IMPUESTO SOBRE LA RENTA</para>
+                            </td>
+                            <td>
+                                <para style="TITULOCENTER"></para>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <para style="TITULOCENTER"></para>
+                            </td>
+                            <td>
+                                <para style="TITULOCENTER"></para>
+                            </td>
+                            <td>
+                                <para style="TITULOCENTER"></para>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td>
+                                <para style="TCENTER"></para>
+                            </td>
+                            <td>
+                                <para style="TCENTER"> <b>Fecha de Retención</b>
+                                </para>
+                            </td>
+                            <td>
+                                <para style="TCENTER"> <b>No. de Comprobante</b>
+                                </para>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <para style="TCENTER"></para>
+                            </td>
+                            <td>
+                                <para style="TCENTER">
+                                    <b>[[ o.date_ret ]]</b>
+                                </para>
+                            </td>
+                            <td>
+                                <para style="TCENTER">
+                                    <b>[[ o.number ]]</b>
+                                </para>
+                            </td>
+                        </tr>
+                    </blockTable>
+
+                </place>
+
+                <place x="3.50mm"  y="205.0mm"  width="203.0mm"  height="25.0mm">
+                    >
+                    <blockTable colWidths="100.0mm">
+                        <tr>
+                            <td>
+                                <para style="RIFLEFT">
+                                    [[ o.partner_id and ('CONTRIBUYENTE: %s,'%(o.partner_id.name)) or 'SIN CONTRI' ]][[ o.partner_id.vat and (' RIF.:%s-%s-%s'%(o.partner_id.vat[2:3],o.partner_id.vat[3:11],o.partner_id.vat[11:12])) or 'SIN RIF' ]]
+                                </para>
+                                <para style="RIFLEFT">[[ get_partner_addr( o.partner_id.id ) ]]</para>
+
+                                <!--  <para style="RIFLEFT">
+                                DIRECCION: [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.street and  ('%s,'%(o.invoice_id.address_invoice_id.street)) or '') or '') or '']][[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.zip and ('Codigo Postal: %s,'%(o.invoice_id.address_invoice_id.zip)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.city and ('%s,'%(o.invoice_id.address_invoice_id.city)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.name and ('%s '%(o.invoice_id.address_invoice_id.country_id.name)) or '') or '') or '']][[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.phone and ('Telf: %s '%(o.invoice_id.address_invoice_id.phone)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.fax and ('Fax: %s'%(o.invoice_id.address_invoice_id.fax)) or '') or '') or '']]
+                            </para>
+                            -->
+                            <!--
+                                <para style="RIFLEFT">
+                            DIRECCION: [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.street and  ('%s,'%(o.invoice_id.address_invoice_id.street)) or '') or '') or '']][[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.zip and ('Codigo Postal: %s,'%(o.invoice_id.address_invoice_id.zip)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.city_id and ('%s,'%(o.invoice_id.address_invoice_id.city_id.name)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.name and ('%s '%(o.invoice_id.address_invoice_id.country_id.name)) or '') or '') or '']][[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.phone and ('Telf: %s '%(o.invoice_id.address_invoice_id.phone)) or '') or '') or '']] [[ o.invoice_id and (o.invoice_id.address_invoice_id and (o.invoice_id.address_invoice_id.fax and ('Fax: %s'%(o.invoice_id.address_invoice_id.fax)) or '') or '') or '']]
+                        </para>
+                        -->
+                    </td>
+                </tr>
+            </blockTable>
+        </place>
+
+        <place x="3.50mm"  y="130.0mm"  width="150.0mm"  height="30.0mm">
+            <blockTable colWidths="150.0mm" rowHeights="6mm"  style="TARTICULO">
+                <tr>
+                    <td>
+                        <para style="TCENTER">
+                            Según Artículo No. 24 de la Gaceta Oficial de la República Bolivariana de Venezuela No. 36203 del 125997
+                        </para>
+                    </td>
+                </tr>
+            </blockTable>
+        </place>
+
+        <place x="157.0mm"  y="135.0mm"  width="50.0mm"  height="30.0mm">
+            <blockTable colWidths="50.0mm" rowHeights="13mm"  style="Tabla3">
+                <tr>
+                    <td>
+                        <para></para>
+                    </td>
+                </tr>
+            </blockTable>
+            <blockTable colWidths="50.0mm" rowHeights="6mm"  style="Tabla3">
+                <tr>
+                    <td>
+                        <para style="TCENTER">AGENTE DE RETENCION</para>
+                        <para style="TCENTER">FIRMA Y SELLO</para>
+                    </td>
+                </tr>
+            </blockTable>
+        </place>
+    </pageGraphics>
+
+    <frame id="first" x1="3.50mm" y1="160.0mm" width="203.0mm" height="50.0mm" />
+
+</pageTemplate>
+</template>
+<stylesheet>
+
+<blockTableStyle id="TABLATITULO">
+    <blockSpan start="0,0" stop="0,-1"/>
+    <blockSpan start="1,0" stop="2,1"/>
+    <blockAlignment value="LEFT"/>
+    <blockValign value="TOP"/>
+    <blockValign value="MIDDLE"/>
+</blockTableStyle>
+
+<blockTableStyle id="Tabla3">
+    <blockAlignment value="LEFT"/>
+    <blockValign value="TOP"/>
+    <lineStyle kind="GRID" colorName="black" start="0,0" stop="-1,-1" thickness="0.1"/>
+    <blockValign value="MIDDLE"/>
+    <blockLeading start="0,0" stop="-1,-1" length="5"/>
+</blockTableStyle>
+<blockTableStyle id="TARTICULO">
+    <blockAlignment value="LEFT"/>
+    <blockValign value="TOP"/>
+    <blockValign value="MIDDLE"/>
+    <blockLeading start="0,0" stop="-1,-1" length="5"/>
+</blockTableStyle>
+
+<blockTableStyle id="Tablatotalgeneral">
+    <blockAlignment value="RIGHT"/>
+    <blockValign value="TOP"/>
+    <lineStyle kind="GRID" colorName="black" start="1,0" stop="-1,-1" thickness="0.1"/>
+    <blockValign value="MIDDLE"/>
+</blockTableStyle>
+
+<paraStyle name="TCENTER" fontName="Courier" fontSize="8.0" leading="8" spaceBefore="1.0" spaceAfter="-3.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="CENTER"/>
+<paraStyle name="TLEFT" fontName="Courier" fontSize="8.0" leading="8" spaceBefore="-3.0" spaceAfter="-3.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="LEFT"/>
+<paraStyle name="RIFLEFT" fontName="Courier" fontSize="8.0" leading="8" spaceBefore="0.0" spaceAfter="1.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="LEFT"/>
+<paraStyle name="TRIGHT" fontName="Courier" fontSize="8.0" leading="8" spaceBefore="1.0" spaceAfter="-3.0" rigthIdent="-4.0" leftIndent="-4.0"  alignment="RIGHT"/>
+<paraStyle name="TOTALRIGHT" fontName="Courier-Bold" fontSize="9.0" leading="9" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
+<paraStyle name="TITULOLEFT" fontName="Courier-Bold" fontSize="10.0" leading="10.0" spaceBefore="0.0" spaceAfter="0.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="LEFT"/>
+<paraStyle name="TITULOCENTER" fontName="Courier-Bold" fontSize="10.0" leading="10.0" spaceBefore="0.0" spaceAfter="0.0" rigthIdent="-4.0" leftIndent="-4.0" alignment="CENTER"/>
+</stylesheet>
+<images/>
+
+<story>
+<para>[[repeatIn(objects,'o')]]</para>
+<para>[[ setLang(o.company_id.partner_id.lang) ]]</para>
+<blockTable colWidths="20.0mm,25.0mm,25.0mm,10.0mm,63.0mm,25.0mm,15.0mm,20.0mm" style="Tabla3" >
+    <tr>
+        <td>
+            <para style="TCENTER">Fecha de Doc.</para>
+        </td>
+        <td>
+            <para style="TCENTER">No. Doc.</para>
+        </td>
+        <td>
+            <para style="TCENTER">No. Control</para>
+        </td>
+        <td>
+            <para style="TCENTER">Tipo Doc.</para>
+        </td>
+        <td>
+            <para style="TCENTER">Concepto</para>
+        </td>
+        <td>
+            <para style="TCENTER">Base Imponible</para>
+        </td>
+        <td>
+            <para style="TCENTER">% Rete.</para>
+        </td>
+        <td>
+            <para style="TCENTER">I.S.L.R. Retenido</para>
+        </td>
+    </tr>
+</blockTable>
+<section>
     <section>
+        <para>[[ repeatIn(o.concept_ids,'c')]]</para>
         <section>
-            <para>[[ repeatIn(o.concept_ids,'c')]]</para>
-            <section>
 
-                    <blockTable colWidths="20.0mm,25.0mm,25.0mm,10.0mm,63.0mm,25.0mm,15.0mm,20.0mm" style="Tabla3">
-                      <tr>
-                        <td><para style="TCENTER">[[ formatLang(c.invoice_id.date_document,date='True') ]]</para></td>   
-                        <td><para style="TCENTER">[[ c.invoice_id.supplier_invoice_number ]]</para></td>  
-                        <td><para style="TCENTER">[[ c.invoice_id.nro_ctrl ]]</para></td>
-                        <td>
-                            <para style="TCENTER">[[ c.invoice_id.type and c.invoice_id.type=='in_refund' and 'N.C.' or removeParentNode('para') ]]</para>
-                            <para style="TCENTER">[[ (c.invoice_id.type=='in_invoice' and (c.invoice_id.parent_id and 'N.D.' or removeParentNode('para')) or removeParentNode('para'))]]</para>
-                            <para style="TCENTER">[[(c.invoice_id.type=='in_invoice' and ((not c.invoice_id.parent_id) and 'F' or removeParentNode('para'))  or removeParentNode('para')) ]]</para>
-                        </td>
-                        <td><para style="TLEFT">[[ c.islr_rates_id.concept_id.name ]]</para></td>
-                        <td><para style="TRIGHT">[[ formatLang(c.amount*100/c.retencion_islr) ]]</para></td>
-                        <td><para style="TRIGHT">[[c.retencion_islr]]%</para></td>
-                        <td><para style="TRIGHT">[[ formatLang(c.amount) ]]</para></td>
-                      </tr>
-                    </blockTable>
-            </section>
+            <blockTable colWidths="20.0mm,25.0mm,25.0mm,10.0mm,63.0mm,25.0mm,15.0mm,20.0mm" style="Tabla3">
+                <tr>
+                    <td>
+                        <para style="TCENTER">[[ formatLang(c.invoice_id.date_document,date='True') ]]</para>
+                    </td>
+                    <td>
+                        <para style="TCENTER">[[ c.invoice_id.supplier_invoice_number ]]</para>
+                    </td>
+                    <td>
+                        <para style="TCENTER">[[ c.invoice_id.nro_ctrl ]]</para>
+                    </td>
+                    <td>
+                        <para style="TCENTER">
+                            [[ c.invoice_id.type and c.invoice_id.type=='in_refund' and 'N.C.' or removeParentNode('para') ]]
+                        </para>
+                        <para style="TCENTER">
+                            [[ (c.invoice_id.type=='in_invoice' and (c.invoice_id.parent_id and 'N.D.' or removeParentNode('para')) or removeParentNode('para'))]]
+                        </para>
+                        <para style="TCENTER">
+                            [[(c.invoice_id.type=='in_invoice' and ((not c.invoice_id.parent_id) and 'F' or removeParentNode('para'))  or removeParentNode('para')) ]]
+                        </para>
+                    </td>
+                    <td>
+                        <para style="TLEFT">[[ c.islr_rates_id.concept_id.name ]]</para>
+                    </td>
+                    <td>
+                        <para style="TRIGHT">[[ formatLang(c.base_amount) ]]</para>
+                    </td>
+                    <td>
+                        <para style="TRIGHT">[[c.retencion_islr]]%</para>
+                    </td>
+                    <td>
+                        <para style="TRIGHT">[[ formatLang(c.amount) ]]</para>
+                    </td>
+                </tr>
+            </blockTable>
         </section>
     </section>
-        <blockTable colWidths="70.0mm,98.0mm,35.0mm" style="Tablatotalgeneral">
-        <tr>
-            <td><para style="TOTALRIGHT"></para></td>
-            <td><para style="TOTALRIGHT">TOTAL IMPUESTO RETENIDO</para></td>
-            <td><para style="TOTALRIGHT">[[ o.amount_total_ret and formatLang(o.amount_total_ret) or '']]</para></td>
-        </tr>
-    </blockTable>
-
-  </story>
-</document>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+</section>
+<blockTable colWidths="70.0mm,98.0mm,35.0mm" style="Tablatotalgeneral">
+    <tr>
+        <td>
+            <para style="TOTALRIGHT"></para>
+        </td>
+        <td>
+            <para style="TOTALRIGHT">TOTAL IMPUESTO RETENIDO</para>
+        </td>
+        <td>
+            <para style="TOTALRIGHT">
+                [[ o.amount_total_ret and formatLang(o.amount_total_ret) or '']]
+            </para>
+        </td>
+    </tr>
+</blockTable>
+
+</story>
+</document>
\ No newline at end of file