Merge lp:~vauxoo/openerp-venezuela-localization/jose-withholding-iva into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com]

Added name by defaul in the generate txt and xml added other notebook in the view xml for company_id of generate txt

[lp:~vauxoo/openerp-venezuela-localization/jose-withholding-iva]

454. By OpenERP <openerp@jose-pc> on 2011-11-01

[IMP] Added new funtion and generate txt
uncommented field in the generate txt

Unmerged revisions

=== modified file 'l10n_ve_withholding_islr/islr_xml_wh.py'
--- l10n_ve_withholding_islr/islr_xml_wh.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_islr/islr_xml_wh.py	2011-11-01 21:40:28 +0000
@@ -57,6 +57,7 @@
         return res
 
     _columns = {
+        'name':fields.char('Description',128, required=True, select=True, help = "Description about statement of withholding income"),
         'company_id': fields.many2one('res.company', 'Company', required=True, help="Company"),
         'state': fields.selection([
             ('draft','Draft'),
@@ -68,19 +69,39 @@
         'period_id':fields.many2one('account.period','Period',required=True, domain="[('fiscalyear_id','=',fiscalyear_id)]", help="Period when the accounts entries were done"),
         'amount_total_ret':fields.function(_get_amount_total,method=True, digits=(16, 2), readonly=True, string='Withholding Income Amount Total', help="Amount Total of withholding"),
         'amount_total_base':fields.function(_get_amount_total_base,method=True, digits=(16, 2), readonly=True, string='Without Tax Amount Total', help="Total without taxes"),
-        'xml_ids':fields.one2many('islr.xml.wh.line','islr_xml_wh_doc','XML Document Lines', readonly=True ,domain="[('period_id','=',period_id), ('islr_xml_wh_doc','=',False)]",states={'draft':[('readonly',False)]}),
+        'xml_ids':fields.one2many('islr.xml.wh.line','islr_xml_wh_doc','XML Document Lines', readonly=True ,states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
     }
-    _rec_rame = 'company_id'
-
     _defaults = {
         'state': lambda *a: 'draft',
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
         'user_id': lambda s, cr, u, c: u,
+
+        'fiscalyear_id': lambda self,cr,uid,conext:\
+                self.pool.get('account.fiscalyear').browse(cr,uid,uid,context={}).id,
+                                   
+        'period_id': lambda self,cr,uid,context: self.period_return(cr,uid,context),
+        'name':lambda self,cr,uid,context : 'Withholding Income '+time.strftime('%m/%Y')
     }
 
+    def period_return(self,cr,uid,contex=None):
+        period_obj = self.pool.get('account.period')
+        fecha = time.strftime('%m/%Y')
+        period_id = period_obj.search(cr,uid,[('code','=',fecha)])
+        if period_id:
+            return period_id[0]
+        else:
+            return False
+
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        
+        res = [(r['id'], r['name']) for r in self.read(cr, uid, ids, ['name'], context)]
+        return res
+
     def action_anular1(self, cr, uid, ids, context={}):
         return self.write(cr, uid, ids, {'state':'draft'})
 
@@ -191,7 +212,6 @@
 
 islr_xml_wh_line()
 
-
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
 
@@ -202,9 +222,3 @@
         'wh_xml_id': lambda *a: 0,
     }
 account_invoice_line()
-
-
-
-
-
-

=== modified file 'l10n_ve_withholding_islr/islr_xml_wh.xml'
--- l10n_ve_withholding_islr/islr_xml_wh.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_islr/islr_xml_wh.xml	2011-11-01 21:40:28 +0000
@@ -57,6 +57,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Lines Withholding for XML" >
+                    <field name="name"/>
                     <field name="company_id"/>
                     <field name="fiscalyear_id"/>
                     <field name="period_id"/>
@@ -70,7 +71,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Lines Withholding for XML">
-                    <field name="company_id"/>
+                    <field name="name"/>
                     <newline/>
                     <group col="4" colspan="2">
                         <field name="fiscalyear_id"  />
@@ -99,7 +100,10 @@
                                 <field name="amount_total_ret"/>
                                 <field name="amount_total_base"/>
                              </group>
-                        </page>
+                         </page>
+                         <page string="Other information">
+                             <field name="company_id" />
+                         </page>
                     </notebook>
                 </form>
             </field>
@@ -163,7 +167,6 @@
     </data>
 </openerp>
 
-<!--            parent="l10n_ve_withholding.menu_wh_suppiler"-->
 
 
 

=== modified file 'l10n_ve_withholding_iva/generate_txt.py'
--- l10n_ve_withholding_iva/generate_txt.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/generate_txt.py	2011-11-01 21:40:28 +0000
@@ -38,27 +38,24 @@
 class txt_iva(osv.osv):
     _name = "txt.iva"
 
-    #~ 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
-            #~ for txt_line in txt.txt_ids:
-                #~ res[txt.id] += txt_line.amount_withheld
-                #~ 
-        #~ return res
+    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
+            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
+    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:
+                res[txt.id] += txt_line.untaxed
+        return res
 
     _columns = {
+        'name':fields.char('Description',128, required=True, select=True, help = "Description about statement of withholding income"),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True,states={'draft':[('readonly',False)]}),
         'state': fields.selection([
             ('draft','Draft'),
@@ -72,18 +69,36 @@
         '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'),
-        #~ '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"),
+        'txt_ids':fields.one2many('txt.iva.line','txt_id', readonly=True,states={'draft':[('readonly',False)]}, help='Txt field lines of ar required by SENIAT for VAT withholding'),
+        '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"),
     }
-    _rec_rame = 'company_id'
     _defaults = {
         'state': lambda *a: 'draft',
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
         'type': lambda *a:'True',
-    }
+        'fiscalyear_id': lambda self,cr,uid,conext:\
+                self.pool.get('account.fiscalyear').browse(cr,uid,uid,context={}).id,
+        'period_id': lambda self,cr,uid,context: self.period_return(cr,uid,context),
+        'name':lambda self,cr,uid,context : 'Withholding Vat '+time.strftime('%m/%Y')
+        }
+
+    def period_return(self,cr,uid,contex=None):
+        period_obj = self.pool.get('account.period')
+        fecha = time.strftime('%m/%Y')
+        period_id = period_obj.search(cr,uid,[('code','=',fecha)])
+        if period_id:
+            return period_id[0]
+        else:
+            return False
+    
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        res = [(r['id'], r['name']) for r in self.read(cr, uid, ids, ['name'], context)]
+        return res 
 
     def action_anular(self, cr, uid, ids, context={}):
         return self.write(cr, uid, ids, {'state':'draft'})
@@ -108,7 +123,7 @@
         
         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,
@@ -213,7 +228,7 @@
                 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)

=== modified file 'l10n_ve_withholding_iva/generate_txt_view.xml'
--- l10n_ve_withholding_iva/generate_txt_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/generate_txt_view.xml	2011-11-01 21:40:28 +0000
@@ -29,7 +29,7 @@
             <field name="arch" type="xml">
                 <form string="Withholding lines for TXT">
                     <group col="4" colspan="4">
-                        <field name="company_id"/>
+                        <field name="name"/>
                         <field name="type"/>
                     </group>
                     <newline/>
@@ -60,13 +60,15 @@
                                 <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"/>
                             </group>
-<!--
                             <group col="2" colspan="2">
                                 <field name="amount_total_ret"/>
                                 <field name="amount_total_base"/>
-                             </group>
--->
+                            </group>
                         </page>
+                          <page string="Other information">
+                               <field name="company_id" />
+                          </page>
+                                                                                    
                     </notebook>
                 </form>
             </field>
@@ -102,7 +104,3 @@
     </data>
 </openerp>
 
-
-
-
-