From 4bff5a4ec79b2dfc06b7f82b8aff14504c49ade4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 15 Dec 2010 16:07:09 +0100
Subject: [PATCH] [IMP] Removed account.analytic.account,
 account.analytic.journal, account.journal and res.country entries.

bzr revid: nicolas.vanhoren@openerp.com-20101215150709-3xc7qb3ojscq789e
---
 addons/l10n_cn/account_chart.xml | 54 --------------------------------
 addons/l10n_cn/base_data.xml     |  6 ----
 2 files changed, 60 deletions(-)

diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index ae086cd083a..624e76a190e 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -976,60 +976,6 @@
 			<field name="account_collected_id" ref="chart22210101"/>
 			<field name="account_paid_id" ref="chart22210101"/>
 			<field name="type_tax_use">purchase</field>
-		</record>        
-        <!-- 辅助核算类别 -->
-		<record id="analytic_department" model="account.analytic.account">
-			<field name="name">某部门</field>
-		</record>
-		<record id="analytic_employee" model="account.analytic.account">
-			<field name="name">某员工</field>
-		</record>
-		<record id="analytic_project" model="account.analytic.account">
-			<field name="name">某项目</field>
-		</record>
-        <!-- 管理会计账簿 -->
-		<record id="gl_ana_journal" model="account.analytic.journal">
-			<field name="name">总账核算</field>
-			<field name="code">GLAJ</field>
-			<field name="type">general</field>
-		</record>
-		<record id="sale_ana_journal" model="account.analytic.journal">
-			<field name="name">收入核算</field>
-			<field name="code">INCJ</field>
-			<field name="type">sale</field>
-		</record>
-		<record id="purchase_ana_journal" model="account.analytic.journal">
-			<field name="name">费用核算</field>
-			<field name="code">EXPJ</field>
-			<field name="type">purchase</field>
-		</record>
-        <!-- 财务会计账簿 -->
-		<record id="gl_journal" model="account.journal">
-			<field name="name">总账</field>
-			<field name="code">GLJ</field>
-			<field name="type">general</field>
-			<field name="view_id" ref="account.account_journal_view"/>
-			<field name="sequence_id" ref="account.sequence_journal"/>
-			<field name="analytic_journal_id" ref="gl_ana_journal"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-		<record id="sale_journal" model="account.journal">
-			<field name="name">销售</field>
-			<field name="code">SAJ</field>
-			<field name="type">sale</field>
-			<field name="view_id" ref="account.account_journal_view"/>
-			<field name="sequence_id" ref="account.sequence_journal"/>
-			<field name="analytic_journal_id" ref="sale_ana_journal"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-		<record id="purchase_journal" model="account.journal">
-			<field name="name">采购</field>
-			<field name="code">PUJ</field>
-			<field name="type">purchase</field>
-			<field name="view_id" ref="account.account_journal_view"/>
-			<field name="sequence_id" ref="account.sequence_journal"/>
-			<field name="analytic_journal_id" ref="purchase_ana_journal"/>
-			<field name="user_id" ref="base.user_root"/>
 		</record>
 	</data>
 </openerp>
diff --git a/addons/l10n_cn/base_data.xml b/addons/l10n_cn/base_data.xml
index 58e2ced8d76..252a04feb18 100644
--- a/addons/l10n_cn/base_data.xml
+++ b/addons/l10n_cn/base_data.xml
@@ -2,12 +2,6 @@
 <openerp>
 	<data>
 
-        <!-- 设置中国中文名称 -->
-        <record id="base.cn" model="res.country">
-            <field name="name">中国</field>
-            <field name="code">cn</field>
-        </record>
-
         <!-- 添加省份数据 -->
         <record id="state_BJ" model="res.country.state">
             <field name="name">北京市</field>