Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-fb-imex-rev-kty into lp:openerp-venezuela-localization

[Katherine Zaoral (Vauxoo)]

first revision imex

=== modified file 'l10n_ve_fiscal_book/model/fiscal_book.py'
--- l10n_ve_fiscal_book/model/fiscal_book.py	2013-04-25 16:22:59 +0000
+++ l10n_ve_fiscal_book/model/fiscal_book.py	2013-04-29 19:14:27 +0000
@@ -797,7 +797,7 @@
                                  or False,
                 'accounting_date': (not imex_invoice) and \
                                    inv_brw.date_invoice or False,
-                'imex_date': imex_invoice and inv_brw.num_import_form_id.date_liq or False,
+                'imex_date': imex_invoice and inv_brw.customs_form_id.date_liq or False,
                 'invoice_is_imported': imex_invoice,
                 'debit_affected': inv_brw.parent_id \
                                   and inv_brw.parent_id.type in ['in_invoice', 'out_invoice'] \
@@ -821,7 +821,7 @@
                              or '01-REG',
                 'fiscal_printer': inv_brw.fiscal_printer or False,
                 'invoice_printer': inv_brw.invoice_printer or False,
-                'custom_statement': inv_brw.num_import_form_id.name or False,
+                'custom_statement': inv_brw.customs_form_id.name or False,
                 'iwdl_id': (iwdl_id and iwdl_id not in no_match_dt_iwdl_ids) \
                             and iwdl_id or False,
                 'wh_number': (iwdl_id and iwdl_id not in no_match_dt_iwdl_ids) \
@@ -1097,14 +1097,14 @@
         return inv_brw.reference or False
 
     def is_invoice_imex(self, cr, uid, inv_id, context=None):
-        """ Boolean method that verify is a invoice is imported.
+        """ Boolean method that verify is a invoice is imported by cheking the
+        customs form associated. 
         @param inv_id: invoice id
         """
         context = context or {}
         inv_obj = self.pool.get('account.invoice')
         inv_brw = inv_obj.browse(cr, uid, inv_id, context=context)
-        return inv_brw.company_id.partner_id.country_id.id != \
-            inv_brw.partner_id.country_id.id and True or False
+        return inv_brw.customs_form_id and True or False
 
 
 class fiscal_book_lines(orm.Model):

=== removed file 'l10n_ve_fiscal_book/report/book.py'
--- l10n_ve_fiscal_book/report/book.py	2013-04-16 16:53:35 +0000
+++ l10n_ve_fiscal_book/report/book.py	1970-01-01 00:00:00 +0000
@@ -1,403 +0,0 @@
-#!/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:       Luis Escobar <[e-mail]>
-#                    Tulio Ruiz <[e-mail]>
-#    Planified by: Nhomar Hernandez
-#############################################################################
-#    This program is free software: you can redistribute it and/or modify
-#    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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##############################################################################
-
-'''
-Fiscal Report For Venezuela
-'''
-
-import time
-from openerp.report import report_sxw
-import openerp.pooler
-
-class sal_book(report_sxw.rml_parse):
-    '''
-    Generates sales book
-    '''
-
-    def __init__(self, cr, uid, name, context):
-        '''
-        Reference to the current instance
-        '''
-        super(sal_book, self).__init__(cr, uid, name, context)    
-        self._company_id = self.pool.get('res.users').browse(self.cr,self.uid,uid).company_id.id
-
-        self.localcontext.update({
-            'time': time,
-            'get_data':self._get_data,
-            'get_partner_addr': self._get_partner_addr,
-            'get_p_country': self._get_p_country,
-            'get_rif': self._get_rif,
-            'get_month':self._get_month,
-            'get_ret':self._get_ret,
-            'get_data_adjustment': self._get_data_adjustment,
-            'validation': self._validation,
-            'get_data_wh': self._get_data_wh,
-            'get_amount_withheld': self._get_amount_withheld,
-            'get_date_wh': self._get_date_wh,
-#            'get_v_sdcf': self._get_v_sdcf,
-            'get_v_exent': self._get_v_exent,
-            'get_tax_line': self._get_tax_line,
-            'get_total_wh': self._get_total_wh,
-            'get_total_iva': self._get_total_iva,
-            'get_amount_untaxed_tax': self._get_amount_untaxed_tax,
-#            'get_taxes': self._get_taxes,
-            'get_wh_actual': self._get_wh_actual,
-            'get_id': self._get_id,
-#            'get_papel_anulado': self._get_papel_anulado,
-        })
-
-    def _get_partner_addr(self):
-        '''
-        Obtains the address of partner
-        '''
-        addr_obj = self.pool.get('res.partner')
-        addr_inv = 'NO HAY DIRECCION FISCAL DEFINIDA'
-        if self._company_id:
-            addr = addr_obj.browse(self.cr,self.uid, self._company_id)
-            addr_inv = addr.type == 'invoice' and (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 '') or 'NO HAY DIRECCION FISCAL DEFINIDA'
-        return addr_inv
-
-    def _get_book_type(self,form):
-        book_type=None
-        book_type='fiscal.reports.sale'
-        if form['type']=='purchase':
-            book_type='fiscal.reports.purchase'
-        
-        return book_type
-
-    def _get_p_country(self, idp=None):
-        '''
-        Obtains the address of partner
-        '''
-        if not idp:
-            return []
-
-        addr_obj = self.pool.get('res.partner')
-        a_id = 1000
-        if idp:
-            a = addr_obj.browse(self.cr,self.uid, idp)
-            a_id = addr.type == 'invoice' and a.country_id.id or 1000
-        return a_id 
-
-    def _get_book_type_wh(self, form):
-        book_type=None
-        book_type='fiscal.reports.whs'
-        if form['type']=='purchase':
-            book_type='fiscal.reports.whp'
-        return book_type
-        
-    def _get_data(self, form):
-        book_type=self._get_book_type(form)
-        res = []
-        fr_obj = self.pool.get('account.invoice')
-        criteria = [('date_invoice', '<=', form['date_end']), 
-                                ('date_invoice', '>=', form['date_start']),
-                                ('state', 'in',[ 'done', 'paid', 'open']),
-                                ('import_spreadsheet', '=', False),
-                                ('company_id', '=', self._company_id)]
-        if form['type'] == 'sale':
-            criteria.append(('type', 'in', ['out_refund', 'out_invoice']))
-        elif form['type'] == 'purchase':
-            criteria.append(('type', 'in', ['in_refund', 'in_invoice']))
-            
-        fr_ids = fr_obj.search(self.cr, self.uid, 
-                               criteria, order='date_invoice,nro_ctrl,number')
-        if len(fr_ids)>0:
-            res = fr_obj.browse(self.cr, self.uid, fr_ids)
-            self._invs_ids = fr_ids
-            self._data = res
-        else:
-            self._invs_ids = []
-            self._data = []
-        return res
-        
-    def _get_data_wh(self,form):
-#        data=[]
-#        d1=form['date_start']
-#        d2=form['date_end']
-#        fr_obj = self.pool.get('fiscal.reports.whs')
-#        fr_ids = fr_obj.search(self.cr,self.uid,
-#                                  [ ('ar_date_ret', '<=', d2), 
-#                                    ('ar_date_ret', '>=',d1),
-#                                    ('ar_date_document','<=',d1),
-#                                    ('ai_company', '=', self._company_id)], order='ar_date_ret')
-#        data = fr_obj.browse(self.cr,self.uid, fr_ids)
-
-
-        data=[]
-        d1=form['date_start']
-        d2=form['date_end']
-        fr_obj = self.pool.get('account.wh.iva')
-        fr_ids = fr_obj.search(self.cr,self.uid,
-                                  [ ('date_ret', '<=', d2), 
-                                    ('date_ret', '>=',d1),
-                                    ('date','<=',d1),
-                                    ('state', '=', 'done'),
-                                    ('wh_lines.invoice_id.type', 'in', ['out_invoice', 'out_refund']),
-                                    ('wh_lines.invoice_id.company_id.id', '=', self._company_id)], order='ar_date_ret')
-        data = fr_obj.browse(self.cr,self.uid, fr_ids)
-        return data
-        
-    def _get_rif(self, vat=''):
-        '''
-        Get R.I.F.
-        '''
-        if not vat:
-            return []
-        return vat[2:].replace(' ', '')
-
-    def _get_month(self, form):
-        '''
-        return year and month
-        '''
-        months=["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"]
-        res = ['',0]
-        res[0] = months[time.strptime(form['date_start'],"%Y-%m-%d")[1]-1]
-        res[1] = time.strptime(form['date_start'],"%Y-%m-%d")[0]
-        return res
-
-    def _get_ret(self, form, inv_id):
-        '''
-            Ensure that Withholding date is inside period specified on form.
-        '''
-        d1=form['date_start']
-        d2=form['date_end']
-        wil_obj = self.pool.get('account.wh.iva.line')
-        wil_ids= wil_obj.search(self.cr,self.uid,[('invoice_id', '=', inv_id)])
-        wil_brw = wil_obj.browse(self.cr, self.uid, wil_ids)
-
-        if form['type']=='purchase':
-            return wil_brw[0].retention_id.number
-            
-        if wil_brw:
-            if time.strptime(wil_brw[0].retention_id.date, '%Y-%m-%d') >= time.strptime(d1, '%Y-%m-%d') \
-            and time.strptime(wil_brw[0].retention_id.date, '%Y-%m-%d') <=  time.strptime(d2, '%Y-%m-%d'):
-                return wil_brw[0].retention_id.number
-            else:
-                return False
-        else:
-            return False
-
-    def _get_date_wh(self,form, l):
-        if l.ar_date_document> form['date_end']:
-            return False
-        return True
-
-    def _get_data_adjustment(self,form):
-
-        type_doc = 'sale'
-        if form['type']=='purchase':
-            type_doc = 'purchase'
-        fb_obj = self.pool.get('fiscal.book')
-        adjust_line_obj = self.pool.get('adjustment.book.line')
-        period_obj=self.pool.get('account.period')
-        data=[]
-        data_line=[]
-        period_ids = period_obj.search(self.cr,self.uid,[('date_start','<=',form['date_start']),('date_stop','>=',form['date_end']), ('company_id', '=', self._company_id)])
-        
-        if len(period_ids)>0:
-            fr_ids = fb_obj.search(self.cr,self.uid,[('period_id', 'in',period_ids),('type','=',type_doc)])
-            if len(fr_ids)>0:
-                adj_ids = adjust_line_obj.search(self.cr,self.uid,[('fb_id','=',fr_ids[0])],order='date_admin')
-                data = fb_obj.browse(self.cr,self.uid, fr_ids)
-                data_line = adjust_line_obj.browse(self.cr,self.uid, adj_ids)
-        return (data,data_line)
-
-    def _validation(self,form):
-        type_doc = 'sale'
-        if form['type']=='purchase':
-            type_doc = 'purchase'
-        period_obj=self.pool.get('account.period')
-        fb_obj = self.pool.get('fiscal.book')
-        period_ids = period_obj.search(self.cr,self.uid,[('date_start','<=',form['date_start']),('date_stop','>=',form['date_end']), ('company_id', '=', self._company_id)])
-        if len(period_ids)<=0:
-            return False
-        fr_ids = fb_obj.search(self.cr,self.uid,[('period_id','in',period_ids),('type','=',type_doc)])
-        if len(fr_ids)<=0:
-            return False
-        return True
-
-    def _get_amount_withheld(self, form, inv):
-        wil_obj = self.pool.get('account.wh.iva.line')
-        wil_ids = wil_obj.search(self.cr, self.uid, [('invoice_id', '=', inv.id)])
-        amount = 0.0
-        if wil_ids:
-            data = wil_obj.browse(self.cr, self.uid, wil_ids)[0]
-            if data.retention_id:
-                if data.retention_id.date_ret < form['date_end']:
-                    if inv.type in ['in_refund', 'out_refund']:
-                        amount = data.amount_tax_ret*(-1)
-                    else:
-                        amount = data.amount_tax_ret
-                
-#            get_date_wh(data['form'],l) 
-#                and (get_ret(data['form'], l.id) 
-#                    and (formatLang(((l.type in ['in_refund', 'out_refund']) 
-#                        and (self.get_amount_withheld(l.ar_line_id.id)*(-1)) 
-#                        or get_amount_withheld(l.ar_line_id.id)))) 
-#                    or '') 
-#                or ''
-        return amount
-
-    def _get_total_wh(self,form,actual=None):
-        total=0
-        for inv in self._data:
-            amount = self._get_amount_withheld(form, inv)
-            if amount:
-                total+= amount
-        return total
-
-    def _get_total_iva(self,form):
-        '''
-        Return Amount Total of each invoice at Withholding Vat
-        '''
-        total = 0.0
-        for i in self._data:
-            if i.type in ['out_refund']:
-                total += i.get_total*(-1.0)
-            else:
-                total += i.get_total
-        return total
-
-    def _get_amount_untaxed_tax(self, form, percent, nationality='', exempt=None):
-        '''
-        Return Amount Untaxed and Amount Tax, accorded percent of withholding vat
-        '''
-        amount_untaxed=0.0
-        amount_tax=0.0
-
-        for d in self._data:
-            for tax in d.tax_line:
-                if percent in tax.name:
-                    if exempt is not None:
-                        if d.partner_id.vat_subjected==exempt:
-                            amount_untaxed+= self._get_amount_untaxed_tax2(d.type,tax)[0]
-                            amount_tax+= self._get_amount_untaxed_tax2(d.type,tax)[1]
-                    else:
-                        if nationality == 'nacional' and not d.get_is_imported:
-                            amount_untaxed+= self._get_amount_untaxed_tax2(d.type,tax)[0]
-                            amount_tax+= self._get_amount_untaxed_tax2(d.type,tax)[1]
-                        elif nationality == 'internacional' and d.get_is_imported:
-                            amount_untaxed+= self._get_amount_untaxed_tax2(d.type,tax)[0]
-                            amount_tax+= self._get_amount_untaxed_tax2(d.type,tax)[1]
-                        elif nationality == 'all' or not nationality:
-                            amount_untaxed+= self._get_amount_untaxed_tax2(d.type,tax)[0]
-                            amount_tax+= self._get_amount_untaxed_tax2(d.type,tax)[1]
-        return (amount_untaxed, amount_tax)
-
-    def _get_wh_actual(self,form):
-        total=0
-        data=[]
-        book_type= self._get_book_type_wh(form)
-        fr_obj = self.pool.get('account.wh.iva')
-        
-#        fr_ids = fr_obj.search(self.cr,self.uid,
-#                               [('date_ret', '<=', form['date_end']),
-#                                ('date_ret', '>=', form['date_start']),
-#                                ('wh_lines.invoice_id.date_invoice','>=',form['date_start']),
-#                                ('wh_lines.invoice_id.date_invoice','<=',form['date_end']),
-#                                ('wh_lines.invoice_id.company_id.id', '=', self._company_id)])
-        fr_ids = fr_obj.search(self.cr,self.uid,
-                               [('date_ret', '<=', form['date_end']),
-                                ('date_ret', '>=', form['date_start']),
-                                ('wh_lines.invoice_id.id','in',self._invs_ids)])
-        data = fr_obj.browse(self.cr,self.uid, fr_ids)
-        for wh in data:
-            for wh_line in wh.wh_lines:
-                if wh_line.invoice_id.type in ['in_refund', 'out_refund']:
-                    total+= wh_line.amount_tax_ret * (-1)
-                else:
-                    total+= wh_line.amount_tax_ret
-        return total
-
-    def _get_id(self,form,idh,type=None):
-        x=1
-        ids =None
-        
-        if form['type']=='sale':
-            ids = self._get_data_wh(form)
-        if form['type']=='sale' and type:
-            x+=len(ids)
-        if type=='book':
-            ids = self._get_data(form)
-
-        for a in ids:
-            if a.id != idh:
-                x+=1
-            else:
-                return x
-    
-    def _get_tax_line(self,s):
-        name = s.name
-        cont = 0
-        if name.find('SDCF')>=0:
-            if cont==0:
-                return 0
-        else:
-            cont = cont + 1
-        return s.base_amount
-    
-    def _get_v_exent(self,l):
-        amount = 0.0
-        if not l:
-            return 0.0
-        for tax in l.tax_line:
-            name=tax.name
-            if name.find('EXENTO')>=0:
-                amount = tax.base+amount
-                if l.type in ['in_refund', 'out_refund']:
-                    amount = amount * (-1)
-        return (amount)
-
-    def _get_amount_untaxed_tax2(self,type,tax):
-        amount_untaxed=0.0
-        amount_tax=0.0
-        if type in ['in_refund', 'out_refund']:
-            amount_untaxed= tax.base * (-1)
-            amount_tax= tax.amount * (-1)
-        else:
-            amount_untaxed= tax.base
-            amount_tax= tax.amount
-        return [amount_untaxed,amount_tax]
-
-report_sxw.report_sxw(
-    'report.fiscal.book.sale',
-    'account.invoice',
-    'addons/l10n_ve_fiscal_book/report/sales_book.rml',
-    parser=sal_book,
-    header=False
-)      
-
-report_sxw.report_sxw(
-    'report.fiscal.book.purchase',
-    'account.invoice',
-    'addons/l10n_ve_fiscal_book/report/purchases_book.rml',
-    parser=sal_book,
-    header=False
-)      
-

=== modified file 'l10n_ve_fiscal_book/report/fiscal_book_parser.py'
--- l10n_ve_fiscal_book/report/fiscal_book_parser.py	2013-04-24 19:04:42 +0000
+++ l10n_ve_fiscal_book/report/fiscal_book_parser.py	2013-04-29 19:14:27 +0000
@@ -325,19 +325,19 @@
         #~ configuring:
         self._add_total_string()
 
-        print '\n-----------------------------'
-        print 'Number of columns', self._get_num_of_cols(),' + 1 at first'
-        print 'Table width', self._get_table_width()
-        print 'Colums widths'
-        for col_num, col_tag in enumerate(self._purchase_cols_list,  start=1):
-            print '  ', col_num, '\t', self._get_col_width(col_tag), '\t', self._cols[col_tag]['name']
-        print '-----------------------------\n'
+        #~ print '\n-----------------------------'
+        #~ print 'Number of columns', self._get_num_of_cols(),' + 1 at first'
+        #~ print 'Table width', self._get_table_width()
+        #~ print 'Colums widths'
+        #~ for col_num, col_tag in enumerate(self._purchase_cols_list,  start=1):
+            #~ print '  ', col_num, '\t', self._get_col_width(col_tag), '\t', self._cols[col_tag]['name']
+        #~ print '-----------------------------\n'
 
         self._set_macro_cols_width()
-        print 'importaciones', 'compras-internas', 'datos-factura-documento', \
-              '"', self._cols['datos-factura-documento']['width'], ', ', \
-              self._cols['importaciones']['width'], ', ', \
-              self._cols['compras-internas']['width'], '"'
+        #~ print 'importaciones', 'compras-internas', 'datos-factura-documento', \
+              #~ '"', self._cols['datos-factura-documento']['width'], ', ', \
+              #~ self._cols['importaciones']['width'], ', ', \
+              #~ self._cols['compras-internas']['width'], '"'
 
     def _get_month(self, fb):
         """

=== modified file 'l10n_ve_imex/__init__.py'
--- l10n_ve_imex/__init__.py	2013-04-04 21:42:17 +0000
+++ l10n_ve_imex/__init__.py	2013-04-29 19:14:27 +0000
@@ -1,1 +1,28 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Vauxoo C.A. (http://openerp.com.ve/)
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by:  Juan Marzquez (Tecvemar, c.a.) <[e-mail]>
+#               Katherine Zaoral               <[e-mail]>
+#    Planified by:
+#                Juan Marquez                  <[e-mail]>
+#                Humberto Arocha               <[e-mail]>
+#    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.
+#
+#    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.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###############################################################################
+
 import model

=== modified file 'l10n_ve_imex/__openerp__.py'
--- l10n_ve_imex/__openerp__.py	2013-04-15 20:24:04 +0000
+++ l10n_ve_imex/__openerp__.py	2013-04-29 19:14:27 +0000
@@ -1,34 +1,59 @@
 # -*- encoding: utf-8 -*-
-##############################################################################
-#    Company: Tecvemar, c.a.
-#    Author: Juan Marquez
-#    Creation Date: 13/09/2012
-#    Version: 0.0.0.1
-#
-#    Description: This modules handles the l10n ve import declaration
-#                 SENIAT Official FORM: Forma 99086  
-#
-##############################################################################
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Vauxoo C.A. (http://openerp.com.ve/)
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by:  Juan Marzquez (Tecvemar, c.a.) <[e-mail]>
+#               Katherine Zaoral               <[e-mail]>
+#    Planified by:
+#                Juan Marquez                  <[e-mail]>
+#                Humberto Arocha               <[e-mail]>
+#    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.
+#
+#    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.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###############################################################################
+
 {
-    "name" : "L10n ve - Import/Export",
-    "version" : "0.1",
-    "depends" : ["base", "account", "decimal_precision", "l10n_ve_fiscal_requirements"],
-    "author" : "Tecvemar - Juan Márquez",
-    "description" : "Import/Export SENIAT Forma 99086",
-    "website" : "https://code.launchpad.net/~jmarquez/openerp-tecvemar/l10n_ve_imex",
-    "category" : "Custom",
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : [
-                    'security/ir.model.access.csv',
-                    'security/ir_rule.xml',    
-                    'view/seniat_form_86_config.xml',         
-                    'view/seniat_form_86.xml',         
-                    'view/seniat_form_86_menus.xml',         
-                    'view/invoice.xml',         
-                    'workflow/seniat_form_86.xml',
-                    ],
+    "name": "Imex",
+    "version": "0.1",
+    "depends": ["base",
+                "account",
+                "decimal_precision",
+                "l10n_ve_fiscal_requirements"
+                ],
+    "author": "Tecvemar/Vauxoo",
+    "description": """
+Imex
+===============================================================
+This modules handles the openerp venezuela localization import
+and export transactions. It specify the customs form model for
+import declaration SENIAT Official FORM (Forma 99086).
+""",
+    "website": "http://vauxoo.com",
+    "category": "Generic Modules/Accounting",
+    "init_xml": [],
+    "demo_xml": [],
+    "update_xml": [
+        'security/ir.model.access.csv',
+        'security/ir_rule.xml',
+        'view/customs_form_config.xml',
+        'view/customs_form.xml',
+        'view/customs_form_menus.xml',
+        'view/invoice.xml',
+        'workflow/customs_form.xml',
+    ],
     "active": False,
     "installable": True,
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_imex/i18n/es_VE.po'
--- l10n_ve_imex/i18n/es_VE.po	2013-04-11 14:28:42 +0000
+++ l10n_ve_imex/i18n/es_VE.po	2013-04-29 19:14:27 +0000
@@ -16,12 +16,12 @@
 "Plural-Forms: \n"
 
 #. module: l10n_ve_imex
-#: field:form.86.custom.taxes,account_id:0
+#: field:customs.duty,account_id:0
 msgid "Account to pay"
 msgstr "Cuentas por Pagar"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:157
+#: code:addons/l10n_ve_imex/model/customs_form.py:157
 #, python-format
 msgid "SENIAT - Forma 86  # %s):\n"
 "	Reference: %s\n"
@@ -31,179 +31,179 @@
 "	Agente: %s"
 
 #. module: l10n_ve_imex
-#: help:account.invoice,num_import_form_id:0
+#: help:account.invoice,customs_form_id:0
 msgid "The related form 86 for this import invoice (only draft and open forms)"
 msgstr "La planilla de importacion (F86) asociada a esta factura (solo planillas en borador y abiertas)"
 
 #. module: l10n_ve_imex
-#: sql_constraint:form.86.config:0
+#: sql_constraint:customs.form.config:0
 msgid "The company must be unique!"
 msgstr "La Compañía debe ser unica!"
 
 #. module: l10n_ve_imex
-#: help:form.86.custom.taxes,account_id:0
+#: help:customs.duty,account_id:0
 msgid "This account will be used for expenses related to taxes"
 msgstr "Cuenta para los gastos asociados a el impuesto"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:145
+#: code:addons/l10n_ve_imex/model/customs_form.py:145
 #, python-format
 msgid "Please set a valid configuration"
 msgstr "Debe establecer una configuración válida"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86.lines,tax_code:0
+#: field:customs.form.line,tax_code:0
 msgid "Tax"
 msgstr "Impuesto"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,custom_id:0
+#: field:customs.form,customs_facility_id:0
 msgid "Custom"
 msgstr "Aduana"
 
 #. module: l10n_ve_imex
-#: sql_constraint:form.86.custom.taxes:0
+#: sql_constraint:customs.duty:0
 msgid "The code must be unique! (for this comany)"
 msgstr "El código debe ser único! (para la companía)"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,state:0
+#: field:customs.form,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: l10n_ve_imex
-#: view:seniat.form.86:0
+#: view:customs.form:0
 msgid "Other"
 msgstr "Otros"
 
 #. module: l10n_ve_imex
-#: selection:seniat.form.86,state:0
+#: selection:customs.form,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,move_id:0
+#: field:customs.form,move_id:0
 msgid "Account move"
 msgstr "Asiento contable"
 
 #. module: l10n_ve_imex
-#: model:ir.actions.act_window,name:l10n_ve_imex.action_form_86_custom_taxes
-#: model:ir.ui.menu,name:l10n_ve_imex.menu_action_form_86_custom_taxes
+#: model:ir.actions.act_window,name:l10n_ve_imex.action_customs_duty
+#: model:ir.ui.menu,name:l10n_ve_imex.menu_action_customs_duty
 msgid "Tax codes"
 msgstr "Códigos de impuestos"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:122
+#: code:addons/l10n_ve_imex/model/customs_form.py:122
 #, python-format
 msgid "No account found, please check customs taxes settings (%s)"
 msgstr "No se encontró la cuenta, verifique la configuracion de: Códigos de impuestos (%s)"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,date_liq:0
+#: field:customs.form,date_liq:0
 msgid "liq. date"
 msgstr "Fecha liq."
 
 #. module: l10n_ve_imex
-#: sql_constraint:form.86.custom.taxes:0
+#: sql_constraint:customs.duty:0
 msgid "The sequence must be unique! (for this comany)"
 msgstr "La secuencia debe ser única! (para la companía)"
 
 #. module: l10n_ve_imex
-#: field:account.invoice,num_import_form_id:0
+#: field:account.invoice,customs_form_id:0
 msgid "Import file number"
 msgstr "Exp. importación"
 
 #. module: l10n_ve_imex
-#: help:seniat.form.86,move_id:0
+#: help:customs.form,move_id:0
 msgid "The move of this entry line."
 msgstr "El asiento de esta entrada."
 
 #. module: l10n_ve_imex
-#: view:seniat.form.86:0
-#: field:seniat.form.86,amount_total:0
+#: view:customs.form:0
+#: field:customs.form,amount_total:0
 msgid "Amount total"
 msgstr "Amount total"
 
 #. module: l10n_ve_imex
-#: sql_constraint:form.86.customs:0
+#: sql_constraint:customs.facility:0
 msgid "The code must be unique!"
 msgstr "El código debe ser único!"
 
 #. module: l10n_ve_imex
-#: model:ir.model,name:l10n_ve_imex.model_form_86_customs
-msgid "form.86.customs"
-msgstr "form.86.customs"
+#: model:ir.model,name:l10n_ve_imex.model_customs_facility
+msgid "customs.facility"
+msgstr "customs.facility"
 
 #. module: l10n_ve_imex
-#: sql_constraint:seniat.form.86.lines:0
+#: sql_constraint:customs.form.line:0
 msgid "The code must be unique! (for this form)"
 msgstr "El código debe ser único! (para la companía)"
 
 #. module: l10n_ve_imex
-#: field:form.86.custom.taxes,ref:0
+#: field:customs.duty,ref:0
 msgid "Ref"
 msgstr "Ref"
 
 #. module: l10n_ve_imex
-#: field:form.86.config,company_id:0
-#: field:form.86.custom.taxes,company_id:0
-#: field:seniat.form.86,company_id:0
+#: field:customs.form.config,company_id:0
+#: field:customs.duty,company_id:0
+#: field:customs.form,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:226
+#: code:addons/l10n_ve_imex/model/customs_form.py:226
 #, python-format
 msgid "Can't cancel a import while account move state <> \"Draft\""
 msgstr "Imposible cancelar el registro cuando el estado del asiento <> \"Borrador\""
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,broker_id:0
+#: field:customs.form,broker_id:0
 msgid "Broker"
 msgstr "Agente"
 
 #. module: l10n_ve_imex
-#: model:ir.actions.act_window,name:l10n_ve_imex.action_form_86_customs
-#: model:ir.ui.menu,name:l10n_ve_imex.menu_action_form_86_customs
+#: model:ir.actions.act_window,name:l10n_ve_imex.action_customs_facility
+#: model:ir.ui.menu,name:l10n_ve_imex.menu_action_customs_facility
 msgid "Customs"
 msgstr "Aduanas"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,date:0
+#: field:customs.form,date:0
 msgid "Date"
 msgstr "Fecha"
 
 #. module: l10n_ve_imex
-#: sql_constraint:seniat.form.86:0
+#: sql_constraint:customs.form:0
 msgid "The form # must be unique!"
 msgstr "El número de planilla debe ser único!"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86.lines,line_id:0
+#: field:customs.form.line,customs_form_id:0
 msgid "Line"
 msgstr "Línea"
 
 #. module: l10n_ve_imex
-#: model:ir.actions.act_window,name:l10n_ve_imex.action_form_86_config
-#: model:ir.ui.menu,name:l10n_ve_imex.menu_action_form_86_config
+#: model:ir.actions.act_window,name:l10n_ve_imex.action_customs_form_config
+#: model:ir.ui.menu,name:l10n_ve_imex.menu_action_customs_form_config
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: l10n_ve_imex
-#: view:seniat.form.86:0
-#: field:seniat.form.86,narration:0
+#: view:customs.form:0
+#: field:customs.form,narration:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:211
+#: code:addons/l10n_ve_imex/model/customs_form.py:211
 #, python-format
 msgid "You must indicate a amount"
 msgstr "Debe indicar el monto"
 
 #. module: l10n_ve_imex
-#: field:form.86.custom.taxes,name:0
-#: field:form.86.customs,name:0
+#: field:customs.duty,name:0
+#: field:customs.facility,name:0
 msgid "Name"
 msgstr "Nombre"
 
@@ -213,127 +213,127 @@
 msgstr "El documento indicado ya está registrado para esta empresa"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:223
+#: code:addons/l10n_ve_imex/model/customs_form.py:223
 #, python-format
 msgid "Multiple operations not allowed"
 msgstr "Operaciones múltiples no permitidas"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,line_ids:0
+#: field:customs.form,cfl_ids:0
 msgid "Lines"
 msgstr "Lineas"
 
 #. module: l10n_ve_imex
-#: view:seniat.form.86:0
+#: view:customs.form:0
 msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:122
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:145
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:223
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:226
+#: code:addons/l10n_ve_imex/model/customs_form.py:122
+#: code:addons/l10n_ve_imex/model/customs_form.py:145
+#: code:addons/l10n_ve_imex/model/customs_form.py:223
+#: code:addons/l10n_ve_imex/model/customs_form.py:226
 #, python-format
 msgid "Error!"
 msgstr "Error!"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86.lines,amount:0
+#: field:customs.form.line,amount:0
 msgid "Amount"
 msgstr "Monto"
 
 #. module: l10n_ve_imex
-#: model:ir.ui.menu,name:l10n_ve_imex.menu_form_86_config_group
+#: model:ir.ui.menu,name:l10n_ve_imex.menu_customs_form_config_group
 msgid "Import/Export - SENIAT - Form 99086"
 msgstr "Importar/Exportar - SENIAT - Forma 99086"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,date_reg:0
+#: field:customs.form,date_reg:0
 msgid "Reg. date"
 msgstr "Fecha Reg."
 
 #. module: l10n_ve_imex
-#: selection:seniat.form.86,state:0
+#: selection:customs.form,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: l10n_ve_imex
-#: model:ir.model,name:l10n_ve_imex.model_seniat_form_86
-msgid "seniat.form.86"
-msgstr "seniat.form.86"
-
-#. module: l10n_ve_imex
-#: model:ir.model,name:l10n_ve_imex.model_form_86_custom_taxes
-msgid "form.86.custom.taxes"
-msgstr "form.86.custom.taxes"
-
-#. module: l10n_ve_imex
-#: view:seniat.form.86:0
+#: model:ir.model,name:l10n_ve_imex.model_customs_form
+msgid "customs.form"
+msgstr "customs.form"
+
+#. module: l10n_ve_imex
+#: model:ir.model,name:l10n_ve_imex.model_customs_duty
+msgid "customs.duty"
+msgstr "customs.duty"
+
+#. module: l10n_ve_imex
+#: view:customs.form:0
 msgid "General info"
 msgstr "Información general"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:213
+#: code:addons/l10n_ve_imex/model/customs_form.py:213
 #, python-format
 msgid "You must indicate a liquidation date "
 msgstr "Debe indicar la fecha de liquidación"
 
 #. module: l10n_ve_imex
-#: field:form.86.custom.taxes,code:0
-#: field:form.86.customs,code:0
+#: field:customs.duty,code:0
+#: field:customs.facility,code:0
 msgid "Code"
 msgstr "Código"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,ref_liq:0
+#: field:customs.form,ref_liq:0
 msgid "Liq. number"
 msgstr "Nro. Liq."
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,ref:0
+#: field:customs.form,ref:0
 msgid "Reference"
 msgstr "Referencia"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,invoice_ids:0
+#: field:customs.form,invoice_ids:0
 msgid "Related invoices"
 msgstr "Facturas relacionadas"
 
 #. module: l10n_ve_imex
-#: model:ir.actions.act_window,name:l10n_ve_imex.action_seniat_form_86
-#: model:ir.ui.menu,name:l10n_ve_imex.menu_action_seniat_form_86
+#: model:ir.actions.act_window,name:l10n_ve_imex.action_customs_form
+#: model:ir.ui.menu,name:l10n_ve_imex.menu_action_customs_form
 msgid "SENIAT - Form 99086"
 msgstr "SENIAT - Forma 99086"
 
 #. module: l10n_ve_imex
-#: field:form.86.custom.taxes,sequence:0
+#: field:customs.duty,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,ref_reg:0
+#: field:customs.form,ref_reg:0
 msgid "Reg. number"
 msgstr "Nro. Reg."
 
 #. module: l10n_ve_imex
-#: model:ir.model,name:l10n_ve_imex.model_form_86_config
-msgid "form.86.config"
-msgstr "form.86.config"
+#: model:ir.model,name:l10n_ve_imex.model_customs_form_config
+msgid "customs.form.config"
+msgstr "customs.form.config"
 
 #. module: l10n_ve_imex
-#: view:seniat.form.86:0
+#: view:customs.form:0
 msgid "Reset to draft"
 msgstr "Cambiar a borrador"
 
 #. module: l10n_ve_imex
-#: view:seniat.form.86:0
-#: selection:seniat.form.86,state:0
+#: view:customs.form:0
+#: selection:customs.form,state:0
 msgid "Done"
 msgstr "Listo"
 
 #. module: l10n_ve_imex
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:211
-#: code:addons/l10n_ve_imex/model/seniat_form_86.py:213
+#: code:addons/l10n_ve_imex/model/customs_form.py:211
+#: code:addons/l10n_ve_imex/model/customs_form.py:213
 #, python-format
 msgid "Warning!"
 msgstr "Atención!"
@@ -344,38 +344,38 @@
 msgstr "Factura"
 
 #. module: l10n_ve_imex
-#: field:seniat.form.86,name:0
+#: field:customs.form,name:0
 msgid "Form #"
 msgstr "Nº Planilla"
 
 #. module: l10n_ve_imex
-#: view:seniat.form.86:0
+#: view:customs.form:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: l10n_ve_imex
-#: field:form.86.custom.taxes,partner_id:0
+#: field:customs.duty,partner_id:0
 msgid "Partner"
 msgstr "Proveedor"
 
 #. module: l10n_ve_imex
-#: model:ir.model,name:l10n_ve_imex.model_seniat_form_86_lines
-msgid "seniat.form.86.lines"
-msgstr "seniat.form.86.lines"
+#: model:ir.model,name:l10n_ve_imex.model_customs_form_line
+msgid "customs.form.line"
+msgstr "customs.form.line"
 
 #. module: l10n_ve_imex
-#: view:seniat.form.86:0
-#: selection:seniat.form.86,state:0
+#: view:customs.form:0
+#: selection:customs.form,state:0
 msgid "Open"
 msgstr "Abierto"
 
 #. module: l10n_ve_imex
-#: field:form.86.config,journal_id:0
+#: field:customs.form.config,journal_id:0
 msgid "Journal"
 msgstr "Diario"
 
 #. module: l10n_ve_imex
-#: field:form.86.custom.taxes,acc_tax_id:0
+#: field:customs.duty,tax_id:0
 msgid "Account Tax "
 msgstr "Impuesto"
 

=== modified file 'l10n_ve_imex/model/__init__.py'
--- l10n_ve_imex/model/__init__.py	2013-04-10 18:22:00 +0000
+++ l10n_ve_imex/model/__init__.py	2013-04-29 19:14:27 +0000
@@ -1,3 +1,30 @@
-import seniat_form_86_config
-import seniat_form_86
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Vauxoo C.A. (http://openerp.com.ve/)
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by:  Juan Marzquez (Tecvemar, c.a.) <[e-mail]>
+#               Katherine Zaoral               <[e-mail]>
+#    Planified by:
+#                Juan Marquez                  <[e-mail]>
+#                Humberto Arocha               <[e-mail]>
+#    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.
+#
+#    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.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###############################################################################
+
+import customs_form_config
+import customs_form
 import invoice

=== renamed file 'l10n_ve_imex/model/seniat_form_86.py' => 'l10n_ve_imex/model/customs_form.py'
--- l10n_ve_imex/model/seniat_form_86.py	2013-04-18 00:52:00 +0000
+++ l10n_ve_imex/model/customs_form.py	2013-04-29 19:14:27 +0000
@@ -1,399 +1,352 @@
 # -*- encoding: utf-8 -*-
-##############################################################################
-#    Company: Tecvemar, c.a.
-#    Author: Juan V. Márquez L.
-#    Creation Date: 04/04/2012
-#    Version: 0.0.0.0
-#
-#    Description:
-#
-#
-##############################################################################
-#~ from datetime import datetime
-from openerp.osv import fields,osv
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Vauxoo C.A. (http://openerp.com.ve/)
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by:  Juan Marzquez (Tecvemar, c.a.) <[e-mail]>
+#               Katherine Zaoral               <[e-mail]>
+#    Planified by:
+#                Juan Marquez                  <[e-mail]>
+#                Humberto Arocha               <[e-mail]>
+#    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.
+#
+#    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.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###############################################################################
+from openerp.osv import fields, osv
 from openerp.tools.translate import _
 import openerp.pooler
 import openerp.addons.decimal_precision as dp
 import time
-#~ import netsvc
-
-
-##---------------------------------------------------------------------------------------- seniat_form_86
-
-class seniat_form_86(osv.osv):
-
-    _name = 'seniat.form.86'
-
+
+
+class customs_form(osv.osv):
+
+    _name = 'customs.form'
     _description = ''
 
-    ##------------------------------------------------------------------------------------
-    
-    def name_get(self,cr, uid, ids, context):
+    def name_get(self, cr, uid, ids, context):
         if not len(ids):
             return []
         res = []
         so_brw = self.browse(cr, uid, ids, context)
         for item in so_brw:
-            res.append((item.id, 'F86 # %s - %s'%(item.name,item.ref or '')))
+            res.append((item.id,
+                        'F86 # %s - %s' % (item.name, item.ref or '')))
         return res
 
-    ##------------------------------------------------------------------------------------ _internal methods
-    
     def _amount_total(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for f86 in self.browse(cr, uid, ids, context=context):
             amount_total = 0.0
-            for line in f86.line_ids:
+            for line in f86.cfl_ids:
                 amount_total += line.amount
             res[f86.id] = amount_total
         return res
-        
-        
-    def _default_line_ids(self, cr, uid, context=None):
-        """ 
-        Gets default line_ids from form_86_custom_taxes
-        """
-        obj_ct = self.pool.get('form.86.custom.taxes')    
+
+    def _default_cfl_ids(self, cr, uid, context=None):
+        """ Gets default cfl_ids from customs_duty. """
+        obj_ct = self.pool.get('customs.duty')
         ct_ids = obj_ct.search(cr, uid, [], context=context)
         res = []
         for id in ct_ids:
-            vat = obj_ct.browse(cr,uid,id,context=context)
-            res.append({'tax_code':id,'amount':0.0,'vat_detail':vat.vat_detail})
+            vat = obj_ct.browse(cr, uid, id, context=context)
+            res.append({'tax_code': id,
+                        'amount': 0.0, 'vat_detail': vat.vat_detail})
         return res
-        
-        
-    def _gen_account_move_line(self, company_id, account_id, partner_id, name, debit, credit):
-        return (0,0,{
-                'auto' : True,
+
+    def _gen_account_move_line(self, company_id, account_id, partner_id, name,
+                               debit, credit):
+        return (0, 0, {
+                'auto': True,
                 'company_id': company_id,
                 'account_id': account_id,
-                'partner_id':partner_id,
+                'partner_id': partner_id,
                 'name': name[:64],
                 'debit': debit,
                 'credit': credit,
-                'reconcile':False,
-                })        
-
-
-    ##------------------------------------------------------------------------------------ function fields
+                'reconcile': False,
+                })
 
     _columns = {
-        'name': fields.char('Form #', size=16, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'ref': fields.char('Reference', size=64, required=False, readonly=True, states={'draft':[('readonly',False)]}),
-        'date': fields.date('Date', required=True, readonly=True, states={'draft':[('readonly',False)]}, select=True),
-        'company_id': fields.many2one('res.company','Company',required=True, readonly=True, ondelete='restrict'),
-        'broker_id': fields.many2one('res.partner', 'Broker', change_default=True, readonly=True, states={'draft':[('readonly',False)]}, ondelete='restrict'),
-        'ref_reg': fields.char('Reg. number', size=16, required=False, readonly=True, states={'draft':[('readonly',False)]}),
-        'date_reg': fields.date('Reg. date', required=False, readonly=True, states={'draft':[('readonly',False)]}, select=True),
-        'ref_liq': fields.char('Liq. number', size=16, required=False, readonly=True, states={'draft':[('readonly',False)]}),
-        'date_liq': fields.date('liq. date', required=True, readonly=True, states={'draft':[('readonly',False)]}, select=True),
-        'custom_id': fields.many2one('form.86.customs', 'Custom', change_default=True, readonly=True, states={'draft':[('readonly',False)]}, ondelete='restrict'),
-        'line_ids':fields.one2many('seniat.form.86.lines','line_id','Tax lines',readonly=True, states={'draft':[('readonly',False)]}),
-        'amount_total':fields.function(_amount_total, method=True, type = 'float', string='Amount total', store=False),
-        'move_id': fields.many2one('account.move', 'Account move', ondelete='restrict', select=True, readonly=True, help="The move of this entry line."),
-        'narration':fields.text('Notes', readonly=False),
-        'invoice_ids':fields.one2many('account.invoice','num_import_form_id','Related invoices',readonly=True), 
-        'state': fields.selection([('draft', 'Draft'),('open', 'Open'),('done', 'Done'),('cancel', 'Cancelled')], string='State', required=True, readonly=True),
-        }
+        'name': fields.char('Form #', size=16, required=True, readonly=True,
+                            states={'draft': [('readonly', False)]}),
+        'ref': fields.char('Reference', size=64, required=False, readonly=True,
+                           states={'draft': [('readonly', False)]}),
+        'date': fields.date('Date', required=True, readonly=True,
+                            states={'draft': [('readonly', False)]},
+                            select=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True,
+                                      readonly=True, ondelete='restrict'),
+        'broker_id': fields.many2one('res.partner', 'Broker',
+                                     change_default=True, readonly=True,
+                                     states={'draft': [('readonly', False)]},
+                                     ondelete='restrict'),
+        'ref_reg': fields.char('Reg. number', size=16, required=False,
+                               readonly=True,
+                               states={'draft': [('readonly', False)]}),
+        'date_reg': fields.date('Reg. date', required=False, readonly=True,
+                                states={'draft': [('readonly', False)]},
+                                select=True),
+        'ref_liq': fields.char('Liq. number', size=16, required=False,
+                               readonly=True,
+                               states={'draft': [('readonly', False)]}),
+        'date_liq': fields.date('liq. date', required=True, readonly=True,
+                                states={'draft': [('readonly', False)]},
+                                select=True),
+        'customs_facility_id': fields.many2one(
+            'customs.facility', 'Customs Facility', change_default=True,
+            readonly=True, states={'draft': [('readonly', False)]},
+            ondelete='restrict'),
+        'cfl_ids': fields.one2many('customs.form.line', 'customs_form_id',
+                                    'Tax lines', readonly=True,
+                                    states={'draft': [('readonly', False)]}),
+        'amount_total': fields.function(_amount_total, method=True,
+                                        type='float', string='Amount total',
+                                        store=False),
+        'move_id': fields.many2one('account.move', 'Account move',
+                                   ondelete='restrict', select=True,
+                                   readonly=True,
+                                   help="The move of this entry line."),
+        'narration': fields.text('Notes', readonly=False),
+        'invoice_ids': fields.one2many('account.invoice', 'customs_form_id',
+                                       'Related invoices', readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'),
+                                   ('done', 'Done'), ('cancel', 'Cancelled')],
+                                  string='State', required=True,
+                                  readonly=True),
+    }
 
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'company_id':lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr,uid,'seniat.form.86',context=c),
-        'line_ids': _default_line_ids,
-        'state': lambda *a: 'draft', 
-        }
-
-    _sql_constraints = [  
-        ('name_uniq', 'UNIQUE(name)', 'The form # must be unique!'),      
-        ]
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ public methods
-    
+        'company_id': lambda self, cr, uid, c:
+        self.pool.get('res.company')._company_default_get(cr, uid,
+                                                          'customs.form',
+                                                          context=c),
+        'cfl_ids': _default_cfl_ids,
+        'state': lambda *a: 'draft',
+    }
+
+    _sql_constraints = [
+        ('name_uniq', 'UNIQUE(name)', 'The form # must be unique!'),
+    ]
+
     def create_account_move_lines(self, cr, uid, f86, context=None):
-        """
-        Creates the account.move.lines from line_ids detail except for taxes with "vat_detail", 
-        in this case create debits from line_ids.line_vat_ids and get debit account from account_tax model
+        """ Creates the account.move.lines from cfl_ids detail except for
+        taxes with "vat_detail", in this case create debits from
+        cfl_ids.imex_tax_line and get debit account from account_tax model
         """
         lines = []
         company_id = context.get('f86_company_id')
         f86_cfg = context.get('f86_config')
 
         #~ expenses
-        for line in f86.line_ids:
-
+        for line in f86.cfl_ids:
             debits = []
             if line.tax_code.vat_detail:
-                for vat in line.line_vat_ids:
-                    debits.append({'account_id':vat.acc_tax_id.account_collected_id.id,'amount':vat.tax_amount,'tax_info':' (%s)'%vat.acc_tax_id.name})
+                for vat in line.imex_tax_line:
+                    debits.append(
+                        {'account_id': vat.tax_id.account_collected_id.id,
+                         'amount': vat.amount,
+                         'tax_info': ' (%s)' % vat.tax_id.name})
             else:
-                debits.append({'account_id':line.tax_code.account_id.id,'amount':line.amount,'tax_info':''})
-                
-            credit_account_id = line.tax_code.partner_id.property_account_payable.id
+                debits.append({'account_id': line.tax_code.account_id.id,
+                               'amount': line.amount, 'tax_info': ''})
+
+            credit_account_id = \
+                line.tax_code.partner_id.property_account_payable.id
 
             for debit in debits:
                 if not debit['account_id'] or not credit_account_id:
-                    raise osv.except_osv(_('Error!'),_('No account found, please check customs taxes settings (%s)')%line.tax_code.name)
-                lines.append(self._gen_account_move_line(company_id, debit['account_id'], line.tax_code.partner_id.id, '[%s] %s - %s%s'%(line.tax_code.code,line.tax_code.ref,line.tax_code.name,debit['tax_info']) , debit['amount'],0.0))
-            lines.append(self._gen_account_move_line(company_id, credit_account_id, line.tax_code.partner_id.id, 'F86 #%s - %s'%(f86.name,line.tax_code.name) ,0.0,line.amount))
-        
-        lines.reverse() ## set real order ;-)
+                    raise osv.except_osv(
+                        _('Error!'), _('No account found, please check \
+                        customs taxes settings (%s)') % line.tax_code.name)
+                lines.append(
+                    self._gen_account_move_line(
+                        company_id, debit['account_id'],
+                        line.tax_code.partner_id.id, '[%s] %s - %s%s'
+                        % (line.tax_code.code, line.tax_code.ref,
+                           line.tax_code.name, debit['tax_info']),
+                        debit['amount'], 0.0)
+                )
+            lines.append(self._gen_account_move_line(
+                company_id, credit_account_id, line.tax_code.partner_id.id,
+                'F86 #%s - %s' % (f86.name, line.tax_code.name), 0.0,
+                line.amount))
+
+        lines.reverse()  # set real order ;-)
         return lines
-                
-        
+
     def create_account_move(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        so_brw = self.browse(cr,uid,ids,context={})
+        so_brw = self.browse(cr, uid, ids, context={})
         for f86 in so_brw:
-            if f86.move_id: #~ The move is already done, nothing to do
+            if f86.move_id:  # ~ The move is already done, nothing to do
                 return []
         obj_move = self.pool.get('account.move')
-        obj_cfg = self.pool.get('form.86.config')
-        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
-        company = self.pool.get('res.company').browse(cr,uid,company_id,context=context)
+        obj_cfg = self.pool.get('customs.form.config')
+        company_id = self.pool.get('res.users').browse(
+            cr, uid, uid, context=context).company_id.id
+        company = self.pool.get('res.company').browse(cr, uid, company_id,
+                                                      context=context)
         cfg_id = obj_cfg.search(cr, uid, [('company_id', '=', company_id)])
         if cfg_id:
-            f86_cfg = obj_cfg.browse(cr,uid,cfg_id[0],context=context)
+            f86_cfg = obj_cfg.browse(cr, uid, cfg_id[0], context=context)
         else:
-            raise osv.except_osv(_('Error!'),_('Please set a valid configuration'))
+            raise osv.except_osv(_('Error!'),
+                                 _('Please set a valid configuration'))
         date = time.strftime('%Y-%m-%d')
-        context.update({'f86_company_id':company_id,'f86_config':f86_cfg})
+        context.update({'f86_company_id': company_id, 'f86_config': f86_cfg})
         move_ids = []
         for f86 in so_brw:
             move = {
-                    'ref':'F86 #%s'%f86.name,
-                    'journal_id':f86_cfg.journal_id.id,
-                    'date':f86.date_liq,
-                    'company_id':company_id,
-                    'state':'draft',
-                    'to_check':False,
-                    'narration':_('Form 86 # %s\n\tReference: %s\n\tBroker: %s\n\nRelated invoices:')%(f86.name,f86.ref or '',f86.broker_id.name or ''),
-                    }
+                'ref': 'F86 #%s' % f86.name,
+                'journal_id': f86_cfg.journal_id.id,
+                'date': f86.date_liq,
+                'company_id': company_id,
+                'state': 'draft',
+                'to_check': False,
+                'narration': _('Form 86 # %s\n\tReference: %s\n\tBroker: \
+                %s\n\nRelated invoices:')
+                % (f86.name, f86.ref or '', f86.broker_id.name or ''),
+            }
             for inv in f86.invoice_ids:
-                str_inv = _('\n\tSupplier: %-40s Reference: %s')%(inv.partner_id.name,inv.reference)
-                move['narration'] = '%s%s'%(move['narration'],str_inv)            
+                str_inv = _('\n\tSupplier: %-40s Reference: %s') % \
+                (inv.partner_id.name, inv.reference)
+                move['narration'] = '%s%s' % (move['narration'], str_inv)
             lines = self.create_account_move_lines(cr, uid, f86, context)
             if lines:
-                move.update({'line_id':lines})
+                move.update({'line_id': lines})
                 move_id = obj_move.create(cr, uid, move, context)
                 obj_move.post(cr, uid, [move_id], context=context)
                 if move_id:
                     move_ids.append(move_id)
-                    self.write(cr, uid, f86.id, {'move_id':move_id},context)
-        return move_ids        
-
-    ##------------------------------------------------------------------------------------ buttons (object)
-    
-    ##------------------------------------------------------------------------------------ on_change...
-
-    ##------------------------------------------------------------------------------------ create write unlink
-
-    ##------------------------------------------------------------------------------------ Workflow
-    
+                    self.write(cr, uid, f86.id, {'move_id': move_id}, context)
+        return move_ids
+
     def button_draft(self, cr, uid, ids, context=None):
-        vals={'state':'draft'}
-        return self.write(cr,uid,ids,vals,context)
-
+        vals = {'state': 'draft'}
+        return self.write(cr, uid, ids, vals, context)
 
     def button_open(self, cr, uid, ids, context=None):
         self.create_account_move(cr, uid, ids, context)
-        vals={'state':'open'}
-        return self.write(cr,uid,ids,vals,context)
-
+        vals = {'state': 'open'}
+        return self.write(cr, uid, ids, vals, context)
 
     def button_done(self, cr, uid, ids, context=None):
-        vals={'state':'done'}
-        return self.write(cr,uid,ids,vals,context)
-
+        vals = {'state': 'done'}
+        return self.write(cr, uid, ids, vals, context)
 
     def button_cancel(self, cr, uid, ids, context=None):
-        f86 = self.browse(cr,uid,ids[0],context=context)
+        f86 = self.browse(cr, uid, ids[0], context=context)
         f86_move_id = f86.move_id.id if f86 and f86.move_id else False
-        vals={'state':'cancel','move_id':0}
-        res = self.write(cr,uid,ids,vals,context)
+        vals = {'state': 'cancel', 'move_id': 0}
+        res = self.write(cr, uid, ids, vals, context)
         if f86_move_id:
-            self.pool.get('account.move').unlink(cr,uid,[f86_move_id],context)
-        return self.write(cr,uid,ids,vals,context)
-
+            self.pool.get('account.move').unlink(cr, uid, [f86_move_id],
+                                                 context)
+        return self.write(cr, uid, ids, vals, context)
 
     def test_draft(self, cr, uid, ids, *args):
         return True
 
-
     def test_open(self, cr, uid, ids, *args):
-        so_brw = self.browse(cr,uid,ids,context={})
+        so_brw = self.browse(cr, uid, ids, context={})
         for f86 in so_brw:
             if f86.amount_total <= 0:
-                raise osv.except_osv(_('Warning!'),_('You must indicate a amount'))
-            f86_invoices = [i.id for i in f86.invoice_ids] # a lis of related invoices      
-            vat_invoices = [] # for tax (vat) related invoices
-            for line in f86.line_ids:    
+                raise osv.except_osv(_('Warning!'),
+                                     _('You must indicate a amount'))
+            f86_invoices = [i.id for i in f86.invoice_ids]  # related inv list
+            vat_invoices = []  # for tax (vat) related invoices
+            for line in f86.cfl_ids:
                 if line.vat_detail:
                     vat_total = line.amount
-                    for vat in line.line_vat_ids:
-                        vat_total -= vat.tax_amount
+                    for vat in line.imex_tax_line:
+                        vat_total -= vat.amount
                         if vat.invoice_id.id not in vat_invoices:
                             vat_invoices.append(vat.invoice_id.id)
                     if abs(vat_total) > 0.001:
-                        raise osv.except_osv(_('Warning!'),_('The vat detail data does not correspond with vat amount in line: %s')%line.tax_code.name) 
+                        raise osv.except_osv(
+                            _('Warning!'),
+                            _('The vat detail data does not correspond with \
+                            vat amount in line: %s') % line.tax_code.name)
             #~ Validate related invoices vs invoice_ids (if vat)
             if set(f86_invoices) != set(vat_invoices):
-                #~ No todas las facturas relacionadas con la planilla de importación se corresponden con las facturas relacionadas al IVA 
-                raise osv.except_osv(_('Warning!'),_('Not all invoices related to the import spreadsheet correspond to invoices relating to VAT')) 
+                #~ No todas las facturas relacionadas con la planilla de
+                #~ importación se corresponden con las facturas relacionadas
+                #~ al IVA
+                raise osv.except_osv(
+                    _('Warning!'),
+                    _('Not all invoices related to the import spreadsheet \
+                    correspond to invoices relating to VAT'))
         return True
 
-
     def test_done(self, cr, uid, ids, *args):
         return True
 
-
     def test_cancel(self, cr, uid, ids, *args):
         if len(ids) != 1:
-            raise osv.except_osv(_('Error!'),_('Multiple operations not allowed'))
-        for f86 in self.browse(cr,uid,ids,context=None):
+            raise osv.except_osv(
+                _('Error!'),
+                _('Multiple operations not allowed'))
+        for f86 in self.browse(cr, uid, ids, context=None):
             #~ Validate account_move.state != draft
             if f86.move_id and f86.move_id.state != 'draft':
-                raise osv.except_osv(_('Error!'),_('Can\'t cancel a import while account move state <> "Draft" (%s)')%f86.move_id.name)
-            #~ Validate state of related invoices (only state = draft)    
+                raise osv.except_osv(
+                    _('Error!'),
+                    _('Can\'t cancel a import while account move state <> \
+                    "Draft" (%s)') % f86.move_id.name)
+            #~ Validate state of related invoices (only state = draft)
             for inv in f86.invoice_ids:
                 if inv.state != 'draft':
-                    raise osv.except_osv(_('Error!'),_('Can\'t cancel a import while invoice state <> "Draft" ([%s] %s, %s)')%inv.name,inv.partner_id.name,inv.reference)
+                    raise osv.except_osv(
+                        _('Error!'),
+                        _('Can\'t cancel a import while invoice state <> \
+                        "Draft" ([%s] %s, %s)') % inv.name,
+                        inv.partner_id.name, inv.reference)
         return True
 
 
-seniat_form_86()
-
-
-
-##---------------------------------------------------------------------------------------- seniat_form_86
-
-class seniat_form_86_lines(osv.osv):
-
-    _name = 'seniat.form.86.lines'
-
+class customs_form_line(osv.osv):
+
+    _name = 'customs.form.line'
     _description = ''
-
-    ##------------------------------------------------------------------------------------
-    
-    ##------------------------------------------------------------------------------------ _internal methods
-    
-    ##------------------------------------------------------------------------------------ function fields
-    
     _rec_name = 'tax_code'
 
     _columns = {
-        'line_id':fields.many2one('seniat.form.86', 'Line', required=True, ondelete='cascade'),
-        'tax_code': fields.many2one('form.86.custom.taxes', 'Tax', ondelete='restrict',required=True, readonly=False), 
-        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account'),required=True),
-        'line_vat_ids':fields.one2many('seniat.form_86.lines.vat','line_vat_id','Vat lines',attrs="{'readonly':[('vat_detail','=',True)],'required':[('vat_detail','=',True)]}"), ## 
-        'vat_detail':fields.related('tax_code','vat_detail', type='boolean', string='Tax detail',store=False, readonly=True)
-        }
-
-    _defaults = {
-        }
-
-    _sql_constraints = [        
-        ('code_uniq', 'UNIQUE(line_id,tax_code)', 'The code must be unique! (for this form)'),
-        ]
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ public methods
-
-    ##------------------------------------------------------------------------------------ buttons (object)
-    
-    ##------------------------------------------------------------------------------------ on_change...
-
-    ##------------------------------------------------------------------------------------ create write unlink
-    
-    ##------------------------------------------------------------------------------------ Workflow
-
-seniat_form_86_lines()
-
-
-##---------------------------------------------------------------------------------------- seniat_form_86_lines_vat
-
-class seniat_form_86_lines_vat(osv.osv):
-
-    _name = 'seniat.form_86.lines.vat'
-
-    _description = ''
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ _internal methods
-
-    ##------------------------------------------------------------------------------------ function fields
-    
-    _rec_name = 'reference'
-
-    _columns = {
-        'line_vat_id':fields.many2one('seniat.form.86.lines', 'Vat line', required=True, ondelete='cascade'),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='restrict', select=True, required=True),
-        'partner_id':fields.related('invoice_id','partner_id', type='many2one', relation='res.partner', string='Supplier',store=False, readonly=True),  
-        'reference':fields.related('invoice_id','reference', type='char', string='Invoice ref',size=64,store=False, readonly=True), 
-        'acc_tax_id':fields.many2one('account.tax', 'Account Tax ', required=True, ondelete='restrict', domain=[('type_tax_use','=','purchase')], help=""), 
-        'base_amount': fields.float('Base amount', digits_compute=dp.get_precision('Account'),required=True),
-        'tax_amount': fields.float('Tax amount', digits_compute=dp.get_precision('Account'),required=True),
-        }
-
-    _defaults = {
-        }
-
-    _sql_constraints = [        
-        ('base_amount_gt_zero', 'CHECK (base_amount>0)', 'The base amount must be > 0!'),
-        ('tax_amount_zero', 'CHECK (tax_amount>=0)', 'The tax amount must be >= 0!'),
-        ]
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ public methods
-
-    ##------------------------------------------------------------------------------------ buttons (object)
-
-    ##------------------------------------------------------------------------------------ on_change...
-    
-    """
-    def on_change_line_vat_id(self, cr, uid, ids, line_vat_id):
-        '''
-        Create a domain to filter invoice_id for invoices listed in seniat_form_86.invoice_ids only
-        http://help.openerp.com/question/11180/how-to-create-a-domain-for-field-in-parentparent-model/
-        '''
-        res = {}
-        if line_vat_id:
-            line_obj = self.pool.get('seniat.form.86.lines')
-            invoices = [i.id for i in line_obj.browse(cr, uid, line_vat_id).line_id.invoice_ids]
-            res = {'domain': {'invoice_id': [('id','in',invoices)]}}
-        return res
-    """
-    
-    def on_change_amount(self, cr, uid, ids, acc_tax_id, base_amount, tax_amount):
-        """
-        To autocompute base or tax, only for percent based taxes
-        """
-        res = {}
-        if acc_tax_id:
-            obj_vat = self.pool.get('account.tax')
-            vat = obj_vat.browse(cr,uid,acc_tax_id)
-            if vat.type == 'percent':
-                if base_amount == 0 and tax_amount > 0: 
-                    base_amount = round(tax_amount / vat.amount,2)
-                res = {'value':{'base_amount':base_amount}}
-        return res
-        
-        
-    def on_change_invoice_id(self, cr, uid, ids, invoice_id):
-        res = {}
-        if invoice_id:
-            obj_inv = self.pool.get('account.invoice')
-            inv = obj_inv.browse(cr,uid,invoice_id)
-            res = {'value':{'partner_id':inv.partner_id.id,'reference':inv.reference}}
-        return res
-
-    ##------------------------------------------------------------------------------------ create write unlink
-
-    ##------------------------------------------------------------------------------------ Workflow
-
-seniat_form_86_lines_vat()
+        'customs_form_id': fields.many2one('customs.form', 'Customs',
+                                           required=True, ondelete='cascade'),
+        'tax_code': fields.many2one('customs.duty', 'Tax',
+                                    ondelete='restrict', required=True,
+                                    readonly=False),
+        'amount': fields.float('Amount', required=True,
+                               digits_compute=dp.get_precision('Account')),
+        'imex_tax_line': fields.one2many(
+            'account.invoice.tax', 'cfl_id', 'Vat lines',
+            attrs="{'readonly':[('vat_detail','=',True)], \
+            'required':[('vat_detail','=',True)]}"),
+        'vat_detail': fields.related('tax_code', 'vat_detail', type='boolean',
+                                     string='Tax detail', store=False,
+                                     readonly=True)
+    }
+
+    _defaults = {
+    }
+
+    _sql_constraints = [
+        ('code_uniq', 'UNIQUE(customs_form_id,tax_code)',
+         'The code must be unique! (for this form)'),
+    ]
+

=== renamed file 'l10n_ve_imex/model/seniat_form_86_config.py' => 'l10n_ve_imex/model/customs_form_config.py'
--- l10n_ve_imex/model/seniat_form_86_config.py	2013-04-25 20:18:13 +0000
+++ l10n_ve_imex/model/customs_form_config.py	2013-04-29 19:14:27 +0000
@@ -1,197 +1,154 @@
 # -*- encoding: utf-8 -*-
-##############################################################################
-#    Company: Tecvemar, c.a.
-#    Author: Juan V. Márquez L.
-#    Creation Date: 10/04/2012
-#    Version: 0.0.0.0
-#
-#    Description:
-#
-#
-##############################################################################
-#~ from datetime import datetime
-from openerp.osv import fields,osv
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Vauxoo C.A. (http://openerp.com.ve/)
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by:  Juan Marzquez (Tecvemar, c.a.) <[e-mail]>
+#               Katherine Zaoral               <[e-mail]>
+#    Planified by:
+#                Juan Marquez                  <[e-mail]>
+#                Humberto Arocha               <[e-mail]>
+#    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.
+#
+#    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.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###############################################################################
+
+from openerp.osv import fields, osv
 from openerp.tools.translate import _
 import openerp.pooler
-#~ import openerp.addons.decimal_precision as dp 
-#~ import time
-#~ import netsvc
-
-
-##---------------------------------------------------------------------------------------- seniat_form_86_config
-
-class form_86_config(osv.osv):
+
+
+class customs_form_config(osv.osv):
     '''
     Stores common config parameters for form_86 data
     '''
-    
-    _name = 'form.86.config'
 
+    _name = 'customs.form.config'
     _description = ''
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ _internal methods
-
-    ##------------------------------------------------------------------------------------ function fields
-
-    _columns = {
-        'company_id':fields.many2one('res.company','Company', required=True, readonly=True, ondelete='restrict'),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete='restrict'),  
-        }
-        
     _rec_name = "company_id"
-        
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True,
+                                      readonly=True, ondelete='restrict'),
+        'journal_id': fields.many2one('account.journal', 'Journal',
+                                      required=True, ondelete='restrict'),
+    }
 
     _defaults = {
-        'company_id':lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr,uid,'form.86.config',context=c),
-        }
+        'company_id': lambda self, cr, uid, c:
+        self.pool.get('res.company')._company_default_get(
+            cr, uid, 'customs.form.config', context=c),
+    }
 
     _sql_constraints = [
-        ('company_id_uniq', 'UNIQUE(company_id)', 'The company must be unique!'),
-        ]
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ public methods
-
-    ##------------------------------------------------------------------------------------ buttons (object)
-
-    ##------------------------------------------------------------------------------------ on_change...
-
-    ##------------------------------------------------------------------------------------ create write unlink
-
-    ##------------------------------------------------------------------------------------ Workflow
-
-form_86_config()
-
-
-
-##---------------------------------------------------------------------------------------- form_86_customs
-
-class form_86_customs(osv.osv):
+        ('company_id_uniq', 'UNIQUE(company_id)',
+         'The company must be unique!'),
+    ]
+
+
+class customs_facility(osv.osv):
     '''
     Stores a list with Venezuela's customs
     '''
 
-    _name = 'form.86.customs'
-
+    _name = 'customs.facility'
     _description = ''
 
-    ##------------------------------------------------------------------------------------
-    
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
-        so_brw = self.browse(cr,uid,ids,context={})
+        so_brw = self.browse(cr, uid, ids, context={})
         res = []
         for item in so_brw:
-            res.append((item.id, '[%s] %s'%(item.code, item.name)))
+            res.append((item.id, '[%s] %s' % (item.code, item.name)))
         return res
-        
-        
-    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+
+    def name_search(self, cr, user, name, args=None, operator='ilike',
+                    context=None, limit=100):
         #~ Based on account.account.name_search...
-        res =  super(form_86_customs, self).name_search(cr, user, name, args, operator, context, limit)    
+        res = super(customs_facility, self).name_search(
+            cr, user, name, args, operator, context, limit)
         if not res and name:
-            ids = self.search(cr, user, [('code', '=like', name+"%")]+args, limit=limit)
+            ids = self.search(cr, user, [(
+                'code', '=like', name+"%")]+args, limit=limit)
             if ids:
                 res = self.name_get(cr, user, ids, context=context)
         return res
 
-    ##------------------------------------------------------------------------------------ _internal methods
-
-    ##------------------------------------------------------------------------------------ function fields
-
     _columns = {
-        'code': fields.char('Code', size=16, required=True, readonly=False),   
+        'code': fields.char('Code', size=16, required=True, readonly=False),
         'name': fields.char('Name', size=64, required=True, readonly=False),
-        }
+    }
 
     _defaults = {
-        }
+    }
 
-    _sql_constraints = [     
+    _sql_constraints = [
         ('code_uniq', 'UNIQUE(code)', 'The code must be unique!'),
-        ]
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ public methods
-
-    ##------------------------------------------------------------------------------------ buttons (object)
-
-    ##------------------------------------------------------------------------------------ on_change...
-
-    ##------------------------------------------------------------------------------------ create write unlink
-
-    ##------------------------------------------------------------------------------------ Workflow
-
-form_86_customs()
-
-
-
-##---------------------------------------------------------------------------------------- form_86_custom_taxes
-
-class form_86_custom_taxes(osv.osv):
+    ]
+
+
+class customs_duty(osv.osv):
     '''
     A list of the concepts for taxes in form_86
     '''
 
-    _name = 'form.86.custom.taxes'
-
+    _name = 'customs.duty'
     _description = ''
-    
     _order = 'sequence'
 
-
-    ##------------------------------------------------------------------------------------
-   
-    def name_get(self,cr, uid, ids, context):
+    def name_get(self, cr, uid, ids, context):
         if not len(ids):
             return []
         res = []
         so_brw = self.browse(cr, uid, ids, context)
         for item in so_brw:
-            res.append((item.id, '[%s] %s - %s'%(item.code,item.ref,item.name)))
+            res.append((item.id, '[%s] %s - %s' % (
+                item.code, item.ref, item.name)))
         return res
-        
-    ##------------------------------------------------------------------------------------ _internal methods
-
-    ##------------------------------------------------------------------------------------ function fields
 
     _columns = {
-        'code': fields.char('Code', size=16, required=True, readonly=False),   
+        'code': fields.char('Code', size=16, required=True, readonly=False),
         'name': fields.char('Name', size=64, required=True, readonly=False),
-        'ref': fields.char('Ref', size=16, required=False, readonly=False),   
-        'sequence': fields.integer('Sequence'), 
-        'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, ondelete='restrict'),
-        'account_id':fields.many2one('account.account', 'Account to pay', domain="[('type','!=','view')]", ondelete='restrict',help="This account will be used for expenses related to taxes"), 
-        'vat_detail':fields.boolean('Tax detail',help="Set true if this is vat related tax"),
-        'company_id': fields.many2one('res.company','Company',required=True, readonly=True, ondelete='restrict'),
-        }
+        'ref': fields.char('Ref', size=16, required=False, readonly=False),
+        'sequence': fields.integer('Sequence'),
+        'partner_id': fields.many2one('res.partner', 'Partner',
+                                      change_default=True,
+                                      ondelete='restrict'),
+        'account_id': fields.many2one('account.account', 'Account to pay',
+                                      domain="[('type','!=','view')]",
+                                      ondelete='restrict',
+                                      help="This account will be used for \
+                                      expenses related to taxes"),
+        'vat_detail': fields.boolean('Tax detail', help="Set true if this is \
+        vat related tax"),
+        'company_id': fields.many2one('res.company', 'Company', required=True,
+                                      readonly=True, ondelete='restrict'),
+    }
 
     _defaults = {
-        'company_id':lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr,uid,'form.86.config',context=c),
+        'company_id': lambda self, cr, uid, c:
+        self.pool.get('res.company')._company_default_get(
+            cr, uid, 'customs.form.config', context=c),
         'vat_detail': False,
-        }
-
-    _sql_constraints = [     
-        ('code_uniq', 'UNIQUE(code,company_id)', 'The code must be unique! (for this comany)'),
-        ('sequence_uniq', 'UNIQUE(sequence,company_id)', 'The sequence must be unique! (for this comany)'),
-        ]
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ public methods
-
-    ##------------------------------------------------------------------------------------ buttons (object)
-
-    ##------------------------------------------------------------------------------------ on_change...
-
-    ##------------------------------------------------------------------------------------ create write unlink
-
-    ##------------------------------------------------------------------------------------ Workflow
-
-form_86_custom_taxes()
+    }
+
+    _sql_constraints = [
+        ('code_uniq', 'UNIQUE(code,company_id)',
+         'The code must be unique! (for this comany)'),
+        ('sequence_uniq', 'UNIQUE(sequence,company_id)',
+         'The sequence must be unique! (for this comany)'),
+    ]
 

=== modified file 'l10n_ve_imex/model/invoice.py'
--- l10n_ve_imex/model/invoice.py	2013-04-16 20:42:20 +0000
+++ l10n_ve_imex/model/invoice.py	2013-04-29 19:14:27 +0000
@@ -1,63 +1,134 @@
 # -*- encoding: utf-8 -*-
-##############################################################################
-#    Company: Tecvemar, c.a.
-#    Author: Juan V. Márquez L.
-#    Creation Date: 10/04/2012
-#    Version: 0.0.0.0
-#
-#    Description:
-#
-#
-##############################################################################
-
-from openerp.osv import osv
-from openerp.osv import fields
-
-
-##---------------------------------------------------------------------------------------- inherited_invoice
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Vauxoo C.A. (http://openerp.com.ve/)
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by:  Juan Marzquez (Tecvemar, c.a.) <[e-mail]>
+#               Katherine Zaoral               <[e-mail]>
+#    Planified by:
+#                Juan Marquez                  <[e-mail]>
+#                Humberto Arocha               <[e-mail]>
+#    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.
+#
+#    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.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###############################################################################
+
+from openerp.osv import osv, fields
+import openerp.addons.decimal_precision as dp
+
 
 class inherited_invoice(osv.osv):
 
     _inherit = "account.invoice"
 
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ _internal methods
-
-    ##------------------------------------------------------------------------------------ function fields
-
     _columns = {
-        'num_import_form_id':fields.many2one('seniat.form.86', 'Import file number', change_default=True, required=False, readonly=True, 
-                             states={'draft':[('readonly',False)]}, ondelete='restrict', 
-                             domain = [('state','=',('draft'))], help="The related form 86 for this import invoice (only draft)"), 
-        }
-
-    ##------------------------------------------------------------------------------------
-
-    ##------------------------------------------------------------------------------------ public methods
-
-    ##------------------------------------------------------------------------------------ buttons (object)
-
-    ##------------------------------------------------------------------------------------ on_change...
-    
-    def on_change_num_import_form_id(self, cr, uid, ids, num_import_form_id):
+        'customs_form_id': fields.many2one(
+            'customs.form', 'Import file number', change_default=True,
+            required=False, readonly=True,
+            states={'draft': [('readonly', False)]}, ondelete='restrict',
+            domain=[('state', '=', ('draft'))],
+            help="The related form 86 for this import invoice (only draft)"),
+        'imex_tax_line': fields.one2many(
+            'account.invoice.tax', 'imex_inv_id', 'Vat lines',
+            attrs="{'readonly':[('vat_detail','=',True)], \
+            'required':[('vat_detail','=',True)]}"),
+    }
+
+    def on_change_customs_form_id(self, cr, uid, ids, customs_form_id):
         res = {}
-        if num_import_form_id:
-            imp = self.pool.get('seniat.form.86').browse(cr,uid,num_import_form_id,context=None)
-            res = {'value':{'num_import_form':imp.name,'import_invo':imp.date_liq}}
+        if customs_form_id:
+            imp = self.pool.get('customs.form').browse(cr, uid,
+                                                         customs_form_id,
+                                                         context=None)
+            res = {'value': {'num_import_form': imp.name,
+                             'import_invo': imp.date_liq}}
         return res
 
-    ##------------------------------------------------------------------------------------ create write unlink
-
-    ##------------------------------------------------------------------------------------ Workflow
-    
     def test_open(self, cr, uid, ids, *args):
-        so_brw = self.browse(cr,uid,ids,context={})
+        so_brw = self.browse(cr, uid, ids, context={})
         for item in so_brw:
-            if item.num_import_form_id and item.num_import_form_id.state in ('draft','cancel'): 
-                raise osv.except_osv(_('Error!'),_('Can\'t validate a invoice while the form 86 state\'s is cancel or draft (%s).\nPlease validate the form 86 first.')%item.num_import_form_id.name)
+            if item.customs_form_id and \
+                    item.customs_form_id.state in ('draft', 'cancel'):
+                raise osv.except_osv(_('Error!'), _(
+                    'Can\'t validate a invoice while the form 86 state\'s is \
+                    cancel or draft (%s).\nPlease validate the form 86 first.')
+                    % item.customs_form_id.name)
         return super(account_invoice, self).test_open(cr, uid, ids, args)
 
-inherited_invoice()
-
+
+class inheried_account_invoice_tax(osv.osv):
+
+    _inherit = 'account.invoice.tax'
+
+    _columns = {
+        'cfl_id': fields.many2one('customs.form.line',
+                                                'Vat line',
+                                                 ondelete='cascade'),
+        'imex_inv_id': fields.many2one('account.invoice', 'Imex Invoice',
+                                       ondelete='cascade', select=True),
+        'partner_id': fields.related('imex_inv_id', 'partner_id',
+                                     type='many2one', relation='res.partner',
+                                     string='Supplier'),
+        'reference': fields.related('imex_inv_id', 'reference', type='char',
+                                    string='Invoice ref', size=64, store=False,
+                                    readonly=True),
+    }
+
+    _defaults = {
+    }
+
+    #~ _sql_constraints = [
+        #~ ('base_gt_zero', 'CHECK (base>0)',
+         #~ 'The base amount must be > 0!'),
+        #~ ('amount_zero', 'CHECK (amount>=0)',
+         #~ 'The tax amount must be >= 0!'),
+    #~ ]
+
+    #~ def on_change_cfl_id(self, cr, uid, ids,
+        #~                                cfl_id):
+        #~ '''
+        #~ Create a domain to filter invoice_id for invoices listed in
+        #~ customs_form.invoice_ids only
+        #~ http://help.openerp.com/question/11180/how-to-create-a-domain-for-
+        #~ field-in-parentparent-model/
+        #~ '''
+        #~ res = {}
+        #~ if cfl_id:
+            #~ line_obj = self.pool.get('customs.form.line')
+            #~ invoices = [i.id for i in line_obj.browse(
+                #~ cr, uid, cfl_id).customs_form_id.invoice_ids]
+            #~ res = {'domain': {'invoice_id': [('id','in',invoices)]}}
+        #~ return res
+
+    def on_change_amount(self, cr, uid, ids, tax_id, base, amount):
+        """ To autocompute base or tax, only for percent based taxes. """
+        res = {}
+        if tax_id:
+            obj_vat = self.pool.get('account.tax')
+            vat = obj_vat.browse(cr, uid, tax_id)
+            if vat.type == 'percent':
+                if base == 0 and amount > 0:
+                    base = round(amount / vat.amount, 2)
+                res = {'value': {'base': base}}
+        return res
+
+    def on_change_invoice_id(self, cr, uid, ids, invoice_id):
+        res = {}
+        if invoice_id:
+            obj_inv = self.pool.get('account.invoice')
+            inv = obj_inv.browse(cr, uid, invoice_id)
+            res = {'value': {'partner_id': inv.partner_id.id,
+                             'reference': inv.reference}}
+        return res

=== modified file 'l10n_ve_imex/security/ir.model.access.csv'
--- l10n_ve_imex/security/ir.model.access.csv	2013-04-11 21:42:15 +0000
+++ l10n_ve_imex/security/ir.model.access.csv	2013-04-29 19:14:27 +0000
@@ -1,13 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"form_86_config_user","form.86.config.user","model_form_86_config","account.group_account_user",1,0,0,0
-"form_86_config_manager","form.86.config.manager","model_form_86_config","account.group_account_manager",1,1,1,1
-"form_86_customs_user","form.86.customs.user","model_form_86_customs","account.group_account_user",1,0,0,0
-"form_86_customs_manager","form.86.customs.manager","model_form_86_customs","account.group_account_manager",1,1,1,1
-"form_86_custom_taxes_user","form.86.custom.taxes.user","model_form_86_custom_taxes","account.group_account_user",1,0,0,0
-"form_86_custom_taxes_manager","form.86.custom.taxes.manager","model_form_86_custom_taxes","account.group_account_manager",1,1,1,1
-"seniat_form_86_user","seniat.form.86.user","model_seniat_form_86","account.group_account_user",1,1,1,0
-"seniat_form_86_manager","seniat.form.86.manager","model_seniat_form_86","account.group_account_manager",1,1,1,1
-"seniat_form_86_lines_user","seniat.form.86.lines.user","model_seniat_form_86_lines","account.group_account_user",1,1,1,0
-"seniat_form_86_lines_manager","seniat.form.86.lines.manager","model_seniat_form_86_lines","account.group_account_manager",1,1,1,1
-"seniat_form_86_lines_vat_user","seniat.form.86.lines.vat.user","model_seniat_form_86_lines_vat","account.group_account_user",1,1,1,0
-"seniat_form_86_lines_vat_manager","seniat.form.86.lines.vat.manager","model_seniat_form_86_lines_vat","account.group_account_manager",1,1,1,1
+"customs_form_config_user","customs.form.config.user","model_customs_form_config","account.group_account_user",1,0,0,0
+"customs_form_config_manager","customs.form.config.manager","model_customs_form_config","account.group_account_manager",1,1,1,1
+"customs_facility_user","customs.facility.user","model_customs_facility","account.group_account_user",1,0,0,0
+"customs_facility_manager","customs.facility.manager","model_customs_facility","account.group_account_manager",1,1,1,1
+"customs_duty_user","customs.duty.user","model_customs_duty","account.group_account_user",1,0,0,0
+"customs_duty_manager","customs.duty.manager","model_customs_duty","account.group_account_manager",1,1,1,1
+"customs_form_user","customs.form.user","model_customs_form","account.group_account_user",1,1,1,0
+"customs_form_manager","customs.form.manager","model_customs_form","account.group_account_manager",1,1,1,1
+"customs_form_line_user","customs.form.line.user","model_customs_form_line","account.group_account_user",1,1,1,0
+"customs_form_line_manager","customs.form.line.manager","model_customs_form_line","account.group_account_manager",1,1,1,1

=== modified file 'l10n_ve_imex/security/ir_rule.xml'
--- l10n_ve_imex/security/ir_rule.xml	2013-04-09 19:08:41 +0000
+++ l10n_ve_imex/security/ir_rule.xml	2013-04-29 19:14:27 +0000
@@ -2,16 +2,16 @@
 <openerp>
     <data>
         
-        <record model="ir.rule" id="form_86_config_comp_rule">
-            <field name="name">Form 86 config company rule</field>
-            <field name="model_id" ref="model_form_86_config"/>
+        <record model="ir.rule" id="customs_form_config_comp_rule">
+            <field name="name">Customs Form Config Company Rule</field>
+            <field name="model_id" ref="model_customs_form_config"/>
             <field name="global" eval="True"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
 
-        <record model="ir.rule" id="form_86_custom_taxes_comp_rule">
-            <field name="name">Form 86 customs tax company rule</field>
-            <field name="model_id" ref="model_form_86_custom_taxes"/>
+        <record model="ir.rule" id="customs_duty_comp_rule">
+            <field name="name">Customs Form Duty Company Rule</field>
+            <field name="model_id" ref="model_customs_duty"/>
             <field name="global" eval="True"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>

=== renamed file 'l10n_ve_imex/view/seniat_form_86.xml' => 'l10n_ve_imex/view/customs_form.xml'
--- l10n_ve_imex/view/seniat_form_86.xml	2013-04-25 20:18:13 +0000
+++ l10n_ve_imex/view/customs_form.xml	2013-04-29 19:14:27 +0000
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
-<!--
-seniat_form_86    
--->
 
-        <record id="view_seniat_form_86_form" model="ir.ui.view">
-            <field name="name">seniat.form.86.form</field>
-            <field name="model">seniat.form.86</field>
+        <record id="view_customs_form_form" model="ir.ui.view">
+            <field name="name">customs.form.form</field>
+            <field name="model">customs.form</field>
             <field name="arch" type="xml">
                 <form string="Seniat" version='7.0'>
 					<header>
@@ -28,8 +24,8 @@
                                 <field name="ref_liq"/>
                                 <field name="date_liq"/>
                             </group>
-                            <field name="custom_id" colspan="4"/>
-                            <field name="line_ids" colspan="4" nolabel="1">
+                            <field name="customs_facility_id" colspan="4"/>
+                            <field name="cfl_ids" colspan="4" nolabel="1">
                                 <tree string="Tax lines">
                                     <field name="tax_code"/>
                                     <field name="amount" sum="Amount total"/>
@@ -40,28 +36,28 @@
                                         <field name="amount"/>
                                     </group>
                                     <field name="vat_detail" invisible="1"/>
-                                    <field name="line_vat_ids" colspan="4" nolabel="1" attrs="{'invisible':[('vat_detail','!=',True)]}">
+                                    <field name="imex_tax_line" colspan="4" nolabel="1" required="1" attrs="{'invisible':[('vat_detail','!=',True)]}">
                                         <tree string="Vat tax detail" editable="bottom">
 <!--
-                                            <field name="line_vat_id" invisible="1" on_change="on_change_line_vat_id(line_vat_id)"/>
+                                            <field name="cfl_id" invisible="1" on_change="on_change_cfl_id(cfl_id)"/>
 -->
                                             <field name="invoice_id" on_change="on_change_invoice_id(invoice_id)"/>
                                             <field name="partner_id"/>
                                             <field name="reference"/>
-                                            <field name="acc_tax_id" widget="selection"/>
-                                            <field name="base_amount" on_change="on_change_amount(acc_tax_id, base_amount, tax_amount)"/>
-                                            <field name="tax_amount" on_change="on_change_amount(acc_tax_id, base_amount, tax_amount)" sum="Tax amount total"/>
+                                            <field name="tax_id" domain="[('type_tax_use', '=', 'purchase')]" widget="selection"/>
+                                            <field name="base" on_change="on_change_amount(tax_id, base, amount)"/>
+                                            <field name="amount" on_change="on_change_amount(tax_id, base, amount)" sum="Tax amount total"/>
                                         </tree>
                                         <form>
 <!--
-                                            <field name="line_vat_id" invisible="1" on_change="on_change_line_vat_id(line_vat_id)"/>
+                                            <field name="cfl_id" invisible="1" on_change="on_change_cfl_id(cfl_id)"/>
 -->
                                             <field name="invoice_id" on_change="on_change_invoice_id(invoice_id)"/>
                                             <field name="partner_id"/>
                                             <field name="reference"/>
-                                            <field name="acc_tax_id" widget="selection"/>
-                                            <field name="base_amount" on_change="on_change_amount(acc_tax_id, base_amount, tax_amount)"/>
-                                            <field name="tax_amount" on_change="on_change_amount(acc_tax_id, base_amount, tax_amount)"/>
+                                            <field name="tax_id" domain="[('type_tax_use', '=', 'purchase')]" widget="selection"/>
+                                            <field name="base" on_change="on_change_amount(tax_id, base, amount)"/>
+                                            <field name="amount" on_change="on_change_amount(tax_id, base, amount)"/>
                                         </form>
                                     </field>    
                                 </form>
@@ -87,10 +83,9 @@
             </field>
         </record>
 
-
-        <record id="view_seniat_form_86_tree" model="ir.ui.view" >
-            <field name="name">seniat.form.86.tree</field>
-            <field name="model">seniat.form.86</field>
+        <record id="view_customs_form_tree" model="ir.ui.view" >
+            <field name="name">customs.form.tree</field>
+            <field name="model">customs.form</field>
             <field name="arch" type="xml">
                 <tree string="SENIAT" colors="red:state in ('draft');gray:state in ('cancel');darkgreen:state in ('open')">
                     <field name="name"/>
@@ -98,7 +93,7 @@
                     <field name="broker_id"/>
                     <field name="ref_liq"/>
                     <field name="date_liq"/>
-                    <field name="custom_id"/>
+                    <field name="customs_facility_id"/>
                     <field name="amount_total"/>
                     <field name="state" invisible="1"/>
                 </tree>

=== renamed file 'l10n_ve_imex/view/seniat_form_86_config.xml' => 'l10n_ve_imex/view/customs_form_config.xml'
--- l10n_ve_imex/view/seniat_form_86_config.xml	2013-04-25 20:18:13 +0000
+++ l10n_ve_imex/view/customs_form_config.xml	2013-04-29 19:14:27 +0000
@@ -3,14 +3,14 @@
     <data>
     
 <!--
-form_86_config    
+customs_form_config    
 -->
 
-        <record id="view_form_86_config_form" model="ir.ui.view">
-            <field name="name">form.86.config.form</field>
-            <field name="model">form.86.config</field>
+        <record id="view_customs_form_config_form" model="ir.ui.view">
+            <field name="name">customs.form.config.form</field>
+            <field name="model">customs.form.config</field>
             <field name="arch" type="xml">
-                <form string="Form 86 Config" version='7.0'>
+                <form string="Customs Form Config" version='7.0'>
 					<header>
 <!--
 						<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"draft":"blue","open":"green","done":"red"}' />
@@ -25,11 +25,11 @@
 		</record>
 
 
-        <record id="view_form_86_config_tree" model="ir.ui.view">
-            <field name="name">form.86.config.tree</field>
-            <field name="model">form.86.config</field>
+        <record id="view_customs_form_config_tree" model="ir.ui.view">
+            <field name="name">customs.form.config.tree</field>
+            <field name="model">customs.form.config</field>
             <field name="arch" type="xml">
-                <tree string="Form 86 Config">
+                <tree string="Customs Form Config">
                     <field name="company_id"/>
                     <field name="journal_id"/>
                 </tree>
@@ -38,12 +38,12 @@
 
 
 <!--
-form_86_customs    
+customs_facility    
 -->
 
-        <record id="view_form_86_customs_form" model="ir.ui.view">
-            <field name="name">form.86.customs.form</field>
-            <field name="model">form.86.customs</field>
+        <record id="view_customs_facility_form" model="ir.ui.view">
+            <field name="name">customs.facility.form</field>
+            <field name="model">customs.facility</field>
             <field name="arch" type="xml">
                 <form string="Customs" version='7.0'>
 					<header>
@@ -60,9 +60,9 @@
 		</record>
 
 
-        <record id="view_form_86_customs_tree" model="ir.ui.view">
-            <field name="name">form.86.customs.tree</field>
-            <field name="model">form.86.customs</field>
+        <record id="view_customs_facility_tree" model="ir.ui.view">
+            <field name="name">customs.facility.tree</field>
+            <field name="model">customs.facility</field>
             <field name="arch" type="xml">
                 <tree string="Customs">
                     <field name="code"/>
@@ -73,12 +73,12 @@
 
 
 <!--
-form_86_customs_tax_codes    
+customs_facility_tax_codes    
 -->
 
-        <record id="view_form_86_custom_taxes_form" model="ir.ui.view">
-            <field name="name">form.86.custom.taxes.form</field>
-            <field name="model">form.86.custom.taxes</field>
+        <record id="view_customs_duty_form" model="ir.ui.view">
+            <field name="name">customs.duty.form</field>
+            <field name="model">customs.duty</field>
             <field name="arch" type="xml">
                 <form string="Custom Taxes">
                     <field name="code"/>
@@ -94,9 +94,9 @@
 		</record>
 
 
-        <record id="view_form_86_custom_taxes_tree" model="ir.ui.view">
-            <field name="name">form.86.custom.taxes.tree</field>
-            <field name="model">form.86.custom.taxes</field>
+        <record id="view_customs_duty_tree" model="ir.ui.view">
+            <field name="name">customs.duty.tree</field>
+            <field name="model">customs.duty</field>
             <field name="arch" type="xml">
                 <tree string="Custom Taxes">
                     <field name="code"/>

=== renamed file 'l10n_ve_imex/view/seniat_form_86_menus.xml' => 'l10n_ve_imex/view/customs_form_menus.xml'
--- l10n_ve_imex/view/seniat_form_86_menus.xml	2013-04-16 14:56:39 +0000
+++ l10n_ve_imex/view/customs_form_menus.xml	2013-04-29 19:14:27 +0000
@@ -7,70 +7,70 @@
 -->
 
         <menuitem name="Import/Export - SENIAT - Form 99086"
-            id="menu_form_86_config_group" 
+            id="menu_customs_form_config_group" 
             parent="l10n_ve_fiscal_requirements.menu_finance_fiscal_settings"
             sequence="80"/>
 
 <!--
-form_86_config    
+customs_form_config    
 -->
 
-        <record model="ir.actions.act_window" id="action_form_86_config">
+        <record model="ir.actions.act_window" id="action_customs_form_config">
             <field name="name">Configuration</field>
-            <field name="res_model">form.86.config</field>
+            <field name="res_model">customs.form.config</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
 		</record>   
 
         <menuitem 
-            id="menu_action_form_86_config" 
-            parent="menu_form_86_config_group" 
-            action="action_form_86_config"/>        
+            id="menu_action_customs_form_config" 
+            parent="menu_customs_form_config_group" 
+            action="action_customs_form_config"/>        
 
 <!--
-form_86_customs    
+customs_facility    
 -->
 
-        <record model="ir.actions.act_window" id="action_form_86_customs">
+        <record model="ir.actions.act_window" id="action_customs_facility">
             <field name="name">Customs</field>
-            <field name="res_model">form.86.customs</field>
+            <field name="res_model">customs.facility</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>   
 
         <menuitem 
-            id="menu_action_form_86_customs" 
-            parent="menu_form_86_config_group" 
-            action="action_form_86_customs"/>        
+            id="menu_action_customs_facility" 
+            parent="menu_customs_form_config_group" 
+            action="action_customs_facility"/>        
             
 <!--
-form_86_customs_tax_codes    
+customs_facility_tax_codes    
 -->
 
-        <record model="ir.actions.act_window" id="action_form_86_custom_taxes">
+        <record model="ir.actions.act_window" id="action_customs_duty">
             <field name="name">Tax codes</field>
-            <field name="res_model">form.86.custom.taxes</field>
+            <field name="res_model">customs.duty</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>   
 
         <menuitem 
-            id="menu_action_form_86_custom_taxes" 
-            parent="menu_form_86_config_group" 
-            action="action_form_86_custom_taxes"/>                 
+            id="menu_action_customs_duty" 
+            parent="menu_customs_form_config_group" 
+            action="action_customs_duty"/>                 
 
             
 <!--
-seniat_form_86    
+customs_form
 -->
 		
 
-        <record model="ir.actions.act_window" id="action_seniat_form_86">
+        <record model="ir.actions.act_window" id="action_customs_form">
             <field name="name">SENIAT - Form 99086</field>
-            <field name="res_model">seniat.form.86</field>
+            <field name="res_model">customs.form</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -83,9 +83,9 @@
 			sequence="8"/>
        
         <menuitem 
-            id="menu_action_seniat_form_86" 
+            id="menu_action_customs_form" 
             parent="menu_finance_forma" 
-            action="action_seniat_form_86"/>                 
+            action="action_customs_form"/>                 
             
     </data>
 </openerp>

=== modified file 'l10n_ve_imex/view/invoice.xml'
--- l10n_ve_imex/view/invoice.xml	2013-04-15 20:40:38 +0000
+++ l10n_ve_imex/view/invoice.xml	2013-04-29 19:14:27 +0000
@@ -8,8 +8,8 @@
             <field name="inherit_id" ref="l10n_ve_fiscal_requirements.account_invoice_ext_view_supp_form_loc_ve"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='nro_ctrl']" position="before">
-                     <field name="num_import_form_id" attrs="{'readonly':[('expedient','=',False)],'required':[('expedient','=',True)]}" 
-                            on_change="on_change_num_import_form_id(num_import_form_id)"/>      
+                     <field name="customs_form_id" attrs="{'readonly':[('expedient','=',False)],'required':[('expedient','=',True)]}" 
+                            on_change="on_change_customs_form_id(customs_form_id)"/>      
                 </xpath>
             </field>
         </record>

=== renamed file 'l10n_ve_imex/workflow/seniat_form_86.xml' => 'l10n_ve_imex/workflow/customs_form.xml'
--- l10n_ve_imex/workflow/seniat_form_86.xml	2013-04-11 14:28:42 +0000
+++ l10n_ve_imex/workflow/customs_form.xml	2013-04-29 19:14:27 +0000
@@ -6,9 +6,9 @@
 Workflow
 -->
 
-        <record id="wkf_seniat_form_86" model="workflow">
-            <field name="name">seniat_form_86_wkf</field>
-            <field name="osv">seniat.form.86</field>
+        <record id="wkf_customs_form" model="workflow">
+            <field name="name">customs_form_wkf</field>
+            <field name="osv">customs.form</field>
             <field name="on_create">True</field>
         </record>
         
@@ -17,7 +17,7 @@
 -->
         
         <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_seniat_form_86"/>
+            <field name="wkf_id" ref="wkf_customs_form"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
             <field name="action">button_draft()</field>
@@ -25,21 +25,21 @@
         </record>
         
         <record id="act_open" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_seniat_form_86"/>
+            <field name="wkf_id" ref="wkf_customs_form"/>
             <field name="name">open</field>
             <field name="kind">function</field>
             <field name="action">button_open()</field>
         </record>
         
         <record id="act_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_seniat_form_86"/>
+            <field name="wkf_id" ref="wkf_customs_form"/>
             <field name="name">done</field>
             <field name="kind">function</field>
             <field name="action">button_done()</field>
         </record>
         
         <record id="act_cancel" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_seniat_form_86"/>
+            <field name="wkf_id" ref="wkf_customs_form"/>
             <field name="name">cancel</field>
             <field name="action">button_cancel()</field>
             <field name="kind">function</field>