diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py
index c41f7e404f8..be0fc214a94 100755
--- a/addons/l10n_ch/__terp__.py
+++ b/addons/l10n_ch/__terp__.py
@@ -7,11 +7,10 @@
 	"author" : "Camptocamp",
 	"category" : "Localisation/Europe",
 	"website": "http://www.tinyerp.com",
-	"depends" : ["base", "account"],#l10n_ch
-	"init_xml" : [],
-	"demo_xml" : [],#"zip_code_default.xml"
+	"depends" : ["base", "account"],
+	"init_xml" : ["zip_code_default.xml"],
+	"demo_xml" : ["vaudtax_data_demo.xml"],
 	"update_xml" : ["vaudtax_data.xml","account_vat.xml","base_config.xml","account_config.xml"],
-	#"update_xml" : ["vaudtax_data.xml"],
 	"active": False,
 	"installable": True
 }
diff --git a/addons/l10n_ch/vaudtax_data.xml b/addons/l10n_ch/vaudtax_data.xml
index 9d91ffc0ce2..87e898f05a2 100755
--- a/addons/l10n_ch/vaudtax_data.xml
+++ b/addons/l10n_ch/vaudtax_data.xml
@@ -1,86 +1,7 @@
 <terp>
 <data noupdate="1">
 
-	<!--
-		Groupe
-	-->
 
-	<record model="res.groups" id="group_compta_user">
-		<field name="name">grcompta</field>
-	</record>
-	<record model="res.groups" id="group_compta_admin">
-		<field name="name">grcomptaadmin</field>
-	</record>
-	<record model="res.groups" id="group_user">
-		<field name="name">gruser</field>
-	</record>
-	<record model="res.groups" id="group_noone">
-		<field name="name">grnoone</field>
-	</record>
-	
-	<!--
-	Users
-	-->
-	<record model="res.users" id="user_user">
-		<field name="login">user</field>
-		<field name="password">user</field>
-		<field name="name">Utilisateur standard</field>
-		<field name="signature">Utilisateur standard</field>
-		<field name="action_id" ref="base.action_menu_admin"/>
-	 	<field name="address_id" ref="base.main_address"/>
-		<field name="groups_id" eval="[(6,0,[group_user])]"/>
-		<field name="company_id" ref="base.main_company"/>
-	</record>
-
-
-	<record model="res.users" id="user_compta_admin">
-		<field name="login">compta_admin</field>
-		<field name="password">admin</field>
-		<field name="name">Comptabilite admin</field>
-		<field name="signature">Comptabilite admin</field>
-		<field name="action_id" ref="base.action_menu_admin"/>
-	 	<field name="address_id" ref="base.main_address"/>
-		<field name="groups_id" eval="[(6,0,[group_compta_admin])]"/>
-		<field name="company_id" ref="base.main_company"/>
-	</record>
-	
-	<record model="res.users" id="user_compta">
-		<field name="login">compta</field>
-		<field name="password">compta</field>
-		<field name="name">Comptabilite</field>
-		<field name="signature">Comptabilite</field>
-		<field name="action_id" ref="base.action_menu_admin"/>
-		<field name="address_id" ref="base.main_address"/>
-		<field name="groups_id" eval="[(6,0,[group_compta_user])]"/>
-		<field name="company_id" ref="base.main_company"/>
-	</record>
-	
-	<!--
-	menu def
-	-->	
-    	<menuitem name="Administration" icon="terp-administration" groups="admin,grcomptaadmin" sequence="20" />
-
-	<menuitem name="CRM &amp; SRM" icon="terp-crm" groups="admin,gruser" sequence="3" />
-	<!--
-	<menuitem name="Partners" icon="terp-partner" groups="admin,grcomptaadmin,user,grcompta" sequence="1" />
-	-->
-	<menuitem name="Human Resources" icon="terp-hr" groups="admin,gruser" sequence="5" />
-	<menuitem name="Financial Management" icon="terp-account" groups="admin,grcomptaadmin,gruser,grcompta" sequence="2" />
-	<menuitem name="Products" icon="terp-product" groups="admin,gruser" sequence="4" />
-	<menuitem name="Inventory Control" icon="terp-stock" groups="admin,gruser" sequence="6" />
-	<menuitem name="Production" icon="terp-mrp" groups="admin,gruser" sequence="8" />
-	<menuitem name="Purchase Management" icon="terp-purchase" groups="admin,user" sequence="7" />
-	<menuitem name="Sales Management" icon="terp-sale" groups="admin,gruser" sequence="9" />
-	<menuitem name="Project" icon="terp-project" groups="admin,gruser" sequence="10" />
-	<menuitem name="Partners/Configuration" groups="admin,grcomptaadmin" sequence="1" />
-	<menuitem name="Human Resources/Configuration" groups="admin" sequence="1" />
-	<menuitem name="Financial Management/Configuration" groups="admin,grcomptaadmin" sequence="1" />
-	<menuitem name="Sales Management/Configuration" groups="admin" sequence="1" />
-	<menuitem name="Inventory Control/Configuration" groups="admin" sequence="1" />
-	<menuitem name="CRM &amp; SRM/Configuration" groups="admin" sequence="1" />
-	<menuitem name="Products/Configuration" groups="admin" sequence="1" />
-	<menuitem name="Production/Configuration" groups="admin" sequence="1" />
-	<menuitem name="Project/Configuration" groups="admin" sequence="1" />
 	
 	<!--
 	 Title contact
@@ -293,93 +214,6 @@
 		<field name="active">1</field>
 	</record>
 	
-		<!--
-		Resource: res.partner
-		-->
-
-			<record id="bank" model="res.partner">
-				<field name="comment">My bank !</field>
-				<field name="ref">banq</field>
-				<field name="name">Banque</field>
-				<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-		</record>
-			<record id="res_partner_address_bank1" model="res.partner.address">
-				<field name="fax">+41 31 622 13 00</field>
-				<field name="name">Marc Dufour</field>
-				<field name="zip">1015</field>
-				<field name="city">Lausanne</field>
-				<field name="partner_id" ref="bank"/>
-				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
-				<field name="title">M.</field>
-				<field name="email">tinyerp@bank.com</field>
-				<field name="phone">+41 24 620 10 12</field>
-				<field name="street">PSE-C</field>
-				<field name="active">1</field>
-				<field name="type">default</field>
-			</record>
-
-		<record id="prolibre" model="res.partner">
-			<field name="comment">Very good company!
-			They provides a very high quality service.</field>
-			<field name="ref">ProL</field>
-			<field name="website">http://camptocamp.com</field>
-			<field name="name">ProLibre</field>
-			<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-		</record>
-
-		<record id="camptocamp" model="res.partner">
-			<field name="comment">Very good company!
-			They provides a very high quality service.</field>
-			<field name="ref">c2c</field>
-			<field name="website">http://camptocamp.com</field>
-			<field name="name">camptocamp SA</field>
-			<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-		</record>
-				<!--
-				Resource: res.partner.address
-				-->
-
-			<record id="res_partner_address_1" model="res.partner.address">
-				<field name="fax">+41 21 619 10 00</field>
-				<field name="name">Luc Maurer</field>
-				<field name="zip">1015</field>
-				<field name="city">Lausanne</field>
-				<field name="partner_id" ref="camptocamp"/>
-				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
-				<field name="title">M.</field>
-				<field name="email">tinyerp@camptocamp.com</field>
-				<field name="phone">+41 21 619 10 12</field>
-				<field name="street">PSE-A, EPFL</field>
-				<field name="active">1</field>
-				<field name="type">default</field>
-			</record>
-			<record id="res_partner_address_2" model="res.partner.address">
-				<field name="name">Gilbert Robert</field>
-				<field name="zip">1227</field>
-				<field name="city">Carouge</field>
-				<field name="partner_id" ref="prolibre"/>
-				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
-				<field name="title">M.</field>
-				<field name="email">info@prolibre.com</field>
-				<field name="phone">+41 22 3015383</field>
-				<field name="street">18, rue des Moraines </field>
-				<field name="active">1</field>
-				<field name="type">default</field>
-			</record>
-			<record id="res_partner_address_3" model="res.partner.address">
-				<field name="fax">+41 21 619 10 00</field>
-				<field name="name">Claude Philipona</field>
-				<field name="zip">1015</field>
-				<field name="city">Lausanne</field>
-				<field name="partner_id" ref="camptocamp"/>
-				<field name="country_id" model="res.country" search="[('name','=','Switzerland')]"/>
-				<field name="title">M.</field>
-				<field name="email">tinyerp@camptocamp.com</field>
-				<field name="phone">+41 21 619 10 12 </field>
-				<field name="street">PSE-A, EPFL</field>
-				<field name="active">1</field>
-				<field name="type">default</field>
-			</record>
 			<!--
 			Account Journal
 			-->
diff --git a/addons/l10n_ch/vaudtax_data_demo.xml b/addons/l10n_ch/vaudtax_data_demo.xml
new file mode 100644
index 00000000000..8411cad67fe
--- /dev/null
+++ b/addons/l10n_ch/vaudtax_data_demo.xml
@@ -0,0 +1,177 @@
+<terp>
+<data noupdate="1">
+
+	<!--
+		Groupe
+	-->
+
+	<record model="res.groups" id="group_compta_user">
+		<field name="name">grcompta</field>
+	</record>
+	<record model="res.groups" id="group_compta_admin">
+		<field name="name">grcomptaadmin</field>
+	</record>
+	<record model="res.groups" id="group_user">
+		<field name="name">gruser</field>
+	</record>
+	<record model="res.groups" id="group_noone">
+		<field name="name">grnoone</field>
+	</record>
+	
+	<!--
+	Users
+	-->
+	<record model="res.users" id="user_user">
+		<field name="login">user</field>
+		<field name="password">user</field>
+		<field name="name">Utilisateur standard</field>
+		<field name="signature">Utilisateur standard</field>
+		<field name="action_id" ref="base.action_menu_admin"/>
+	 	<field name="address_id" ref="base.main_address"/>
+		<field name="groups_id" eval="[(6,0,[group_user])]"/>
+		<field name="company_id" ref="base.main_company"/>
+	</record>
+
+
+	<record model="res.users" id="user_compta_admin">
+		<field name="login">compta_admin</field>
+		<field name="password">admin</field>
+		<field name="name">Comptabilite admin</field>
+		<field name="signature">Comptabilite admin</field>
+		<field name="action_id" ref="base.action_menu_admin"/>
+	 	<field name="address_id" ref="base.main_address"/>
+		<field name="groups_id" eval="[(6,0,[group_compta_admin])]"/>
+		<field name="company_id" ref="base.main_company"/>
+	</record>
+	
+	<record model="res.users" id="user_compta">
+		<field name="login">compta</field>
+		<field name="password">compta</field>
+		<field name="name">Comptabilite</field>
+		<field name="signature">Comptabilite</field>
+		<field name="action_id" ref="base.action_menu_admin"/>
+		<field name="address_id" ref="base.main_address"/>
+		<field name="groups_id" eval="[(6,0,[group_compta_user])]"/>
+		<field name="company_id" ref="base.main_company"/>
+	</record>
+	
+	<!--
+	menu def
+	-->	
+    	<menuitem name="Administration" icon="terp-administration" groups="admin,grcomptaadmin" sequence="20" />
+
+	<menuitem name="CRM &amp; SRM" icon="terp-crm" groups="admin,gruser" sequence="3" />
+	<!--
+	<menuitem name="Partners" icon="terp-partner" groups="admin,grcomptaadmin,user,grcompta" sequence="1" />
+	-->
+	<menuitem name="Human Resources" icon="terp-hr" groups="admin,gruser" sequence="5" />
+	<menuitem name="Financial Management" icon="terp-account" groups="admin,grcomptaadmin,gruser,grcompta" sequence="2" />
+	<menuitem name="Products" icon="terp-product" groups="admin,gruser" sequence="4" />
+	<menuitem name="Inventory Control" icon="terp-stock" groups="admin,gruser" sequence="6" />
+	<menuitem name="Production" icon="terp-mrp" groups="admin,gruser" sequence="8" />
+	<menuitem name="Purchase Management" icon="terp-purchase" groups="admin,user" sequence="7" />
+	<menuitem name="Sales Management" icon="terp-sale" groups="admin,gruser" sequence="9" />
+	<menuitem name="Project" icon="terp-project" groups="admin,gruser" sequence="10" />
+	<menuitem name="Partners/Configuration" groups="admin,grcomptaadmin" sequence="1" />
+	<menuitem name="Human Resources/Configuration" groups="admin" sequence="1" />
+	<menuitem name="Financial Management/Configuration" groups="admin,grcomptaadmin" sequence="1" />
+	<menuitem name="Sales Management/Configuration" groups="admin" sequence="1" />
+	<menuitem name="Inventory Control/Configuration" groups="admin" sequence="1" />
+	<menuitem name="CRM &amp; SRM/Configuration" groups="admin" sequence="1" />
+	<menuitem name="Products/Configuration" groups="admin" sequence="1" />
+	<menuitem name="Production/Configuration" groups="admin" sequence="1" />
+	<menuitem name="Project/Configuration" groups="admin" sequence="1" />
+	
+	
+		<!--
+		Resource: res.partner
+		-->
+
+			<record id="bank" model="res.partner">
+				<field name="comment">My bank !</field>
+				<field name="ref">banq</field>
+				<field name="name">Banque</field>
+				<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
+		</record>
+			<record id="res_partner_address_bank1" model="res.partner.address">
+				<field name="fax">+41 31 622 13 00</field>
+				<field name="name">Marc Dufour</field>
+				<field name="zip">1015</field>
+				<field name="city">Lausanne</field>
+				<field name="partner_id" ref="bank"/>
+				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
+				<field name="title">M.</field>
+				<field name="email">tinyerp@bank.com</field>
+				<field name="phone">+41 24 620 10 12</field>
+				<field name="street">PSE-C</field>
+				<field name="active">1</field>
+				<field name="type">default</field>
+			</record>
+
+		<record id="prolibre" model="res.partner">
+			<field name="comment">Very good company!
+			They provides a very high quality service.</field>
+			<field name="ref">ProL</field>
+			<field name="website">http://camptocamp.com</field>
+			<field name="name">ProLibre</field>
+			<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
+		</record>
+
+		<record id="camptocamp" model="res.partner">
+			<field name="comment">Very good company!
+			They provides a very high quality service.</field>
+			<field name="ref">c2c</field>
+			<field name="website">http://camptocamp.com</field>
+			<field name="name">camptocamp SA</field>
+			<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
+		</record>
+				<!--
+				Resource: res.partner.address
+				-->
+
+			<record id="res_partner_address_1" model="res.partner.address">
+				<field name="fax">+41 21 619 10 00</field>
+				<field name="name">Luc Maurer</field>
+				<field name="zip">1015</field>
+				<field name="city">Lausanne</field>
+				<field name="partner_id" ref="camptocamp"/>
+				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
+				<field name="title">M.</field>
+				<field name="email">tinyerp@camptocamp.com</field>
+				<field name="phone">+41 21 619 10 12</field>
+				<field name="street">PSE-A, EPFL</field>
+				<field name="active">1</field>
+				<field name="type">default</field>
+			</record>
+			<record id="res_partner_address_2" model="res.partner.address">
+				<field name="name">Gilbert Robert</field>
+				<field name="zip">1227</field>
+				<field name="city">Carouge</field>
+				<field name="partner_id" ref="prolibre"/>
+				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
+				<field name="title">M.</field>
+				<field name="email">info@prolibre.com</field>
+				<field name="phone">+41 22 3015383</field>
+				<field name="street">18, rue des Moraines </field>
+				<field name="active">1</field>
+				<field name="type">default</field>
+			</record>
+			<record id="res_partner_address_3" model="res.partner.address">
+				<field name="fax">+41 21 619 10 00</field>
+				<field name="name">Claude Philipona</field>
+				<field name="zip">1015</field>
+				<field name="city">Lausanne</field>
+				<field name="partner_id" ref="camptocamp"/>
+				<field name="country_id" model="res.country" search="[('name','=','Switzerland')]"/>
+				<field name="title">M.</field>
+				<field name="email">tinyerp@camptocamp.com</field>
+				<field name="phone">+41 21 619 10 12 </field>
+				<field name="street">PSE-A, EPFL</field>
+				<field name="active">1</field>
+				<field name="type">default</field>
+			</record>
+			
+			
+
+</data>
+</terp>
\ No newline at end of file