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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2012-01-01 22:45:42 +01:00
commit 9d674ad044
5 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14, 1, '5.5','0','VAT reduced rate (France hors DOM-TOM)',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14, 1, '5.5','0','VAT reduced rate (France hors DOM-TOM)',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15, 1, '0','0','VAT Rate 0 ou non applicable',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15, 1, '0','0','VAT Rate 0 ou non applicable',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 16, 1, '2.1','0','VAT super-reduced rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 16, 1, '2.1','0','VAT super-reduced rate',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 17, 1, '7','0','VAT reduced rate',1);
-- GERMANY (id country=5) -- GERMANY (id country=5)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51, 5, '19','0','VAT standard rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51, 5, '19','0','VAT standard rate',1);

4
htdocs/langs/ca_ES/main.lang
View File

@ -247,10 +247,12 @@ Bytes=Bytes
KiloBytes=Kilobytes KiloBytes=Kilobytes
MegaBytes=Megabytes MegaBytes=Megabytes
GigaBytes=Gigabytes GigaBytes=Gigabytes
TeraBytes=Terabytes
b=b. b=b.
Kb=Kb Kb=Kb
Mb=Mb Mb=Mb
Gb=Gb Gb=Gb
Tb=Tb
Cut=Tallar Cut=Tallar
Copy=Copiar Copy=Copiar
Paste=Pegar Paste=Pegar
@ -596,6 +598,8 @@ IM=Missatgeria instantània
NewAttribute=Nou atribut NewAttribute=Nou atribut
AttributeCode=Codi atribut AttributeCode=Codi atribut
OptionalFieldsSetup=Configuració dels atributs opcionals OptionalFieldsSetup=Configuració dels atributs opcionals
URLPhoto=Url de la foto/logo
SetLinkToThirdParty=Vincular a un altre tercer
# Week day # Week day
Monday=Dilluns Monday=Dilluns

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

@ -599,6 +599,7 @@ NewAttribute=New attribute
AttributeCode=Attribute code AttributeCode=Attribute code
OptionalFieldsSetup=Extra attributes setup OptionalFieldsSetup=Extra attributes setup
URLPhoto=Url of photo/logo URLPhoto=Url of photo/logo
SetLinkToThirdParty=Link to another third party
# Week day # Week day
Monday=Monday Monday=Monday

4
htdocs/langs/es_ES/main.lang
View File

@ -247,10 +247,12 @@ Bytes=Bytes
KiloBytes=Kilobytes KiloBytes=Kilobytes
MegaBytes=Megabytes MegaBytes=Megabytes
GigaBytes=Gigabytes GigaBytes=Gigabytes
TeraBytes=Terabytes
b=b. b=b.
Kb=Kb Kb=Kb
Mb=Mb Mb=Mb
Gb=Gb Gb=Gb
Tb=Tb
Cut=Cortar Cut=Cortar
Copy=Copiar Copy=Copiar
Paste=Pegar Paste=Pegar
@ -596,6 +598,8 @@ IM=Mensajería instantánea
NewAttribute=Nuevo atributo NewAttribute=Nuevo atributo
AttributeCode=Código atributo AttributeCode=Código atributo
OptionalFieldsSetup=Configuración de los atributos opcionales OptionalFieldsSetup=Configuración de los atributos opcionales
URLPhoto=Url de la foto/logo
SetLinkToThirdParty=Vincular a otro tercero
# Week day # Week day
Monday=Lunes Monday=Lunes

1
htdocs/langs/fr_FR/main.lang
View File

@ -599,6 +599,7 @@ NewAttribute=Nouvel attribut
AttributeCode=Code de l'attribut AttributeCode=Code de l'attribut
OptionalFieldsSetup=Configuration des attributs complémentaires OptionalFieldsSetup=Configuration des attributs complémentaires
URLPhoto=Url vers photo/logo URLPhoto=Url vers photo/logo
SetLinkToThirdParty=Lier vers un autre tiers
# Week day # Week day
Monday=Lundi Monday=Lundi