From 1850ebe33a6db0f788d78754894a5cdc149b7590 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Dec 2014 01:41:49 +0100 Subject: [PATCH 1/2] VAT setup for canada was rong --- htdocs/langs/en_CA/admin.lang | 5 +++++ htdocs/langs/en_CA/companies.lang | 5 +++++ htdocs/langs/en_CA/main.lang | 28 ++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 htdocs/langs/en_CA/admin.lang create mode 100644 htdocs/langs/en_CA/companies.lang create mode 100644 htdocs/langs/en_CA/main.lang diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang new file mode 100644 index 00000000000..cee56c0f791 --- /dev/null +++ b/htdocs/langs/en_CA/admin.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - admin +VATManagement=GST Management +LocalTax1IsUsedDesc=Use a second tax (PST) +LocalTax1IsNotUsedDesc=Do not use second tax (PST) +LocalTax1Management=PST Management diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang new file mode 100644 index 00000000000..985f125d7de --- /dev/null +++ b/htdocs/langs/en_CA/companies.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - companies +VATIsUsed=GST is used +VATIsNotUsed=GST is not use +LocalTax1IsUsedES=PST is used +LocalTax1IsNotUsedES=GST is not used diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang new file mode 100644 index 00000000000..fca2906cd12 --- /dev/null +++ b/htdocs/langs/en_CA/main.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=, +SeparatorThousand=None +FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y +FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d.%m.%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M +ErrorNoVATRateDefinedForSellerCountry=Error, no vat rate defined for country '%s'. +AmountVAT=Amount GST +AmountLT1=Amount PST +TotalVAT=Total GST +TotalLT1=Total PST +IncludedVAT=Including GST +VAT=GST +VATRate=GST rate From 174428ad3145991d8e2afb51af784d826da55c1f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Dec 2014 01:55:03 +0100 Subject: [PATCH 2/2] Data init for canada vat --- htdocs/install/mysql/data/llx_c_tva.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 01d2894bca6..a2e1cb6bbb3 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -66,7 +66,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2 -- CANADA (id country=14) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14, '7','0','VAT standard rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14, '0','0','VAT Rate 0',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','TPS and TVQ rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Province',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (144, 14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (149, 14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1); -- CAMEROUN (id country=24)