diff --git a/addons/l10n_jp/__openerp__.py b/addons/l10n_jp/__openerp__.py
index 6ff8c0aa3ca..1fdc3bf2319 100644
--- a/addons/l10n_jp/__openerp__.py
+++ b/addons/l10n_jp/__openerp__.py
@@ -30,13 +30,12 @@ need to use these at all under normal circumstances.
'website': 'http://www.openerp-asia.net/',
'depends': ['account'],
'data': [
+ 'data/account_chart_template.xml',
'data/account.account.template.csv',
- 'data/account.tax.code.template.csv',
- 'data/account.chart.template.csv',
'data/account.tax.template.csv',
+ 'data/account_chart_template_after.xml',
+ 'data/account_chart_template.yml',
'data/account.fiscal.position.template.csv',
],
- 'installable': False,
+ 'installable': True,
}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_jp/data/account.account.template.csv b/addons/l10n_jp/data/account.account.template.csv
index 06a61786351..ec2f2984771 100644
--- a/addons/l10n_jp/data/account.account.template.csv
+++ b/addons/l10n_jp/data/account.account.template.csv
@@ -1,157 +1,120 @@
-id,code,name,parent_id:id,type,user_type/id,tax_ids/id,reconcile,currency_id/id
-COM0,0,日本勘定科目表,,View,account.data_account_type_view,,FALSE,
-A,A,貸借対照表,COM0,View,account.data_account_type_view,,FALSE,
-A1,A1,資産の部,A,View,account.account_type_asset_view1,,FALSE,
-A11,A11,流動資産,A1,View,account.account_type_asset_view1,,FALSE,
-A111,A111,現金・預金,A11,View,account.account_type_asset_view1,,FALSE,
-A11101,A11101,普通預金,A111,Liquidity,account.data_account_type_cash,,FALSE,
-A11102,A11102,当座預金,A111,Liquidity,account.data_account_type_cash,,FALSE,
-A11103,A11103,定期預金,A111,Liquidity,account.data_account_type_cash,,FALSE,
-A11105,A11105,小口現金,A111,Liquidity,account.data_account_type_cash,,FALSE,
-A112,A112,売掛金等,A11,View,account.account_type_asset_view1,,FALSE,
-A11211,A11211,売掛金,A112,Receivable,account.data_account_type_receivable,,TRUE,
-A11212,A11212,売掛金(USD),A112,Receivable,account.data_account_type_receivable,,TRUE,base.USD
-A11215,A11215,受取手形,A112,Receivable,account.data_account_type_receivable,,TRUE,
-A11216,A11216,割引手形,A112,Receivable,account.data_account_type_receivable,,TRUE,
-A11219,A11219,出庫請求仮,A112,Regular,account.data_account_type_receivable,,FALSE,
-A11301,A11301,未収収益,A11,Regular,account.data_account_type_asset,,FALSE,
-A11401,A11401,有価証券,A11,Regular,account.data_account_type_asset,,FALSE,
-A115,A115,在庫,A11,View,account.account_type_asset_view1,,FALSE,
-A11501,A11501,商品,A115,Regular,account.data_account_type_asset,,FALSE,
-A11503,A11503,製品,A115,Regular,account.data_account_type_asset,,FALSE,
-A11504,A11504,仕掛品,A115,Regular,account.data_account_type_asset,,FALSE,
-A11505,A11505,原材料,A115,Regular,account.data_account_type_asset,,FALSE,
-A11506,A11506,資材,A115,Regular,account.data_account_type_asset,,FALSE,
-A11503,A11503,積送品,A115,Regular,account.data_account_type_asset,,FALSE,
-A11601,A11601,未収金,A11,Receivable,account.data_account_type_receivable,,TRUE,
-A118,A118,その他流動資産,A11,View,account.account_type_asset_view1,,FALSE,
-A11802,A11802,前渡金,A118,Regular,account.data_account_type_asset,,FALSE,
-A11804,A11804,前払費用,A118,Regular,account.data_account_type_asset,,FALSE,
-A11805,A11805,立替金,A118,Regular,account.data_account_type_asset,,FALSE,
-A11806,A11806,仮払金,A118,Regular,account.data_account_type_asset,,FALSE,
-A11807,A11807,仮払消費税,A118,Regular,account.conf_account_type_tax,,FALSE,
-A11901,A11901,貸倒引当金,A11,Regular,account.data_account_type_asset,,FALSE,
-A12,A12,固定資産,A1,View,account.account_type_asset_view1,,FALSE,
-A121,A121,有形固定資産,A12,View,account.account_type_asset_view1,,FALSE,
-A1211,A1211,建物及び構築物(純額),A121,View,account.account_type_asset_view1,,FALSE,
-A12111,A12111,建物及び構築物,A1211,Regular,account.data_account_type_asset,,FALSE,
-A12112,A12112,建物及び構築物減償累計額,A1211,Regular,account.data_account_type_asset,,FALSE,
-A1212,A1212,機械及び装置(純額),A121,View,account.account_type_asset_view1,,FALSE,
-A12121,A12121,機械及び装置,A1212,Regular,account.data_account_type_asset,,FALSE,
-A12122,A12122,機械及び装置物減償累計額,A1212,Regular,account.data_account_type_asset,,FALSE,
-A1213,A1213,工具、機器及び備品(純額),A121,View,account.account_type_asset_view1,,FALSE,
-A12131,A12131,工具、機器及び備品,A1213,Regular,account.data_account_type_asset,,FALSE,
-A12132,A12132,工具、機器及び備品減償累計額,A1213,Regular,account.data_account_type_asset,,FALSE,
-A12141,A12141,土地,A121,Regular,account.data_account_type_asset,,FALSE,
-A122,A122,無形固定資産,A12,View,account.account_type_asset_view1,,FALSE,
-A1221,A1221,ソフトウェア,A122,Regular,account.data_account_type_asset,,FALSE,
-A1222,A1222,ソフトウェア仮勘定,A122,Regular,account.data_account_type_asset,,FALSE,
-A1223,A1223,その他無形固定資産,A122,Regular,account.data_account_type_asset,,FALSE,
-A123,A123,投資その他資産,A12,View,account.account_type_asset_view1,,FALSE,
-A12301,A12301,投資有価証券,A123,Regular,account.data_account_type_asset,,FALSE,
-A12302,A12302,関係会社株式,A123,Regular,account.data_account_type_asset,,FALSE,
-A12303,A12303,長期貸付金,A123,Regular,account.data_account_type_asset,,FALSE,
-A13,A13,繰延資産,A1,View,account.account_type_asset_view1,,FALSE,
-A13001,A13001,創立費,A13,Regular,account.data_account_type_asset,,FALSE,
-A2,A2,負債の部,A,View,account.account_type_liability_view1,,FALSE,
-A21,A21,流動負債,A2,View,account.account_type_liability_view1,,FALSE,
-A212,A212,買掛金等,A21,View,account.account_type_liability_view1,,FALSE,
-A21211,A21211,買掛金,A212,Payable,account.data_account_type_payable,,TRUE,
-A21212,A21212,買掛金(USD),A212,Payable,account.data_account_type_payable,,TRUE,base.USD
-A21215,A21215,支払手形,A212,Payable,account.data_account_type_payable,,TRUE,
-A21219,A21219,入庫請求仮,A212,Regular,account.data_account_type_payable,,FALSE,
-A213,A213,短期借入金等,A212,Payable,account.data_account_type_payable,,TRUE,
-A21301,A21301,短期借入金,A21,Payable,account.data_account_type_payable,,TRUE,
-A21302,A21302,一年以内返済長期借入金,A21,Payable,account.data_account_type_payable,,TRUE,
-A214,A214,未払金等,A21,View,account.account_type_liability_view1,,FALSE,
-A21401,A21401,未払金,A214,Payable,account.data_account_type_payable,,TRUE,
-A21404,A21404,未払金(クレジット),A214,Payable,account.data_account_type_payable,,TRUE,
-A21407,A21407,未払配当金,A214,Payable,account.data_account_type_payable,,TRUE,
-A21501,A21501,未払費用,A21,Regular,account.data_account_type_liability,,FALSE,
-A21601,A21601,未払法人税等,A21,Regular,account.conf_account_type_tax,,FALSE,
-A218,A218,その他流動負債,A21,View,account.account_type_liability_view1,,FALSE,
-A21802,A21802,前受金,A218,Regular,account.data_account_type_liability,,FALSE,
-A21803,A21803,預り金,A218,Regular,account.data_account_type_liability,,FALSE,
-A21804,A21804,仮受金,A218,Regular,account.data_account_type_liability,,FALSE,
-A21806,A21806,賞与引当金,A218,Regular,account.data_account_type_liability,,FALSE,
-A21807,A21807,仮受消費税,A218,Regular,account.conf_account_type_tax,,FALSE,
-A22,A22,固定負債,A2,View,account.account_type_liability_view1,,FALSE,
-A22001,A22001,社債,A22,Regular,account.data_account_type_liability,,FALSE,
-A22002,A22002,長期借入金,A22,Regular,account.data_account_type_liability,,FALSE,
-A22005,A22005,退職給付引当金,A22,Regular,account.data_account_type_liability,,FALSE,
-A3,A3,純資産の部,A,View,account.account_type_liability_view1,,FALSE,
-A31,A31,株主資本,A3,View,account.account_type_liability_view1,,FALSE,
-A31001,A31001,資本金,A31,Regular,account.conf_account_type_equity,,FALSE,
-A32,A32,資本剰余金,A3,View,account.account_type_liability_view1,,FALSE,
-A32101,A32101,資本準備金,A32,Regular,account.conf_account_type_equity,,FALSE,
-A32109,A32109,その他資本剰余金,A32,Regular,account.conf_account_type_equity,,FALSE,
-A33,A33,利益剰余金,A3,View,account.account_type_liability_view1,,FALSE,
-A33101,A33101,利益準備金,A33,Regular,account.conf_account_type_equity,,FALSE,
-A332,A332,その他利益剰余金,A33,View,account.account_type_liability_view1,,FALSE,
-A33202,A33202,特別償却準備金,A332,Regular,account.conf_account_type_equity,,FALSE,
-A33204,A33204,任意積立金,A332,Regular,account.conf_account_type_equity,,FALSE,
-A33209,A33209,繰越利益剰余金,A332,Regular,account.conf_account_type_equity,,FALSE,
-B,B,損益計算書,COM0,View,account.data_account_type_view,,FALSE,
-B4,B4,売上総利益,B,View,account.account_type_income_view1,,FALSE,
-B41001,B41001,売上高,B4,Regular,account.data_account_type_income,,FALSE,
-B42001,B42001,売上原価,B4,Regular,account.data_account_type_income,,FALSE,
-B42091,B42091,購買価格差異,B4,Regular,account.data_account_type_income,,FALSE,
-B42092,B42092,棚卸調整,B4,Regular,account.data_account_type_income,,FALSE,
-B5,B5,販売費及び一般管理費,B,View,account.account_type_expense_view1,,FALSE,
-B50011,B50011,貸倒引当金繰入額,B5,Regular,account.data_account_type_expense,,FALSE,
-B50041,B50041,役員報酬,B5,Regular,account.data_account_type_expense,,FALSE,
-B50071,B50071,給料及び手当,B5,Regular,account.data_account_type_expense,,FALSE,
-B50081,B50081,賞与,B5,Regular,account.data_account_type_expense,,FALSE,
-B50091,B50091,退職金,B5,Regular,account.data_account_type_expense,,FALSE,
-B50111,B50111,賞与引当金繰入,B5,Regular,account.data_account_type_expense,,FALSE,
-B50131,B50131,退職給付引当金繰入,B5,Regular,account.data_account_type_expense,,FALSE,
-B50151,B50151,法定福利費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50161,B50161,福利厚生費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50171,B50171,保険料,B5,Regular,account.data_account_type_expense,,FALSE,
-B50191,B50191,外注費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50211,B50211,荷造運賃,B5,Regular,account.data_account_type_expense,,FALSE,
-B50221,B50221,棚卸減耗費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50231,B50231,商品評価損,B5,Regular,account.data_account_type_expense,,FALSE,
-B50241,B50241,地代家賃,B5,Regular,account.data_account_type_expense,,FALSE,
-B50251,B50251,リース料,B5,Regular,account.data_account_type_expense,,FALSE,
-B50271,B50271,広告宣伝費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50281,B50281,通信費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50311,B50311,消耗品費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50341,B50341,旅費交通費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50371,B50371,交際費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50401,B50401,支払手数料,B5,Regular,account.data_account_type_expense,,FALSE,
-B50431,B50431,諸会費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50461,B50461,新聞図書費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50491,B50491,租税公課,B5,Regular,account.data_account_type_expense,,FALSE,
-B50511,B50511,水道光熱費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50521,B50521,会議費,B5,Regular,account.data_account_type_expense,,FALSE,
-B50551,B50551,雑費,B5,Regular,account.data_account_type_expense,,FALSE,
-B61,B61,営業外収益,B,View,account.account_type_income_view1,,FALSE,
-B61101,B61101,受取利息,B61,Regular,account.data_account_type_income,,FALSE,
-B61201,B61201,受取配当金,B61,Regular,account.data_account_type_income,,FALSE,
-B61401,B61401,未実現為替差益,B61,Regular,account.data_account_type_income,,FALSE,
-B61501,B61501,実現為替差益,B61,Regular,account.data_account_type_income,,FALSE,
-B61601,B61601,投資有価証券売却益(外益),B61,Regular,account.data_account_type_income,,FALSE,
-B61602,B61602,投資有価証券評価益(外益),B61,Regular,account.data_account_type_income,,FALSE,
-B61801,B61801,雑収入,B61,Regular,account.data_account_type_income,,FALSE,
-B62,B62,営業外費用,B,View,account.account_type_expense_view1,,FALSE,
-B62101,B62101,支払利息,B62,Regular,account.data_account_type_expense,,FALSE,
-B62201,B62201,創立費償却,B62,Regular,account.data_account_type_expense,,FALSE,
-B62401,B62401,未実現為替差損,B62,Regular,account.data_account_type_expense,,FALSE,
-B62402,B62402,実現為替差損,B62,Regular,account.data_account_type_expense,,FALSE,
-B62601,B62601,投資有価証券売却損(外損),B62,Regular,account.data_account_type_expense,,FALSE,
-B62602,B62602,投資有価証券評価損(外損),B62,Regular,account.data_account_type_expense,,FALSE,
-B62801,B62801,雑費用,B62,Regular,account.data_account_type_expense,,FALSE,
-B71,B71,特別利益,B,View,account.account_type_income_view1,,FALSE,
-B71101,B71101,固定資産売却益,B71,Regular,account.data_account_type_income,,FALSE,
-B71102,B71102,固定資産評価益,B71,Regular,account.data_account_type_income,,FALSE,
-B71201,B71201,投資有価証券売却益(特益),B71,Regular,account.data_account_type_income,,FALSE,
-B71202,B71202,投資有価証券評価益(特益),B71,Regular,account.data_account_type_income,,FALSE,
-B72,B72,特別損失,B,View,account.account_type_expense_view1,,FALSE,
-B72101,B72101,固定資産売却損,B72,Regular,account.data_account_type_expense,,FALSE,
-B72102,B72102,固定資産評価損,B72,Regular,account.data_account_type_expense,,FALSE,
-B72201,B72201,投資有価証券売却損(特損),B72,Regular,account.data_account_type_expense,,FALSE,
-B72202,B72202,投資有価証券評価損(特損),B72,Regular,account.data_account_type_expense,,FALSE,
-B8,B8,法人税等,B,View,account.account_type_expense_view1,,FALSE,
-B80101,B80101,法人税、住民税及び事業税,B8,Regular,account.data_account_type_expense,,FALSE,
-B90001,B90001,期間利益,B,Regular,account.data_account_type_expense,,FALSE,
+id,code,name,user_type_id/id,tax_ids/id,reconcile,currency_id/id,chart_template_id/id
+A11101,A11101,普通預金,account.data_account_type_liquidity,,FALSE,,l10n_jp1
+A11103,A11103,定期預金,account.data_account_type_liquidity,,FALSE,,l10n_jp1
+A11211,A11211,売掛金,account.data_account_type_receivable,,TRUE,,l10n_jp1
+A11212,A11212,売掛金(USD),account.data_account_type_receivable,,TRUE,base.USD,l10n_jp1
+A11215,A11215,受取手形,account.data_account_type_receivable,,TRUE,,l10n_jp1
+A11216,A11216,割引手形,account.data_account_type_receivable,,TRUE,,l10n_jp1
+A11219,A11219,出庫請求仮,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11301,A11301,未収収益,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11401,A11401,有価証券,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11501,A11501,商品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11503,A11503,製品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11504,A11504,仕掛品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11505,A11505,原材料,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11506,A11506,資材,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11503,A11503,積送品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11601,A11601,未収金,account.data_account_type_receivable,,TRUE,,l10n_jp1
+A11802,A11802,前渡金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11804,A11804,前払費用,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11805,A11805,立替金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11806,A11806,仮払金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11807,A11807,仮払消費税,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11901,A11901,貸倒引当金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12111,A12111,建物及び構築物,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12112,A12112,建物及び構築物減償累計額,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12121,A12121,機械及び装置,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12122,A12122,機械及び装置物減償累計額,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12131,A12131,工具、機器及び備品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12132,A12132,工具、機器及び備品減償累計額,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12141,A12141,土地,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A1221,A1221,ソフトウェア,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A1222,A1222,ソフトウェア仮勘定,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A1223,A1223,その他無形固定資産,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12301,A12301,投資有価証券,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12302,A12302,関係会社株式,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A12303,A12303,長期貸付金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A13001,A13001,創立費,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A21211,A21211,買掛金,account.data_account_type_payable,,TRUE,,l10n_jp1
+A21212,A21212,買掛金(USD),account.data_account_type_payable,,TRUE,base.USD,l10n_jp1
+A21215,A21215,支払手形,account.data_account_type_payable,,TRUE,,l10n_jp1
+A21219,A21219,入庫請求仮,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A213,A213,短期借入金等,account.data_account_type_payable,,TRUE,,l10n_jp1
+A21301,A21301,短期借入金,account.data_account_type_payable,,TRUE,,l10n_jp1
+A21302,A21302,一年以内返済長期借入金,account.data_account_type_payable,,TRUE,,l10n_jp1
+A21401,A21401,未払金,account.data_account_type_payable,,TRUE,,l10n_jp1
+A21404,A21404,未払金(クレジット),account.data_account_type_payable,,TRUE,,l10n_jp1
+A21407,A21407,未払配当金,account.data_account_type_payable,,TRUE,,l10n_jp1
+A21501,A21501,未払費用,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A21601,A21601,未払法人税等,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A21802,A21802,前受金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A21803,A21803,預り金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A21804,A21804,仮受金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A21806,A21806,賞与引当金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A21807,A21807,仮受消費税,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A22001,A22001,社債,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A22002,A22002,長期借入金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A22005,A22005,退職給付引当金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
+A31001,A31001,資本金,account.data_account_type_equity,,FALSE,,l10n_jp1
+A32101,A32101,資本準備金,account.data_account_type_equity,,FALSE,,l10n_jp1
+A32109,A32109,その他資本剰余金,account.data_account_type_equity,,FALSE,,l10n_jp1
+A33101,A33101,利益準備金,account.data_account_type_equity,,FALSE,,l10n_jp1
+A33202,A33202,特別償却準備金,account.data_account_type_equity,,FALSE,,l10n_jp1
+A33204,A33204,任意積立金,account.data_account_type_equity,,FALSE,,l10n_jp1
+A33209,A33209,繰越利益剰余金,account.data_account_type_equity,,FALSE,,l10n_jp1
+B41001,B41001,売上高,account.data_account_type_revenue,,FALSE,,l10n_jp1
+B42001,B42001,売上原価,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B42091,B42091,購買価格差異,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B42092,B42092,棚卸調整,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B50011,B50011,貸倒引当金繰入額,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50041,B50041,役員報酬,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50071,B50071,給料及び手当,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50081,B50081,賞与,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50091,B50091,退職金,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50111,B50111,賞与引当金繰入,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50131,B50131,退職給付引当金繰入,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50151,B50151,法定福利費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50161,B50161,福利厚生費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50171,B50171,保険料,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50191,B50191,外注費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50211,B50211,荷造運賃,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50221,B50221,棚卸減耗費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50231,B50231,商品評価損,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50241,B50241,地代家賃,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50251,B50251,リース料,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50271,B50271,広告宣伝費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50281,B50281,通信費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50311,B50311,消耗品費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50341,B50341,旅費交通費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50371,B50371,交際費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50401,B50401,支払手数料,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50431,B50431,諸会費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50461,B50461,新聞図書費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50491,B50491,租税公課,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50511,B50511,水道光熱費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50521,B50521,会議費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B50551,B50551,雑費,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B61101,B61101,受取利息,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B61201,B61201,受取配当金,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B61401,B61401,未実現為替差益,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B61501,B61501,実現為替差益,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B61601,B61601,投資有価証券売却益(外益),account.data_account_type_other_income,,FALSE,,l10n_jp1
+B61602,B61602,投資有価証券評価益(外益),account.data_account_type_other_income,,FALSE,,l10n_jp1
+B61801,B61801,雑収入,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B62101,B62101,支払利息,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B62201,B62201,創立費償却,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B62401,B62401,未実現為替差損,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B62402,B62402,実現為替差損,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B62601,B62601,投資有価証券売却損(外損),account.data_account_type_expenses,,FALSE,,l10n_jp1
+B62602,B62602,投資有価証券評価損(外損),account.data_account_type_expenses,,FALSE,,l10n_jp1
+B62801,B62801,雑費用,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B71101,B71101,固定資産売却益,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B71102,B71102,固定資産評価益,account.data_account_type_other_income,,FALSE,,l10n_jp1
+B71201,B71201,投資有価証券売却益(特益),account.data_account_type_other_income,,FALSE,,l10n_jp1
+B71202,B71202,投資有価証券評価益(特益),account.data_account_type_other_income,,FALSE,,l10n_jp1
+B72101,B72101,固定資産売却損,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B72102,B72102,固定資産評価損,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B72201,B72201,投資有価証券売却損(特損),account.data_account_type_expenses,,FALSE,,l10n_jp1
+B72202,B72202,投資有価証券評価損(特損),account.data_account_type_expenses,,FALSE,,l10n_jp1
+B80101,B80101,法人税、住民税及び事業税,account.data_account_type_expenses,,FALSE,,l10n_jp1
+B90001,B90001,期間利益,account.data_account_type_expenses,,FALSE,,l10n_jp1
diff --git a/addons/l10n_jp/data/account.chart.template.csv b/addons/l10n_jp/data/account.chart.template.csv
deleted file mode 100644
index 8488d0445aa..00000000000
--- a/addons/l10n_jp/data/account.chart.template.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,account_root_id/id,tax_code_root_id/id,bank_account_view_id/id,property_account_receivable/id,property_account_payable/id,property_account_expense_categ/id,property_account_income_categ/id,property_account_expense/id,property_account_income/id
-l10n_jp1,日本勘定設定テンプレート,COM0,jpt_root,A111,A11211,A21211,A21219,B41001,A21219,B41001
diff --git a/addons/l10n_jp/data/account.tax.code.template.csv b/addons/l10n_jp/data/account.tax.code.template.csv
deleted file mode 100644
index 71bf73cff47..00000000000
--- a/addons/l10n_jp/data/account.tax.code.template.csv
+++ /dev/null
@@ -1,20 +0,0 @@
-id,name,parent_id/id,code,notprintable,sign
-jpt_root,日本税チャート,,,FALSE,1
-jpt_tax_code_balance_net,支払対象税額,jpt_root,,FALSE,1
-jpt_tax_code_input,仮受税額,jpt_tax_code_balance_net,,FALSE,-1
-jpt_tax_code_input_A,仮受消費税(8%),jpt_tax_code_input,,FALSE,1
-jpt_tax_code_input_X,免税,jpt_tax_code_input,,FALSE,1
-jpt_tax_code_input_O,不課税,jpt_tax_code_input,,FALSE,1
-jpt_tax_code_output,仮払税額,jpt_tax_code_balance_net,,FALSE,1
-jpt_tax_code_output_A,仮払消費税(8%),jpt_tax_code_output,,FALSE,1
-jpt_tax_code_output_I,輸入,jpt_tax_code_output,,FALSE,1
-jpt_tax_code_output_O,不課税,jpt_tax_code_output,,FALSE,1
-jpt_tax_code_base_net,税計算基準額,jpt_root,,FALSE,1
-jpt_tax_code_base_sales,販売基準額,jpt_tax_code_base_net,,FALSE,1
-jpt_tax_code_sales_A,課税対象売上(8%),jpt_tax_code_base_sales,,FALSE,1
-jpt_tax_code_sales_X,免税売上,jpt_tax_code_base_sales,,FALSE,1
-jpt_tax_code_sales_O,不課税売上,jpt_tax_code_base_sales,,FALSE,1
-jpt_tax_code_base_purchases,購買基準額,jpt_tax_code_base_net,,FALSE,1
-jpt_tax_code_purch_A,課税対象仕入(8%),jpt_tax_code_base_purchases,,FALSE,1
-jpt_tax_code_purch_I,輸入仕入,jpt_tax_code_base_purchases,,FALSE,1
-jpt_tax_code_purch_O,不課税仕入,jpt_tax_code_base_purchases,,FALSE,1
diff --git a/addons/l10n_jp/data/account.tax.template.csv b/addons/l10n_jp/data/account.tax.template.csv
index d029c0d41e0..3d4fc6e2320 100644
--- a/addons/l10n_jp/data/account.tax.template.csv
+++ b/addons/l10n_jp/data/account.tax.template.csv
@@ -1,9 +1,9 @@
-id,name,description,chart_template_id/id,type_tax_use,type,amount,price_include,sequence,include_base_amount,account_collected_id/id,base_code_id/id,base_sign,tax_code_id/id,tax_sign,account_paid_id/id,ref_base_code_id/id,ref_base_sign,ref_tax_code_id/id,ref_tax_sign,child_depend
-tax_in_e,仮受消費税(外),,l10n_jp1,sale,percent,0.08,FALSE,1,FALSE,A11807,jpt_tax_code_sales_A,1,jpt_tax_code_input_A,1,A11807,jpt_tax_code_sales_A,1,jpt_tax_code_input_A,1,FALSE
-tax_in_i,仮受消費税(内),,l10n_jp1,sale,percent,0.08,TRUE,1,FALSE,A11807,jpt_tax_code_sales_A,1,jpt_tax_code_input_A,1,A11807,jpt_tax_code_sales_A,1,jpt_tax_code_input_A,1,FALSE
-tax_in_x,輸出免税,,l10n_jp1,sale,percent,,FALSE,1,FALSE,,jpt_tax_code_sales_X,1,jpt_tax_code_input_X,1,,jpt_tax_code_sales_X,1,jpt_tax_code_input_X,1,FALSE
-tax_in_o,非課税販売,,l10n_jp1,sale,percent,,FALSE,1,FALSE,,jpt_tax_code_sales_O,1,jpt_tax_code_input_O,1,,jpt_tax_code_sales_O,1,jpt_tax_code_input_O,1,FALSE
-tax_out_e,仮払消費税(外),,l10n_jp1,purchase,percent,0.08,FALSE,1,FALSE,A21807,jpt_tax_code_purch_A,1,jpt_tax_code_output_A,1,A21807,jpt_tax_code_purch_A,1,jpt_tax_code_output_A,1,FALSE
-tax_out_i,仮払消費税(内),,l10n_jp1,purchase,percent,0.08,TRUE,1,FALSE,A21807,jpt_tax_code_purch_A,1,jpt_tax_code_output_A,1,A21807,jpt_tax_code_purch_A,1,jpt_tax_code_output_A,1,FALSE
-tax_out_im,海外仕入,,l10n_jp1,purchase,percent,,FALSE,1,FALSE,,jpt_tax_code_purch_I,1,jpt_tax_code_output_I,1,,jpt_tax_code_purch_I,1,jpt_tax_code_output_I,1,FALSE
-tax_out_o,非課税購買,,l10n_jp1,purchase,percent,,FALSE,1,FALSE,,jpt_tax_code_purch_O,1,jpt_tax_code_output_O,1,,jpt_tax_code_purch_O,1,jpt_tax_code_output_O,1,FALSE
+id,name,description,chart_template_id/id,type_tax_use,amount_type,amount,price_include,sequence,include_base_amount,account_id/id,refund_account_id/id,tag_ids/id
+tax_in_e,仮受消費税(外),仮受消費税(外),l10n_jp1,sale,percent,8,FALSE,1,FALSE,A21219,A21219,tax_tag_01
+tax_in_i,仮受消費税(内),仮受消費税(内),l10n_jp1,sale,percent,8,TRUE,1,FALSE,A21219,A21219,tax_tag_02
+tax_in_x,輸出免税,輸出免税,l10n_jp1,sale,percent,,FALSE,1,FALSE,A21219,A21219,tax_tag_05
+tax_in_o,非課税販売,非課税販売,l10n_jp1,sale,percent,,FALSE,1,FALSE,A21219,A21219,tax_tag_06
+tax_out_e,仮払消費税(外),仮払消費税(外),l10n_jp1,purchase,percent,8,FALSE,1,FALSE,A21807,A21807,tax_tag_03
+tax_out_i,仮払消費税(内),仮払消費税(内),l10n_jp1,purchase,percent,8,TRUE,1,FALSE,A21807,A21807,tax_tag_04
+tax_out_im,海外仕入,海外仕入,l10n_jp1,purchase,percent,,FALSE,1,FALSE,,,tax_tag_07
+tax_out_o,非課税購買,非課税購買,l10n_jp1,purchase,percent,,FALSE,1,FALSE,,,tax_tag_08
diff --git a/addons/l10n_jp/data/account_chart_template.xml b/addons/l10n_jp/data/account_chart_template.xml
new file mode 100644
index 00000000000..595d72b772b
--- /dev/null
+++ b/addons/l10n_jp/data/account_chart_template.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+ A11109
+ 振替口座
+
+
+
+
+ 日本勘定設定テンプレート
+ 7
+ A11102
+ A11105
+
+
+
+
+
+
+
+
+
+ 仮受消費税(外)
+ taxes
+
+
+ 仮受消費税(内)
+ taxes
+
+
+ 仮払消費税(外)
+ taxes
+
+
+ 仮払消費税(内)
+ taxes
+
+
+ 輸出免税
+ taxes
+
+
+ 非課税販売
+ taxes
+
+
+ 海外仕入
+ taxes
+
+
+ 非課税購買
+ taxes
+
+
diff --git a/addons/l10n_jp/data/account_chart_template.yml b/addons/l10n_jp/data/account_chart_template.yml
new file mode 100644
index 00000000000..a95927840ce
--- /dev/null
+++ b/addons/l10n_jp/data/account_chart_template.yml
@@ -0,0 +1,3 @@
+-
+ !python {model: account.chart.template, id: l10n_jp1}: |
+ self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_jp/data/account_chart_template_after.xml b/addons/l10n_jp/data/account_chart_template_after.xml
new file mode 100644
index 00000000000..b5e73af7a02
--- /dev/null
+++ b/addons/l10n_jp/data/account_chart_template_after.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+