diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py index 4daaa9419bd..52dc279da9e 100755 --- a/addons/l10n_ch/__terp__.py +++ b/addons/l10n_ch/__terp__.py @@ -8,10 +8,11 @@ "category" : "Localisation/Europe", "website": "http://www.tinyerp.com", "depends" : ["base", "account"], -# "init_xml" : [], + "init_xml" : [], "init_xml" : ["zip_code_default.xml"], - "demo_xml" : ["vaudtax_data_demo.xml"], - "update_xml" : ["dta/dta_view.xml","dta/dta_wizard.xml","v11/v11_wizard.xml", + "demo_xml" : ["vaudtax_data_demo.xml","dta/dta_demo.xml",], + "update_xml" : ["dta/dta_view.xml","dta/dta_wizard.xml", + "v11/v11_wizard.xml", "account_vat.xml","base_config.xml","account_config.xml", "company_view.xml"], diff --git a/addons/l10n_ch/dta/dta_demo.xml b/addons/l10n_ch/dta/dta_demo.xml new file mode 100644 index 00000000000..21ee243c636 --- /dev/null +++ b/addons/l10n_ch/dta/dta_demo.xml @@ -0,0 +1,31 @@ + + + + + + + FORTIS BANK + 1234567 + Fortis Banque + + + + + DEXIA BANK + 7654321 + Dexia Banque + + + + + + + Co01 + Co01 + + + + + + + diff --git a/addons/l10n_ch/dta/dta_wizard.py b/addons/l10n_ch/dta/dta_wizard.py index 63ca4e78b75..218a924f9f1 100644 --- a/addons/l10n_ch/dta/dta_wizard.py +++ b/addons/l10n_ch/dta/dta_wizard.py @@ -182,41 +182,41 @@ def _create_dta(self,cr,uid,data,context): #header try: - hdr= header('000000','',creation_date,company_iban,'idfi',seq,'836','0') + hdr= header('000000','',creation_date,company_iban,'idfi',seq,'836','0') # TODO id_file except Exception,e : log= log +'\n'+ str(e) - raise - # header, id_dta, num_invoice, iban, amount : + #raise + # segment 01: 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 + #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 + #raise # donnees de la banque try: - dta = dta + segment_03(data['form']['bank'],'',data['form']['bank_iban']) # city = blank + dta = dta + segment_03(data['form']['bank'],'',data['form']['bank_iban']) except Exception,e : log= log +'\n'+ str(e) - raise + #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 + #raise # communication & reglement des frais try: - dta = dta + segment_05(motif='I',ref1='',ref2=i.reference or '',ref3='',format='0') #FIXME ! + dta = dta + segment_05(motif='I',ref1='',ref2=i.reference or '',ref3='',format='0') #FIXME : motif except Exception,e : log= log +'\n'+ str(e) - raise + #raise amount_tot += i.amount_total inv_obj.write(cr,uid,[i.id],{'dta_state': 'paid'}) @@ -224,12 +224,13 @@ def _create_dta(self,cr,uid,data,context): # total - try: - dta = dta + total(header('000000','',creation_date,company_iban,'idfi',seq,'890','0')\ + try: + if dta : + 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 + #raise log = log and log +'\nCORRUPTED FILE !'or 'DONE' return {'note':log+skip, 'dta': b64encode(dta)} diff --git a/addons/l10n_ch/v11/sample/README b/addons/l10n_ch/v11/sample/README new file mode 100644 index 00000000000..aca9cd3f31a --- /dev/null +++ b/addons/l10n_ch/v11/sample/README @@ -0,0 +1,12 @@ +The v11 sample file contain the data below : + +date_comptable : 061017 +date_remise : 061017 +date_valeur : 061017 +frais_encaissement : 0000 +internal_ref : 0000000001 +amount : 0000054150 +n_postal : 010121627 +n_ref : 005095000000000000000643666 +reserve : 0001 0001 +reserve2 : 000000000 diff --git a/addons/l10n_ch/v11/sample/sample.v11 b/addons/l10n_ch/v11/sample/sample.v11 new file mode 100644 index 00000000000..27ff9bfcf82 --- /dev/null +++ b/addons/l10n_ch/v11/sample/sample.v11 @@ -0,0 +1,2 @@ +00201012162700509500000000000000064366600000541500001 000106101706101706101700000000020000000000000 +999010121627999999999999999999999999999000000054150000000000025061018000000000000000000