Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7

Browse Source
This commit is contained in:
Laurent Destailleur
2014-12-17 01:56:52 +01:00
parent 849628f020 81437d8277
commit d98f36bd8f
5 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/install/mysql/data/llx_c_tva.sql
View File

@@ -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)

5
htdocs/langs/en_CA/admin.lang Normal file
View File

@@ -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

5
htdocs/langs/en_CA/companies.lang Normal file
View File

@@ -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

28
htdocs/langs/en_CA/main.lang Normal file
View File

@@ -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

1
htdocs/langs/en_US/languages.lang
View File

@@ -13,6 +13,7 @@ Language_de_AT=German (Austria)
Language_de_CH=German (Switzerland)
Language_el_GR=Greek
Language_en_AU=English (Australia)
Language_en_CA=English (Canada)
Language_en_GB=English (United Kingdom)
Language_en_IN=English (India)
Language_en_NZ=English (New Zealand)