[MERGE] forward port branch saas-14 up to 503c7a3d

addons/l10n_jp/data/account.account.template.csv

@@ -9,7 +9,7 @@ A11219,A11219,出庫請求仮,account.data_account_type_current_assets,,FALSE,,l
 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
+A11502,A11502,製品,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

addons/l10n_lu/data/account.tax.template-2015.csv

@@ -405,4 +405,4 @@ lu_2011_tax_VP-PA-3,Vente Prestations 3% - Pays,VP-PA-3,sale,percent,3,lu_2011_a
 lu_2011_tax_VP-PA-6,Vente Prestations 6% - Pays,VP-PA-6,sale,percent,6,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,504,,"tag_lu_200,tag_lu_278"
 lu_2015_tax_VP-PA-8,Vente Prestations 8% - Pays,VP-PA-8,sale,percent,8,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,505,,"tag_lu_294,tag_lu_218"
 lu_2015_tax_SANS,Sans Taxes,SANS,purchase,percent,0,,,lu_2011_chart_1,506,,tag_lu_598
-lu_2015_tax_SANS,Sans Taxes,SANS,sale,percent,0,,,lu_2011_chart_1,507,,tag_lu_598
\ No newline at end of file
+lu_2015_tax_SANS_sale,Sans Taxes,SANS,sale,percent,0,,,lu_2011_chart_1,507,,tag_lu_598
\ No newline at end of file