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

[Gabriela Quilarque]

Refactorizado los archivos generate_txt.py y generate_txt_view.py,
para hacer funcionar la generacion del archivo .txt, necesario para ser declaradoante el SENIAT.
Actualmente se encuentra funcionando el modelo y la vista, pero aun no se
genera el archivo .txt, por cambios realizados en OpenERP dela version 5.0 a la versión 6.0
al momento de crear un attachment, el asunto quehay que resolver es el nuevo campo "res_name"
del modelo ir.attachment.

[Gabriela Quilarque (gabrielaquilarque97)]

Merge Done.

review: Approve

[Nhomar - Vauxoo (nhomar)]

Hola Gaby.

Me preocupa que muchos ++ las cadenas estan en español y ya habian sido cambiadas al ingles?

Revisa con detenimiento el diff por favor.

Saludos.

review: Needs Fixing

[Nhomar - Vauxoo (nhomar)]

Ej.

La lInea 104!

review: Needs Fixing

[Gabriela Quilarque (gabrielaquilarque97)]

Si Nhomar, estoy al tanto de las cadenas en español, todavia me falta hacer varias cosas para los archivos que involucran generar el txt, recuerda que tuve que volver a hacer la migracion porque no funcionaba el modulo por eso hay muchos ++.
Realice el merge porque tu ibas a comenzar a trabajar con workflow, pero sigo trabajando con generar txt.

=== modified file 'l10n_ve_withholding_iva/__init__.py'
--- l10n_ve_withholding_iva/__init__.py	2011-10-06 17:08:59 +0000
+++ l10n_ve_withholding_iva/__init__.py	2011-10-27 01:00:30 +0000
@@ -1,22 +1,29 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    
-#    
-#
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: Humberto Arocha           <[e-mail]>
+#              Maria Gabriela Quilarque  <[e-mail]>
+#              Javier Duran              <[e-mail]>
+#    Planified by: Nhomar Hernandez
+#    Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
+#    Audited by: Humberto Arocha [e-mail]
+#############################################################################
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
 ##############################################################################
 import wh_iva
 import account

=== modified file 'l10n_ve_withholding_iva/generate_txt.py'
--- l10n_ve_withholding_iva/generate_txt.py	2011-10-05 22:33:01 +0000
+++ l10n_ve_withholding_iva/generate_txt.py	2011-10-27 01:00:30 +0000
@@ -34,6 +34,7 @@
 from xml.etree.ElementTree import Element, SubElement, ElementTree, tostring
 import sys
 import base64
+import decimal_precision as dp
 
 class txt_iva(osv.osv):
     _name = "txt.iva"
@@ -41,38 +42,34 @@
     #~ def _get_amount_total(self,cr,uid,ids,name,args,context=None):
         #~ res = {}
         #~ for txt in self.browse(cr,uid,ids,context):
-            #~ res[txt.id]=0.0
+            #~ res[txt.id]= 0.0
             #~ for txt_line in txt.txt_ids:
                 #~ res[txt.id] += txt_line.amount_withheld
-                #~ 
         #~ return res
-
+#~ 
     #~ def _get_amount_total_base(self,cr,uid,ids,name,args,context=None):
         #~ res = {}
         #~ for txt in self.browse(cr,uid,ids,context):
             #~ res[txt.id]= 0.0
             #~ for txt_line in txt.txt_ids:
-                #~ print  'result: ',res[txt.id]
-                #~ print 'monto: ', txt_line.untaxed
                 #~ res[txt.id] += txt_line.untaxed
-                #~ 
         #~ return res
 
     _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True,states={'draft':[('readonly',False)]}),
+        'company_id': fields.many2one('res.company', 'Compañía', required=True, readonly=True,states={'draft':[('readonly',False)]}),
         'state': fields.selection([
             ('draft','Draft'),
             ('confirmed', 'Confirmed'),
             ('done','Done'),
             ('cancel','Cancelled')
-            ],'Estado', select=True, readonly=True, help="proof status"),
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True,readonly=True,states={'draft':[('readonly',False)]}),
-        'period_id':fields.many2one('account.period','Period',required=True,readonly=True,states={'draft':[('readonly',False)]}, domain="[('fiscalyear_id','=',fiscalyear_id)]"),
-        'type':fields.boolean('Retention Suppliers?',required=True,states={'draft':[('readonly',False)]}, help="Select the type of retention to make"),
-        'date_start': fields.date('Begin Date',required=True,states={'draft':[('readonly',False)]}, help="Begin date of period"),
-        'date_end': fields.date('End date', required=True,states={'draft':[('readonly',False)]}, help="End date of period"),
-        'type':fields.boolean('Retención Proveedores?',required=True,states={'draft':[('readonly',False)]}, help="Select the type of retention to make"),
-        'txt_ids':fields.one2many('txt.iva.line','txt_id',domain="[('txt_id','=',False)]", readonly=True,states={'draft':[('readonly',False)]}, help='Txt field lines of ar required by SENIAT for VAT withholding'),
+            ],'Estado', select=True, readonly=True, help="Estado del Comprobante"),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Año Fiscal', required=True,readonly=True,states={'draft':[('readonly',False)]}),
+        'period_id':fields.many2one('account.period','Periodo',required=True,readonly=True,states={'draft':[('readonly',False)]}, domain="[('fiscalyear_id','=',fiscalyear_id)]"),
+        'type':fields.boolean('Retención Proveedores?',required=True,states={'draft':[('readonly',False)]}, help="Seleccione el tipo de retencion a realizar"),
+        'date_start': fields.date('Fecha Inicio',required=True,states={'draft':[('readonly',False)]}, help="Fecha de Inicio del periodo"),
+        'date_end': fields.date('Fecha Fin', required=True,states={'draft':[('readonly',False)]}, help="Fecha de Fin del periodo"),
+        'type':fields.boolean('Retención Proveedores?',required=True,states={'draft':[('readonly',False)]}, help="Seleccione el tipo de retencion a realizar"),
+        'txt_ids':fields.one2many('txt.iva.line','txt_id', readonly=True,states={'draft':[('readonly',False)]}, help='Lineas del archivo txt exigido por el SENIAT, para retención del IVA'),
         #~ 'amount_total_ret':fields.function(_get_amount_total,method=True, digits=(16, 2), readonly=True, string=' Total Monto de Retencion', help="Monto Total Retenido"),
         #~ 'amount_total_base':fields.function(_get_amount_total_base,method=True, digits=(16, 2), readonly=True, string='Total Base Imponible', help="Total de la Base Imponible"),
     }
@@ -107,9 +104,7 @@
             voucher_ids = voucher_obj.search(cr,uid,[('date_ret','>=',txt_brw.date_start),('date_ret','<=',txt_brw.date_end),('period_id','=',txt_brw.period_id.id),('state','=','done'),('type','in',['out_invoice','out_refund'])])
         
         for voucher in voucher_obj.browse(cr,uid,voucher_ids):
-            
-            for voucher_lines in voucher.retention_line:
-                
+            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,
@@ -160,7 +155,7 @@
         number=0
         if txt_line.invoice_id.type in ['in_invoice','in_refund']:
             if not txt_line.invoice_id.reference:
-                raise osv.except_osv(_('Invalid action !'),_("Unable to make txt file, because the bill has no reference number free!"))
+                raise osv.except_osv(_('Invalid action !'),_("Imposible realizar archivo txt, debido a que la factura no tiene numero de referencia libre!"))
             else:
                 number = self.get_number(cr,uid,txt_line.invoice_id.reference.strip(),inv_type,20)
         elif txt_line.invoice_id.number:
@@ -213,33 +208,40 @@
                 document_type  = self.get_type_document(cr,uid,txt_line)
                 document_number=self.get_document_number(cr,uid,ids,txt_line,'inv_number',context)
                 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,context)
                 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)
 
-                txt_string= txt_string + buyer +'\t'+period2.strip()+'\n'
-                #~ +'\t'\
+                #~ txt_string= txt_string + buyer +'\t'+period2.strip()+'\t'\
                 #~ +txt_line.invoice_id.date_invoice+'\t'+operation_type+'\t'+document_type+'\t'+vendor+'\t'\
                 #~ +document_number+'\t'+control_number+'\t'+str(round(txt_line.invoice_id.amount_total,2))+'\t'\
                 #~ +str(round(amount_untaxed,2))+'\t'\
                 #~ +str(round(txt_line.amount_withheld,2))+'\t'+document_affected+'\t'+voucher_number+'\t'\
                 #~ +str(round(amount_exempt,2))+'\t'+str(alicuota)+'\t'+'0'\
-                
+                #~ +'\n'
+                txt_string= txt_string + buyer +'\t'+period2.strip()+'\t'\
+                +txt_line.invoice_id.date_invoice+'\t'+operation_type+'\t'+document_type+'\t'+vendor+'\t'\
+                +document_number+'\t'+control_number+'\t'+str(round(txt_line.invoice_id.amount_total,2))+'\t'\
+                +str(round(amount_untaxed,2))+'\t'\
+                +str(round(txt_line.amount_withheld,2))+'\t'+'\t'+voucher_number+'\t'\
+                +str(round(amount_exempt,2))+'\t'+str(alicuota)+'\t'+'0'\
+                +'\n'
         return txt_string
         
     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
+        Codificar el txt, para guardarlo en la bd y poder verlo en el cliente como attachment
         '''
         fecha = time.strftime('%Y_%m_%d')
-        name = 'IVA_' + fecha +'.'+ 'txt'
+        name_file = 'IVA_' + fecha +'.'+ 'txt'
         self.pool.get('ir.attachment').create(cr, uid, {
-            'name': name,
+            'name': name_file,
             'datas': base64.encodestring(root),
-            'datas_fname': name,
+            'datas_fname': name_file,
             'res_model': 'txt.iva',
             'res_id': ids[0],
+            'type':'binary',
             }, context=context
         )
         cr.commit()
@@ -251,13 +253,25 @@
     _name = "txt.iva.line"
     
     _columns = {
-        'partner_id':fields.many2one('res.partner','Buyer/Seller',help="Natural or juridical person that generates the Invoice, Credit Note, Debit Note or C ertification (seller)"),
-        'invoice_id':fields.many2one('account.invoice','Bill/ND/NC',help="Date of invoice, credit note, debit note or certificate, I mportación Statement"),
-        'voucher_id':fields.many2one('account.wh.iva','Tax Withholding',help="Withholding of Value Added Tax (VAT)"),
-        'amount_withheld':fields.float('Amount Withheld'),
-        'untaxed':fields.float('Untaxed'),
-        'txt_id':fields.many2one('txt.iva','Generate-Document txt VAT'),
+        'partner_id':fields.many2one('res.partner','Comprador/Vendedor',help="Persona jurídica ó natural que genera la Factura, Nota de Crédito, Nota de Débito o Certificación (vendedor)"),
+        'invoice_id':fields.many2one('account.invoice','Factura/ND/NC',help="Fecha de la factura, Nota de Crédito, Nota de Débito o Certificación, Declaración de Importación"),
+        'voucher_id':fields.many2one('account.wh.iva','Comprobante de Retencion IVA',help="Comprobante de Retencion de Impuesto al Valor Agregado (IVA)"),
+        'amount_withheld':fields.float('Amount Withheld',digits_compute= dp.get_precision('Withhold')),
+        'untaxed':fields.float('Untaxed',digits_compute= dp.get_precision('Withhold')),
+        'txt_id':fields.many2one('txt.iva','Documento-Generar txt IVA'),
     }
     _rec_name = 'partner_id'
- 
+
 txt_iva_line()
+
+
+
+
+
+
+
+
+
+
+
+

=== modified file 'l10n_ve_withholding_iva/generate_txt_view.xml'
--- l10n_ve_withholding_iva/generate_txt_view.xml	2011-10-05 22:33:01 +0000
+++ l10n_ve_withholding_iva/generate_txt_view.xml	2011-10-27 01:00:30 +0000
@@ -8,12 +8,42 @@
     =====================================================
     -->
 
+         <record id="view_generate_txt_iva_line_tree" model="ir.ui.view">
+            <field name="name">generate.txt.iva.line.tree</field>
+            <field name="model">txt.iva.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Lineas del archivo TXT">
+                    <field name="partner_id"/>
+                    <field name="invoice_id"/>
+                    <field name="voucher_id"/>
+                    <field name="untaxed"/>
+                    <field name="amount_withheld"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_generate_txt_iva_line_form" model="ir.ui.view">
+            <field name="name">generate.txt.iva.line.form</field>
+            <field name="model">txt.iva.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Detalle de las Lineas de Retencion para TXT">
+                    <field name="partner_id"/>
+                    <field name="invoice_id"/>
+                    <field name="voucher_id"/>
+                    <field name="untaxed"/>
+                    <field name="amount_withheld"/>
+                </form>
+            </field>
+        </record>
+
          <record id="view_generate_txt_iva_tree" model="ir.ui.view">
             <field name="name">generate.txt.iva.tree</field>
             <field name="model">txt.iva</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Field TXT">
+                <tree string="Archivo TXT">
                     <field name="company_id"/>
                     <field name="fiscalyear_id"/>
                     <field name="period_id"/>
@@ -27,7 +57,7 @@
             <field name="model">txt.iva</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Withholding lines for TXT">
+                <form string="Lineas de Retencion para TXT">
                     <group col="4" colspan="4">
                         <field name="company_id"/>
                         <field name="type"/>
@@ -43,22 +73,14 @@
                         <field name="date_end"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Withholding lines">
-                            <field name="txt_ids" nolabel="1"  colspan='4' widget="one2many_list">
-                                <tree string="Field of lines TXT">
-                                    <field name="partner_id"/>
-                                    <field name="invoice_id"/>
-                                    <field name="voucher_id"/>
-                                    <field name="untaxed"/>
-                                    <field name="amount_withheld"/>
-                                </tree>
-                            </field>
+                        <page string="Lineas de Retencion">
+                            <field name="txt_ids" nolabel="1"  colspan='4' widget="one2many_list"/>
                             <group col="4" colspan="2">
                                 <field name="state" select="2" colspan="4"/>
-                                <button name="action_generate_lines_txt" string="Lines Generate TXT" states="draft" type="object" icon="gtk-go-forward" colspan="4"/>
-                                <button name="action_confirm" string="Confirm" states="draft" type="object" icon="gtk-go-forward" colspan="4"/>
-                                <button name="action_done" string="Make TXT" states="confirmed" type="object"  icon="gtk-ok"/>
-                                <button name="action_anular" string="Canlce" states="confirmed,done" type="object"  icon="gtk-cancel"/>
+                                <button name="action_generate_lines_txt" string="Generar Lineas TXT" states="draft" type="object" icon="gtk-go-forward" colspan="4"/>
+                                <button name="action_confirm" string="Confirmar" states="draft" type="object" icon="gtk-go-forward" colspan="4"/>
+                                <button name="action_done" string="Realizar TXT" states="confirmed" type="object"  icon="gtk-ok"/>
+                                <button name="action_anular" string="Anular" states="confirmed,done" type="object"  icon="gtk-cancel"/>
                             </group>
 <!--
                             <group col="2" colspan="2">
@@ -72,32 +94,32 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_generate_text_iva">
-            <field name="name">Generate TXT</field>
+
+        <record model="ir.actions.act_window" id="action_generate_txt_iva">
+            <field name="name">Generar TXT</field>
             <field name="res_model">txt.iva</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-
+        
         <record model="ir.actions.act_window.view" id="action_generate_txt_iva_tree">
             <field name="sequence" eval="10"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_generate_txt_iva_tree"/> 
-            <field name="act_window_id" ref="action_generate_text_iva"/>
+            <field name="act_window_id" ref="action_generate_txt_iva"/>
         </record>
-
         <record model="ir.actions.act_window.view" id="action_generate_txt_iva_form">
             <field name="sequence" eval="20"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_generate_txt_iva_form"/>
-            <field name="act_window_id" ref="action_generate_text_iva"/>
+            <field name="act_window_id" ref="action_generate_txt_iva"/>
         </record>
 
         <menuitem name="Generate TXT" 
             id="menu_action_generate_txt_iva" 
             parent="l10n_ve_fiscal_requirements.menu_venezuela_reporting"
-            action="action_generate_text_iva"/>
+            action="action_generate_txt_iva"/>
 
     </data>
 </openerp>