From 51b7168d1bceddcf41d021479a36cc93c485a5c5 Mon Sep 17 00:00:00 2001 From: Olivier Colson Date: Fri, 28 Sep 2018 10:30:58 +0200 Subject: [PATCH 1/4] [FIX] l10n_lu: rename duplicate tax xml id The second tax with the same xml id was never created, and caused a psql error to be logged. --- addons/l10n_lu/account.tax.template-2015.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_lu/account.tax.template-2015.csv b/addons/l10n_lu/account.tax.template-2015.csv index 704a943502e..4eb2d74b274 100644 --- a/addons/l10n_lu/account.tax.template-2015.csv +++ b/addons/l10n_lu/account.tax.template-2015.csv @@ -404,5 +404,5 @@ lu_2015_tax_VP-PA-17,Vente Prestations 17% - Pays,VP-PA-17,sale,percent,17,lu_20 lu_2011_tax_VP-PA-3,Vente Prestations 3% - Pays,VP-PA-3,sale,percent,3,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,503,,"tag_lu_281,tag_lu_203" 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_purchase,Sans Taxes,SANS,purchase,percent,0,,,lu_2011_chart_1,506,,tag_lu_598 +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 From 7c9a3840f871eed3f761b461d6866494f7765aad Mon Sep 17 00:00:00 2001 From: Olivier Colson Date: Fri, 28 Sep 2018 10:38:01 +0200 Subject: [PATCH 2/4] [FIX] l10n_jp: remove duplicate account code Two account had the same account code. Because of that, one of them always failed to be created and logged a psql error. To fix that, we totally remove this account, as it never got created anyway. --- addons/l10n_jp/data/account.account.template.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/l10n_jp/data/account.account.template.csv b/addons/l10n_jp/data/account.account.template.csv index ec2f2984771..671b57d5ad2 100644 --- a/addons/l10n_jp/data/account.account.template.csv +++ b/addons/l10n_jp/data/account.account.template.csv @@ -9,7 +9,6 @@ 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 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 From 22cd49bafbfa51ca3c661a527d4bd0ae46c43720 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Fri, 28 Sep 2018 12:06:18 +0200 Subject: [PATCH 3/4] =?UTF-8?q?[IMP]=20l10n=5Fjp:=20reintroduce=20account?= =?UTF-8?q?=20=E8=A3=BD=E5=93=81=20with=20correct=20account=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/l10n_jp/data/account.account.template.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/l10n_jp/data/account.account.template.csv b/addons/l10n_jp/data/account.account.template.csv index 671b57d5ad2..f7046bf9915 100644 --- a/addons/l10n_jp/data/account.account.template.csv +++ b/addons/l10n_jp/data/account.account.template.csv @@ -9,6 +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 +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 From 70028701b3907ccc65f06cde5800619d7507aa5c Mon Sep 17 00:00:00 2001 From: Olivier Colson Date: Fri, 28 Sep 2018 12:16:25 +0200 Subject: [PATCH 4/4] [IMP] l10n_lu: make 9.0 fix match the one done by mat in 11.5 --- addons/l10n_lu/account.tax.template-2015.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_lu/account.tax.template-2015.csv b/addons/l10n_lu/account.tax.template-2015.csv index 4eb2d74b274..75bc07098eb 100644 --- a/addons/l10n_lu/account.tax.template-2015.csv +++ b/addons/l10n_lu/account.tax.template-2015.csv @@ -404,5 +404,5 @@ lu_2015_tax_VP-PA-17,Vente Prestations 17% - Pays,VP-PA-17,sale,percent,17,lu_20 lu_2011_tax_VP-PA-3,Vente Prestations 3% - Pays,VP-PA-3,sale,percent,3,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,503,,"tag_lu_281,tag_lu_203" 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_purchase,Sans Taxes,SANS,purchase,percent,0,,,lu_2011_chart_1,506,,tag_lu_598 +lu_2015_tax_SANS,Sans Taxes,SANS,purchase,percent,0,,,lu_2011_chart_1,506,,tag_lu_598 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