From 6ca30be6947571935975cd58a0d820846ab9487e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 14 Oct 2011 13:31:37 +0200 Subject: [PATCH 1/3] Fix: Keep value --- htdocs/adherents/admin/adherent_extrafields.php | 2 +- htdocs/admin/societe_extrafields.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 348794641d1..63d43560b8b 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -250,7 +250,7 @@ if ($action == 'create') // Label print ''.$langs->trans("Label").''; // Code - print ''.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')'; + print ''.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')'; // Type print ''.$langs->trans("Type").''; print $form->selectarray('type',$type2label,GETPOST('type')); diff --git a/htdocs/admin/societe_extrafields.php b/htdocs/admin/societe_extrafields.php index af78847e26a..66371ff9c88 100755 --- a/htdocs/admin/societe_extrafields.php +++ b/htdocs/admin/societe_extrafields.php @@ -250,7 +250,7 @@ if ($action == 'create') // Label print ''.$langs->trans("Label").''; // Code - print ''.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')'; + print ''.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')'; // Type print ''.$langs->trans("Type").''; print $form->selectarray('type',$type2label,GETPOST('type')); From 8bd2d6f572f61dc68531b6fe524b5889f8731466 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 15 Oct 2011 00:46:52 +0200 Subject: [PATCH 2/3] Fix: Typo --- htdocs/langs/fr_FR/paybox.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr_FR/paybox.lang b/htdocs/langs/fr_FR/paybox.lang index 04a55508dfd..37c0e6bae49 100644 --- a/htdocs/langs/fr_FR/paybox.lang +++ b/htdocs/langs/fr_FR/paybox.lang @@ -4,7 +4,7 @@ PayBoxSetup=Configuration module PayBox PayBoxDesc=Ce module permet d'offrir une page de paiement via le prestataire Paybox pour réaliser un paiement quelconque ou un paiement par rapport à un objet Dolibarr (factures, commande...) PaymentForm=Formulaire de paiement FollowingUrlAreAvailableToMakePayments=Les URL suivantes sont disponibles pour permettre à un client de faire un paiement -WelcomeOnPaymentPage=Bienvenu sur notre service de paiement en ligne +WelcomeOnPaymentPage=Bienvenue sur notre service de paiement en ligne ThisScreenAllowsYouToPay=Cet écran vous permet de réaliser votre paiement en ligne à destination de %s. ThisIsInformationOnPayment=Voici les informations sur le paiement à réaliser ToComplete=A compléter From 3f46202fa00b58790d4ae49a858b7789922954f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 15 Oct 2011 01:11:11 +0200 Subject: [PATCH 3/3] Fix: Bad sql syntax --- htdocs/install/mysql/migration/2.9.0-3.0.0.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql index 03da0b3bc37..32ca33fcffd 100644 --- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql +++ b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql @@ -45,8 +45,8 @@ ALTER TABLE llx_actioncomm MODIFY label varchar(128) NOT NULL; ALTER TABLE llx_expedition MODIFY date_expedition datetime; ALTER TABLE llx_expedition MODIFY date_delivery datetime NULL; -ALTER TABLE llx_societe ADD COLUMN canvas varchar(32) DEFAULT NULL AFTER default_lang; -ALTER TABLE llx_societe MODIFY canvas varchar(32) DEFAULT NULL; +ALTER TABLE llx_societe ADD COLUMN canvas varchar(32) NULL AFTER default_lang; +ALTER TABLE llx_societe MODIFY canvas varchar(32) NULL; ALTER TABLE llx_cond_reglement RENAME TO llx_c_payment_term; ALTER TABLE llx_expedition_methode RENAME TO llx_c_shipment_mode; @@ -97,8 +97,8 @@ CREATE TABLE llx_c_ziptown ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_county (fk_county); ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county FOREIGN KEY (fk_county) REFERENCES llx_c_departements (rowid); -ALTER TABLE llx_socpeople ADD COLUMN canvas varchar(32) DEFAULT NULL after default_lang; -ALTER TABLE llx_socpeople MODIFY canvas varchar(32) DEFAULT NULL; +ALTER TABLE llx_socpeople ADD COLUMN canvas varchar(32) NULL after default_lang; +ALTER TABLE llx_socpeople MODIFY canvas varchar(32) NULL; UPDATE llx_socpeople SET canvas = 'default' WHERE canvas = 'default@contact'; UPDATE llx_societe SET canvas = 'default' WHERE canvas = 'default@thirdparty';