From e0707d560b32eecda2c01c15d3631fda9946f58a Mon Sep 17 00:00:00 2001
From: pinky <>
Date: Mon, 18 Dec 2006 15:06:11 +0000
Subject: [PATCH] L10N_CH: DTA & BVR demo data imporved

bzr revid: pinky-da7f8e1fd7ae31f0301dc9c727aea2ad1d672a45
---
 addons/account/account.py       |  2 +-
 addons/account/invoice.py       |  2 +-
 addons/l10n_ch/__terp__.py      |  6 +++---
 addons/l10n_ch/dta/dta_demo.xml | 24 ++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index d15d10142ac..71af76f7224 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1110,7 +1110,7 @@ class account_move_line(osv.osv):
 		r = cr.fetchall()
 #TODO: move this check to a constraint in the account_move_reconcile object
 		if len(r) != 1:
-			raise Exception('Entries are not of the same account !')
+			raise Exception('Entries are not of the same account or already reconciled ! ')
 		if r[0][1] != None:
 			raise Exception('Some entries are already reconciled !')
 		if writeoff != 0:
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 3de5a004ef2..e1e610fe708 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -87,7 +87,7 @@ class account_invoice(osv.osv):
 			('in_refund','Supplier Refund'),
 		],'Type', readonly=True, states={'draft':[('readonly',False)]}, select=True),
 
-		'number': fields.char('Invoice Number', size=32), # readonly=True
+		'number': fields.char('Invoice Number', size=32,readonly=True),  
 		'reference': fields.char('Invoice Reference', size=64),
 		'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly',False)]}),
 		'comment': fields.text('Additionnal Information'),
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py
index 52dc279da9e..4f240b5f2d5 100755
--- a/addons/l10n_ch/__terp__.py
+++ b/addons/l10n_ch/__terp__.py
@@ -9,9 +9,9 @@
 	"website": "http://www.tinyerp.com",
 	"depends" : ["base", "account"],
 	"init_xml" : [],
-	"init_xml" : ["zip_code_default.xml"],
-	"demo_xml" : ["vaudtax_data_demo.xml","dta/dta_demo.xml",],
-	"update_xml" : ["dta/dta_view.xml","dta/dta_wizard.xml",
+#	"init_xml" : ["zip_code_default.xml"],
+	"demo_xml" : ["vaudtax_data_demo.xml","dta/dta_demo.xml"],
+	"update_xml" : ["dta/dta_view.xml","dta/dta_wizard.xml","dta/dta_demo.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
index 21ee243c636..9255ac7389c 100644
--- a/addons/l10n_ch/dta/dta_demo.xml
+++ b/addons/l10n_ch/dta/dta_demo.xml
@@ -27,5 +27,29 @@
 		<field name="bank_id" ref="main_bank"/>
 	</record>
 
+
+	<record model="account.invoice" id="dta_invoice">
+		<field name="name">DTA invoice</field>
+		<field name="dta_state">2bpaid</field>
+		<field name="number">200602</field>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field name="account_id" ref="account.a_recv"/>
+	</record>
+
+	<record model="account.invoice" id="v11_invoice">
+		<field name="name">V11 invoice</field>
+		<field name="amount_total">54150</field>
+		<field name="number">1</field>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field name="account_id" ref="account.a_recv"/>
+	</record>
+
+<!-- need a invoice line ! -->
+
+	<record model="account.journal" id="account.sales_journal">
+		<field name="default_debit_account_id" ref="account.a_recv"/>
+	</record>
+
+
 </data>
 </terp>