From 700c3368f2246ed6d54bcc282dbb9f7082fc5fe4 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 21 Dec 2011 12:01:18 +0100 Subject: [PATCH 1/5] Trad: Fix missing translation of FACTURE_CHANGE_THIRDPARTY option --- htdocs/langs/ca_ES/main.lang | 1 + htdocs/langs/en_US/main.lang | 1 + htdocs/langs/es_ES/main.lang | 1 + htdocs/langs/fr_FR/main.lang | 1 + 4 files changed, 4 insertions(+) diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index ef9175c1374..75985feecf7 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -596,6 +596,7 @@ IM=Missatgeria instantània NewAttribute=Nou atribut AttributeCode=Codi atribut OptionalFieldsSetup=Configuració dels atributs opcionals +SetLinkToThirdParty=Vincular a un altre tercer # Week day Monday=Dilluns diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 7fa6e09d164..b2995093cfb 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -599,6 +599,7 @@ NewAttribute=New attribute AttributeCode=Attribute code OptionalFieldsSetup=Extra attributes setup URLPhoto=Url of photo/logo +SetLinkToThirdParty=Link Link to another third party # Week day Monday=Monday diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 81efeb2f7de..5ffa6abf205 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -596,6 +596,7 @@ IM=Mensajería instantánea NewAttribute=Nuevo atributo AttributeCode=Código atributo OptionalFieldsSetup=Configuración de los atributos opcionales +SetLinkToThirdParty=Vincular a otro tercero # Week day Monday=Lunes diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 1e224e608e0..56d027baa44 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -599,6 +599,7 @@ NewAttribute=Nouvel attribut AttributeCode=Code de l'attribut OptionalFieldsSetup=Configuration des attributs complémentaires URLPhoto=Url vers photo/logo +SetLinkToThirdParty=Lier vers un autre tiers # Week day Monday=Lundi From aa377ac240580a9825276dd47882ca7755d82e8b Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 21 Dec 2011 12:08:59 +0100 Subject: [PATCH 2/5] Trad: Fix missing translation --- htdocs/langs/ca_ES/main.lang | 3 +++ htdocs/langs/es_ES/main.lang | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 75985feecf7..43fc03d54dd 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -247,10 +247,12 @@ Bytes=Bytes KiloBytes=Kilobytes MegaBytes=Megabytes GigaBytes=Gigabytes +TeraBytes=Terabytes b=b. Kb=Kb Mb=Mb Gb=Gb +Tb=Tb Cut=Tallar Copy=Copiar Paste=Pegar @@ -596,6 +598,7 @@ IM=Missatgeria instantània NewAttribute=Nou atribut AttributeCode=Codi atribut OptionalFieldsSetup=Configuració dels atributs opcionals +URLPhoto=Url de la foto/logo SetLinkToThirdParty=Vincular a un altre tercer # Week day diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 5ffa6abf205..3dc65cbceb1 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_ES - main +# Dolibarr language file - es_ES - main CHARSET=UTF-8 DIRECTION=ltr SeparatorDecimal=, @@ -247,10 +247,12 @@ Bytes=Bytes KiloBytes=Kilobytes MegaBytes=Megabytes GigaBytes=Gigabytes +TeraBytes=Terabytes b=b. Kb=Kb Mb=Mb Gb=Gb +Tb=Tb Cut=Cortar Copy=Copiar Paste=Pegar @@ -596,6 +598,7 @@ IM=Mensajería instantánea NewAttribute=Nuevo atributo AttributeCode=Código atributo OptionalFieldsSetup=Configuración de los atributos opcionales +URLPhoto=Url de la foto/logo SetLinkToThirdParty=Vincular a otro tercero # Week day @@ -626,4 +629,4 @@ ShortWednesday=Mi ShortThursday=J ShortFriday=V ShortSaturday=S -ShortSunday=D +ShortSunday=D \ No newline at end of file From 863b8b2a62a6911e506cc242d948d91ddca8b2a3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 23 Dec 2011 19:43:19 +0100 Subject: [PATCH 3/5] Fix: add vat rate 7 for France --- htdocs/install/mysql/data/llx_c_tva.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index a96180c24d2..5039115f8e8 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -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 ( 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 ( 17, 1, '7','0','VAT reduced rate',1); -- 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); From 6bf31882b2ff61a4528adea9ca56619811296d79 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 23 Dec 2011 19:57:31 +0100 Subject: [PATCH 4/5] Update htdocs/langs/en_US/main.lang --- htdocs/langs/en_US/main.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index b2995093cfb..c1edb1e6ff1 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -599,7 +599,7 @@ NewAttribute=New attribute AttributeCode=Attribute code OptionalFieldsSetup=Extra attributes setup URLPhoto=Url of photo/logo -SetLinkToThirdParty=Link Link to another third party +SetLinkToThirdParty=Link to another third party # Week day Monday=Monday From 9df5d4408d71c66856c97900fbfda2bcbf6249a3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 31 Dec 2011 16:58:18 +0100 Subject: [PATCH 5/5] Fix: sql query error --- htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index 2f7f9be71fc..e1aea893fe6 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -478,7 +478,7 @@ ALTER TABLE llx_c_type_contact ADD COLUMN module varchar(32) NULL; ALTER TABLE llx_c_type_fees ADD COLUMN module varchar(32) NULL; ALTER TABLE llx_c_typent ADD COLUMN module varchar(32) NULL; -ALTER TABLE llx_user ADD ref_ext varchar(30) AFTER entity +ALTER TABLE llx_user ADD ref_ext varchar(30) AFTER entity; ALTER TABLE llx_user ADD civilite varchar(6) AFTER pass_temp; ALTER TABLE llx_user ADD signature text DEFAULT NULL AFTER email;