Merge lp:~juan-pimentel/openerp-venezuela-localization/juan-pimentel_openerp-venezuela-localization_bluprint_reporte-generar-txt into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Juan José Pimentel (Digisolution)]

Se realizo un refactoring al modelo txt.iva de tal manera que el "context" sea opcoinal y no obligatorio.

Se modifico el reporte existente y se creo uno que mostrara toda la información requerida en el txt pero de una manera organizada y mas legible.

=== modified file 'l10n_ve_withholding_iva/model/generate_txt.py'
--- l10n_ve_withholding_iva/model/generate_txt.py	2012-01-19 14:04:28 +0000
+++ l10n_ve_withholding_iva/model/generate_txt.py	2012-01-29 17:09:23 +0000
@@ -147,7 +147,7 @@
             type= '02'
         return type
 
-    def get_document_affected(self,cr,uid,txt_line,context):
+    def get_document_affected(self,cr,uid,txt_line,context={}):
         number='0'
         if txt_line.invoice_id.type in ['in_invoice','in_refund'] and txt_line.invoice_id.parent_id:
             number = txt_line.invoice_id.parent_id.reference
@@ -168,7 +168,7 @@
                     result = i + result
         return result[::-1].strip()
 
-    def get_document_number(self,cr,uid,ids,txt_line,inv_type,context):
+    def get_document_number(self,cr,uid,ids,txt_line,inv_type,context={}):
         number=0
         if txt_line.invoice_id.type in ['in_invoice','in_refund']:
             if not txt_line.invoice_id.reference:
@@ -211,7 +211,7 @@
                 list.append(0)
         return max(list)
 
-    def generate_txt(self,cr,uid,ids,context=None):
+    def generate_txt(self,cr,uid,ids,context={}):
         txt_string = ''
         for txt in self.browse(cr,uid,ids,context):
             vat = txt.company_id.partner_id.vat[2:]
@@ -223,9 +223,9 @@
                 
                 operation_type = 'V' if txt_line.invoice_id.type in ['out_invoice','out_refund'] else 'C'
                 document_type  = self.get_type_document(cr,uid,txt_line)
-                document_number=self.get_document_number(cr,uid,ids,txt_line,'inv_number',context)
+                document_number=self.get_document_number(cr,uid,ids,txt_line,'inv_number')
                 control_number = self.get_number(cr,uid,txt_line.invoice_id.nro_ctrl,'inv_ctrl',20)
-                document_affected= self.get_document_affected(cr,uid,txt_line,context)
+                document_affected= self.get_document_affected(cr,uid,txt_line)
                 voucher_number = self.get_number(cr,uid,txt_line.voucher_id.number,'vou_number',14)
                 amount_exempt,amount_untaxed = self.get_amount_exempt_document(cr,uid,txt_line)
                 alicuota = self.get_alicuota(cr,uid,txt_line)
@@ -239,7 +239,7 @@
                  +'\n'
         return txt_string
         
-    def _write_attachment(self, cr,uid,ids,root,context):
+    def _write_attachment(self, cr,uid,ids,root,context={}):
         '''
         Encrypt txt, save it to the db and view it on the client as an attachment
         '''

=== modified file 'l10n_ve_withholding_iva/report/list_wh_iva.py'
--- l10n_ve_withholding_iva/report/list_wh_iva.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/report/list_wh_iva.py	2012-01-29 17:09:23 +0000
@@ -32,18 +32,61 @@
 from tools.translate import _
 
 class list_wh_iva(report_sxw.rml_parse):
+    
+    total_amount_exempt=0
+    total_amount_untaxed=0
+    
     def __init__(self, cr, uid, name, context):
         super(list_wh_iva, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'get_type_doc': self._get_type_document,
+            'get_doc_number':self._get_document_number,
+            'get_doc_affected':self._get_document_affected,
+            'get_ctrl_number':self._get_control_number,
+            'get_alicuota':self._get_alicuota,
+            'get_amount_exempt':self._get_amount_exempt,
+            'get_total_amount_exempt':self._get_total_amount_exempt,
+            'get_amount_untaxed':self._get_amount_untaxed,
+            'get_total_amount_untaxed':self._get_total_amount_untaxed,
+            'get_total_amount_doc':self._get_total_amount_doc,
         })
+        
+    def _get_total_amount_doc(self,doc_id):
+        total=0
+        for line in self.pool.get('txt.iva').browse(self.cr,self.uid, doc_id).txt_ids:
+            total+=line.invoice_id.amount_total
+        return total
+        
+    def _get_alicuota(self,txt_line):
+        return self.pool.get('txt.iva').get_alicuota(self.cr,self.uid,txt_line)
+        
+    def _get_amount_exempt(self,txt_line):
+        amount_exempt,amount_untaxed = self.pool.get('txt.iva').get_amount_exempt_document(self.cr,self.uid,txt_line)
+        self.total_amount_exempt+=amount_exempt
+        return amount_exempt
+
+    def _get_total_amount_exempt(self):
+        return self.total_amount_exempt
+
+    def _get_amount_untaxed(self,txt_line):
+        amount_exempt,amount_untaxed = self.pool.get('txt.iva').get_amount_exempt_document(self.cr,self.uid,txt_line)
+        self.total_amount_untaxed+=amount_untaxed
+        return amount_untaxed
+        
+    def _get_total_amount_untaxed(self):
+        return self.total_amount_untaxed
+                
+    def _get_control_number(self,txt_line):
+        return self.pool.get('txt.iva').get_number(self.cr,self.uid,txt_line.invoice_id.nro_ctrl,'inv_ctrl',20)    
 
     def _get_type_document(self,line):
         return self.pool.get('txt.iva').get_type_document(self.cr,self.uid,line)
 
-    #~ def get_type_document(self,cr,uid,txt_line):
-
-
+    def _get_document_number(self,txt_id,txt_line):
+        return self.pool.get('txt.iva').get_document_number(self.cr,self.uid,txt_id,txt_line,'inv_number')
+
+    def _get_document_affected(self,line):
+        return self.pool.get('txt.iva').get_document_affected(self.cr,self.uid,line)
 
 report_sxw.report_sxw(
     'report.list_report_wh_vat2',

=== modified file 'l10n_ve_withholding_iva/report/list_wh_iva_report.rml'
--- l10n_ve_withholding_iva/report/list_wh_iva_report.rml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/report/list_wh_iva_report.rml	2012-01-29 17:09:23 +0000
@@ -18,10 +18,18 @@
                 </blockTable>
                 <blockTable colWidths="96mm,170.0mm" style="TITLEGRISCLAROARRIBA">
                     <tr>
-                        <td><para style="ITEMSCENTER"> </para>
-                        </td>
+                        <td><para style="ITEMSCENTER"></para></td>
                         <td>
-                            <para style="ITEMSCENTER"><b>PERIODO FISCAL</b></para>
+                            <blockTable colWidths="85mm,85mm" style="SUBTITLEGRISCLAROARRIBA">
+                                <tr>
+                                    <td>
+                                        <para style="ITEMSCENTER"><b>PERIODO FISCAL</b></para>
+                                    </td>
+                                    <td>
+                                       <para style="ITEMSCENTER"><b>[[ o.company_id and o.company_id.name or '' ]] </b></para>
+                                    </td>
+                                </tr>
+                            </blockTable>
                         </td>
                     </tr>
                 </blockTable>
@@ -30,12 +38,23 @@
                         <td><para style="ITEMSCENTER"> </para>
                         </td>
                         <td>
-                            <para style="ITEMSCENTER"><b>[[ o.period_id.name]]</b></para>
+                            <blockTable colWidths="85mm,85mm" style="SUBTITLEGRISWHITE">
+                                <tr>
+                                    <td>
+                                        <para style="ITEMSCENTER"><b>[[ o.period_id and o.period_id.name or '']]</b></para>
+                                    </td>
+                                    <td>
+                                        
+                                        <para style="ITEMSCENTER"><b>[[ o.company_id and ('%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 '' ]] </b></para>
+                                    </td>
+                                </tr>
+                            </blockTable>
+                            
                         </td>
                     </tr>
                 </blockTable>
             </place>
-                <setFont name="Helvetica-BoldOblique" size="8.0"/>
+                <setFont name="Times-Bold" size="8.0"/>
             <drawRightString x="270mm" y="5mm">RETENCIONES DE IVA / PAGINA: <pageNumber/> DE <pageCount/> </drawRightString> 
             
         </pageGraphics>
@@ -53,14 +72,22 @@
             <lineStyle kind="GRID" colorName="black" start="1,0" stop="-1,-1" thickness="0.5" />
         </blockTableStyle>  
     <blockTableStyle id="TITLEGRISCLAROARRIBA">
+        <blockAlignment value="CENTER"/>
         <blockBackground colorName="#e5e2e5" start="1,0" stop="-1,-1"/>
         <lineStyle kind="GRID" colorName="black" start="1,0" stop="-1,-1" thickness="0.5"/>
         <blockValign value="MIDDLE"/>
     </blockTableStyle>
+    <blockTableStyle id="SUBTITLEGRISCLAROARRIBA">
+        <blockAlignment value="CENTER"/>
+        <blockValign value="MIDDLE"/>
+    </blockTableStyle>
     <blockTableStyle id="TITLEGRISWHITE">
         <lineStyle kind="GRID" colorName="black" start="1,0" stop="-1,-1" thickness="0.5"/>
         <blockValign value="MIDDLE"/>
     </blockTableStyle> 
+    <blockTableStyle id="SUBTITLEGRISWHITE">
+        <blockValign value="MIDDLE"/>
+    </blockTableStyle> 
     <blockTableStyle id="Tabla3">
     <blockBackground colorName="#e5e2e5" start="0,0" stop="-1,0"/>
       <blockAlignment value="LEFT"/>
@@ -74,83 +101,89 @@
       <lineStyle kind="GRID" colorName="black" start="9,0" stop="-1,-1" thickness="0.5"/>
       <blockValign value="MIDDLE"/>
     </blockTableStyle>  
+    <blockTableStyle id="LEGEND">
+        <blockAlignment value="LEFT"/>
+        <blockValign value="MIDDLE"/>
+    </blockTableStyle>  
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="TITLE" alignment="CENTER" fontName="Helvetica" fontSize="12.0" leading="20" spaceBefore="-3.0" textColor="black"/>
-    <paraStyle name="ITEMSCENTER" alignment="CENTER" fontName="Helvetica-Bold" fontSize="10.0" leading="9" spaceBefore="3.0" textColor="black"/>  
-    <paraStyle name="ITEMSRIF" alignment="CENTER" fontName="Helvetica-Bold" fontSize="12.0" leading="11" spaceBefore="3.0" textColor="black"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="10.0" leading="10" spaceBefore="3.0" alignment="CENTER"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="10.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="9.0" leading="11" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
+    <paraStyle name="TITLE" alignment="CENTER" fontName="Times-Roman" fontSize="12.0" leading="20" spaceBefore="-3.0" textColor="black"/>
+    <paraStyle name="ITEMSCENTER" alignment="CENTER" fontName="Times-Bold" fontSize="10.0" leading="9" spaceBefore="3.0" textColor="black"/>  
+    <paraStyle name="ITEMSRIF" alignment="CENTER" fontName="Times-Roman-Bold" fontSize="12.0" leading="11" spaceBefore="3.0" textColor="black"/>
+    <paraStyle name="P15" fontName="Times-Bold" fontSize="10.0" leading="10" spaceBefore="3.0" alignment="CENTER"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="10.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P13" fontName="Times-Roman" fontSize="10.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P16" fontName="Times-Bold" fontSize="10.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P14" fontName="Times-Roman" fontSize="10.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P17" fontName="Times-Bold" fontSize="10.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P22" fontName="Times-Roman" fontSize="9.0" leading="11" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
   </stylesheet>
   <images/>
  
   <story>
     <para>[[repeatIn(objects,'o')]]</para>
     <para>[[ setLang(company.partner_id.lang) ]]</para> 
-    <blockTable colWidths="410.0,198.0,50.0,50.0,45.0" repeatRows='1' style="Tabla3">
-<!--
-    <blockTable colWidths="75.0,335.0,68.0,50.0,80.0,60.0,85.0" repeatRows='1' style="Tabla3">
--->
+    <blockTable colWidths="18.00mm,22.00mm,48.00mm,8.00mm,8.00mm,22.00mm,20.00mm,22.00mm,20.00mm,20.00mm,18.00mm,20.00mm,20.00mm" repeatRows='1' style="Tabla3">
       <tr>
-        <td><para style="P15">RIF Contribuyente</para></td>
-        <td><para style="P15">Periodo</para></td>
-        <td><para style="P15">Fecha Doc.</para></td>
+        <td><para style="P15">Fecha</para></td>
+        <td><para style="P15">RIF</para></td>        
+        <td><para style="P15">Nombre</para></td>
+        <td><para style="P15">Tipo Doc.</para></td>
         <td><para style="P15">Tipo Ope.</para></td>
-        <td><para style="P15">Tipo Doc.</para></td>
-<!--
-        <td><para style="P15">RIF C/V</para></td>
         <td><para style="P15">Num Doc.</para></td>
         <td><para style="P15">Num Control</para></td>
-        <td><para style="P15">Monto Doc.</para></td>
+        <td><para style="P15">Monto Total</para></td>
         <td><para style="P15">Base Impo.</para></td>
-        <td><para style="P15">Monto IVA</para></td>
-        <td><para style="P15">Num.Doc.Afec.</para></td>
-        <td><para style="P15">Num.Compro.</para></td>
+        <td><para style="P15">IVA Reten.</para></td>
+        <td><para style="P15">Num. Doc. Afec.</para></td>
         <td><para style="P15">Monto Exc. IVA</para></td>
         <td><para style="P15">Alicuota</para></td>
-        <td><para style="P15">Expediente</para></td>
--->
       </tr>
         <tr>[[repeatIn(o.txt_ids,'line')]]
-          <td><para style="P12">[[ '98798' ]]</para></td>
-          <td><para style="P14">[[ o.period_id.name ]]</para></td>
           <td><para style="P12">[[ line.invoice_id.date_invoice ]]</para></td>
+          <td><para style="P12">[[ line.invoice_id.partner_id.vat and ('%s-%s-%s'%(line.invoice_id.partner_id.vat[2:3],line.invoice_id.partner_id.vat[3:11],line.invoice_id.partner_id.vat[11:12])) or '' ]]</para></td>
+          <td><para style="P14">[[ line.invoice_id.partner_id and line.invoice_id.partner_id.name or '' ]]</para></td>
           <td><para style="P12">[[ (line.invoice_id.type in ['out_invoice','out_refund']) and 'V' or 'C' ]]</para></td>
-          <td><para style="P13">[[ get_type_doc(line) ]]</para></td>
-
-<!--
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
-          <td><para style="P13">[[  ]]</para></td>
--->
-        </tr>
-    </blockTable>
-    <blockTable colWidths="410.0,198.0,145.0" style="TOTAL">
-        <tr>
-            <td><para style="P22"><font color="white"></font></para></td>
-            <td><para style="P16">TOTAL BASE IMPONIBLE</para></td>
-            <td><para style="P16">[[ formatLang(o.amount_total_base) ]]</para></td>
-        </tr>
-        <tr>
-            <td><para style="P22"><font color="white"></font></para></td>
-            <td><para style="P16">TOTAL MONTO DE RETENCION</para></td>
-            <td><para style="P16">[[ formatLang(o.amount_total_ret) ]]</para></td>
-        </tr>
-    </blockTable>
-
+          <td><para style="P12">[[ get_type_doc(line) ]]</para></td>
+          <td><para style="P12">[[ get_doc_number(o.id,line) ]]</para></td>
+          <td><para style="P12">[[ get_ctrl_number(line) ]]</para></td>
+          <td><para style="P13">[[  formatLang(round(line.invoice_id.amount_total,2)) ]]</para></td>
+          <td><para style="P13">[[ formatLang(round( get_amount_untaxed(line),2)) ]]</para></td>
+          <td><para style="P13">[[ formatLang(round(line.amount_withheld,2)) ]]</para></td>
+          <td><para style="P12">[[ get_doc_affected(line) ]]</para></td>
+          <td><para style="P13">[[ formatLang(round(get_amount_exempt(line),2)) ]]</para></td>
+          <td><para style="P12">[[ formatLang(get_alicuota(line)) ]]</para></td>
+        </tr>
+    </blockTable>
+    
+    <blockTable colWidths="18.00mm,22.00mm,48.00mm,8.00mm,8.00mm,22.00mm,20.00mm,22.00mm,20.00mm,20.00mm,18.00mm,20.00mm,20.00mm" repeatRows='1' style="Tabla3">
+        <tr>
+            <td><para style="P15"></para></td>
+            <td><para style="P15"></para></td>        
+            <td><para style="P15"></para></td>
+            <td><para style="P15"></para></td>
+            <td><para style="P15"></para></td>
+            <td><para style="P15"></para></td>
+            <td><para style="P15">Total</para></td>
+            <td><para style="P15">[[ formatLang(get_total_amount_doc(o.id)) ]]</para></td>
+            <td><para style="P15">[[  formatLang(get_total_amount_untaxed()) ]]</para></td>
+            <td><para style="P15">[[ formatLang(o.amount_total_ret) ]]</para></td>
+            <td><para style="P15"></para></td>
+            <td><para style="P15">[[  formatLang(get_total_amount_exempt()) ]]</para></td>
+            <td><para style="P15"></para></td>
+        </tr>
+    </blockTable>
+    <blockTable colWidths="50mm,120mm" style="LEGEND">
+        <tr>
+            <td><para style="P16">Tipo de Operación:</para></td>
+            <td><para style="P14">C=compra; V=ventas</para></td>
+        </tr>
+        <tr>
+            <td><para style="P16">Tipo de documento</para></td>
+            <td><para style="P14">01=Factura; 02=Nota de Debito; 03=Notas de Créditos</para></td>
+        </tr>
+    </blockTable>
   </story>
 
 </document>