diff --git a/addons/l10n_ch/dta/dta_wizard.py b/addons/l10n_ch/dta/dta_wizard.py
new file mode 100644
index 00000000000..63ca4e78b75
--- /dev/null
+++ b/addons/l10n_ch/dta/dta_wizard.py
@@ -0,0 +1,259 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+import pooler
+import wizard
+from base64 import b64encode
+from osv import osv
+import time
+
+ask_form = """
+
+"""
+
+ask_fields = {
+ 'bank' : {
+ 'string':'Bank',
+ 'type':'char',
+ },
+
+# 'city' : {
+# 'string':'Bank city',
+# 'type':'char',
+# },
+
+ 'bank_iban' : {
+ 'string':'Iban',
+ 'type':'char',
+ 'required':True,
+ },
+}
+
+
+res_form = """
+
+"""
+
+res_fields = {
+ 'dta' : {
+ 'string':'V11 file',
+ 'type':'binary',
+ 'required':True,
+ },
+
+ 'note' : {'string':'Log','type':'text'}
+
+}
+
+
+def _get_fields(self,cr,uid,data,context):
+ pool = pooler.get_pool(cr.dbname)
+ user = pool.get('res.users').browse(cr,uid,[uid])[0]
+ company= user.company_id
+
+ if company.partner_id.bank_ids:
+ bank = company.partner_id.bank_ids[0]
+ return {'bank':bank.bank_name,'bank_iban':bank.iban or ''} # 'city':'',
+ return {}
+
+def c_ljust(s, size):
+ """
+ check before calling ljust
+ """
+ s= s or ''
+ if len(s) > size:
+ raise Exception("Too long data ! %s exceed %d character." % (s, size))
+ return s.decode('utf-8').encode('latin1','replace').ljust(size)
+
+
+def segment_01(header,iddta,inv_num,iban,value,currency,amount):
+ return '01'+c_ljust(header,51)+c_ljust(iddta,5)+c_ljust(inv_num,11)+c_ljust(iban,24)+c_ljust(value,6)\
+ +c_ljust(currency,3)+c_ljust(amount,15)+''.ljust(11)
+
+def segment_02(name,street,zip,city,country,cours='', num_seg='02'):
+ zip = zip or ''
+ country = country or ''
+ city = city or ''
+ add = ' '.join([zip,city,country])
+ return c_ljust(cours,12)+c_ljust(name,35)+c_ljust(street,35)+ c_ljust(add,35)+''.ljust(9)
+
+def segment_03(bank_name,bank_city,iban):
+ return "03"+"D"+c_ljust(bank_name,35)+c_ljust(bank_city,35)+c_ljust(iban,34)+''.ljust(21)
+
+def segment_04(name,street,zip,city,country,cours='', num_seg='04'):
+ return segment_02(name,street,zip,city,country,cours, num_seg)
+
+def segment_05(motif='I',ref1='',ref2='',ref3='',format='0'):
+ return '05'+c_ljust(ref1,35)+c_ljust(ref2,35)+c_ljust(ref3,35)+c_ljust(format,1)+''.ljust(19)
+
+def header(date,cpt_benef,creation_date,cpt_donneur,id_fich,num_seq,trans,type):
+ return c_ljust(date,6)+c_ljust(cpt_benef,12)+c_ljust('00000',5)+c_ljust(creation_date,6)+c_ljust(cpt_donneur,7)\
+ +c_ljust(id_fich,5)+ str(num_seq).rjust(5,'0')+ c_ljust(trans,3) + c_ljust(type,1)+'0'
+
+def total(header,tot):
+ return '01'+c_ljust(header,51)+c_ljust(tot,16)+''.ljust(59)
+def _create_dta(self,cr,uid,data,context):
+ # cree des gt836
+
+ creation_date= time.strftime('%y%m%d')
+ log=''
+ skip=''
+ dta=''
+ valeur=''
+ pool = pooler.get_pool(cr.dbname)
+ user = pool.get('res.users').browse(cr,uid,[uid])[0]
+ company= user.company_id
+ co_addr= company.partner_id.address[0]
+
+ company_dta = company.dta_number or ''
+ if not company.dta_number :
+ log= log +'\nNo dta number for the company.'
+
+
+ company_iban = company.partner_id and company.partner_id.bank_ids and company.partner_id.bank_ids[0]\
+ and company.partner_id.bank_ids[0].iban or ''
+ if not company_iban :
+ log= log +'\nNo iban number for the company.'
+ inv_obj = pool.get('account.invoice')
+ seq= 1
+ amount_tot= 0
+ for i in inv_obj.browse(cr,uid,data['ids']):
+ if i.dta_state != '2bpaid' or i.state == 'draft':
+ skip= skip +'\n Invoice '+ (i.number or '??')+ ' ignored.'
+ continue
+
+ number = i.number or ''
+ currency = i.currency_id.code or ''
+ country = co_addr.country_id and co_addr.country_id.name or ''
+
+ partner_bank_account = i.partner_id and i.partner_id.bank_ids and i.partner_id.bank_ids[0]\
+ and i.partner_id.bank_ids[0].iban or ''
+
+ partner_name = i.partner_id and i.partner_id.name or ''
+ if i.partner_id and i.partner_id.address and i.partner_id.address[0]:
+ partner_street = i.partner_id.address[0].street
+ partner_city= i.partner_id.address[0].city
+ partner_zip= i.partner_id.address[0].zip
+ partner_country= i.partner_id.address[0].country_id.name
+
+ else:
+ partner_street =''
+ partner_city= ''
+ partner_zip= ''
+ partner_country= ''
+ log= log +'\nNo address for the invoice partner.'
+
+ if not partner_bank_account:
+ log= log +'\nNo bank account for the invoice partner. (invoice '+ (i.number or '??')+')'
+
+
+ #header
+ try:
+ hdr= header('000000','',creation_date,company_iban,'idfi',seq,'836','0')
+ except Exception,e :
+ log= log +'\n'+ str(e)
+ raise
+ # header, id_dta, num_invoice, iban, amount :
+ try:
+ dta = dta + segment_01(hdr,company_dta ,
+ number,company_iban,valeur,currency,str(i.amount_total))
+ except Exception,e :
+ log= log +'\n'+ str(e)
+ raise
+ # adresse donneur d'ordre
+ try:
+ dta = dta + segment_02(company.name,co_addr.street,co_addr.zip,co_addr.city,country,cours='')
+ except Exception,e :
+ log= log +'\n'+ str(e)
+ raise
+ # donnees de la banque
+ try:
+ dta = dta + segment_03(data['form']['bank'],'',data['form']['bank_iban']) # city = blank
+ except Exception,e :
+ log= log +'\n'+ str(e)
+ raise
+ # adresse du beneficiaire
+ try:
+ dta = dta + segment_04(partner_name,partner_street,partner_zip,partner_city,partner_country,cours='')
+ except Exception,e :
+ log= log +'\n'+ str(e)
+ raise
+ # communication & reglement des frais
+ try:
+ dta = dta + segment_05(motif='I',ref1='',ref2=i.reference or '',ref3='',format='0') #FIXME !
+ except Exception,e :
+ log= log +'\n'+ str(e)
+ raise
+
+ amount_tot += i.amount_total
+ inv_obj.write(cr,uid,[i.id],{'dta_state': 'paid'})
+ seq += 1
+
+
+ # total
+ try:
+ dta = dta + total(header('000000','',creation_date,company_iban,'idfi',seq,'890','0')\
+ , str(amount_tot))
+ except Exception,e :
+ log= log +'\n'+ str(e)
+ raise
+
+ log = log and log +'\nCORRUPTED FILE !'or 'DONE'
+ return {'note':log+skip, 'dta': b64encode(dta)}
+
+
+
+class wizard_dta_create(wizard.interface):
+ states = {
+ 'init' : {
+ 'actions' : [_get_fields],
+ 'result' : {'type' : 'form',
+ 'arch' : ask_form,
+ 'fields' : ask_fields,
+ 'state' : [('end', 'Cancel'),('creation', 'Yes') ]}
+ },
+
+ 'creation' : {
+ 'actions' : [_create_dta],
+ 'result' : {'type' : 'form',
+ 'arch' : res_form,
+ 'fields' : res_fields,
+ 'state' : [('end', 'Quit') ]}
+ },
+
+ }
+
+wizard_dta_create('account.dta_create')
diff --git a/addons/l10n_ch/dta/invoice.py b/addons/l10n_ch/dta/invoice.py
new file mode 100644
index 00000000000..4e3ab51f3fc
--- /dev/null
+++ b/addons/l10n_ch/dta/invoice.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import time
+import netsvc
+from osv import fields, osv
+import ir
+
+class account_invoice(osv.osv):
+ _inherit = "account.invoice"
+ _columns = {
+ 'dta_state': fields.selection([('none','None'),('2bpaid','To be paid'),('paid','Paid')],
+ 'DTA state',readonly=True,select=True, states={'draft':[('readonly',False)]}),
+ }
+
+ _defaults = {
+ 'dta_state': lambda *a: 'none',
+ }
+
+account_invoice()
+