lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20318 from Achicken7301/develop

Browse Source 
Vietnam date format, VAT rates
This commit is contained in:
Laurent Destailleur 2022-03-16 22:22:20 +01:00 committed by GitHub
commit ef19769249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,6 +391,11 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (23
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2322,232, '12','0','VAT 12%',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2322,232, '12','0','VAT 12%',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2323,232, '8','0','VAT 8%',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2323,232, '8','0','VAT 8%',1);
-- VIETNAM (id country=233)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2331,233, '0','0','Thuế GTGT đươc khấu trừ 0%',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2332,233, '5','0','Thuế GTGT đươc khấu trừ 5%',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2333,233, '8','0','Thuế GTGT đươc khấu trừ 8%',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2334,233, '10','0','Thuế GTGT đươc khấu trừ 10%',1);
-- Example of code to insert a VAT rate 0 for each country -- Example of code to insert a VAT rate 0 for each country
--delete from llx_c_tva where rowid = 1181; -- to delete a record that does not follow rules for rowid (fk_pays+'1') --delete from llx_c_tva where rowid = 1181; -- to delete a record that does not follow rules for rowid (fk_pays+'1')
--insert into llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) SELECT CONCAT(c.rowid, '1'), c.rowid, 0, 0, 'No VAT', 1 from llx_c_country as c where c.rowid not in (select fk_pays from llx_c_tva); --insert into llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) SELECT CONCAT(c.rowid, '1'), c.rowid, 0, 0, 'No VAT', 1 from llx_c_country as c where c.rowid not in (select fk_pays from llx_c_tva);

16
htdocs/langs/vi_VN/main.lang
View File

@ -8,19 +8,19 @@ FONTFORPDF=DejaVuSans
FONTSIZEFORPDF=10 FONTSIZEFORPDF=10
SeparatorDecimal=. SeparatorDecimal=.
SeparatorThousand=, SeparatorThousand=,
FormatDateShort=%m/%d/%Y FormatDateShort=%d/%m/%Y
FormatDateShortInput=%m/%d/%Y FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=MM/dd/yyyy FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=MM/dd/yyyy FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=mm/dd/yy FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=mm/dd/yy FormatDateShortJQueryInput=dd/mm/yy
FormatHourShortJQuery=HH:MI FormatHourShortJQuery=HH:MI
FormatHourShort=%I:%M %p FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y FormatDateTextShort=%b %d, %Y
FormatDateText=%B %d, %Y FormatDateText=%B %d, %Y
FormatDateHourShort=%m/%d/%Y %I:%M %p FormatDateHourShort=%d/%m/%Y %I:%M %p
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
FormatDateHourTextShort=%b %d, %Y, %I:%M %p FormatDateHourTextShort=%b %d, %Y, %I:%M %p
FormatDateHourText=%B %d, %Y, %I:%M %p FormatDateHourText=%B %d, %Y, %I:%M %p
DatabaseConnection=Kết nối cơ sở dữ liệu DatabaseConnection=Kết nối cơ sở dữ liệu