From 995bec6112d0cba1651e06bf534c253995d7b0cd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2013 15:09:22 +0100 Subject: [PATCH 1/6] Fix: bad migration of 3.4 that make this text instead of varchar(50) --- htdocs/install/mysql/migration/3.4.0-3.5.0.sql | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql index 81a61afbd81..4b1a16d532d 100755 --- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql +++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql @@ -20,6 +20,15 @@ DELETE FROM llx_menu where module='holiday'; + +-- Fix bad migration of 3.4 that make this text instead of varchar(50) +alter table llx_don MODIFY COLUMN town varchar(50); +alter table llx_adherent MODIFY COLUMN town varchar(50); +alter table llx_entrepot MODIFY COLUMN town varchar(50); +alter table llx_societe MODIFY COLUMN town varchar(50); +alter table llx_societe_address MODIFY COLUMN town varchar(50); + + ALTER TABLE llx_projet_task ADD COLUMN planned_workload real DEFAULT 0 NOT NULL AFTER duration_effective; ALTER TABLE llx_socpeople ADD COLUMN statut tinyint DEFAULT 1 NOT NULL AFTER import_key; From e66371c6d1db2786380a9c25aa8cefb91603b19a Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 13 Nov 2013 16:35:02 +0100 Subject: [PATCH 2/6] New: Link to communities. Add official Support links --- htdocs/langs/en_US/help.lang | 3 ++- htdocs/langs/es_ES/help.lang | 2 ++ htdocs/langs/fr_FR/help.lang | 2 ++ htdocs/main.inc.php | 7 ++++++- htdocs/support/index.php | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang index 51bd20a72ca..98406a7c53a 100644 --- a/htdocs/langs/en_US/help.lang +++ b/htdocs/langs/en_US/help.lang @@ -24,4 +24,5 @@ BackToHelpCenter=Otherwise, click here to go back to help center ho LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated): PossibleLanguages=Supported languages MakeADonation=Help Dolibarr project, make a donation -SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation \ No newline at end of file +SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation +SeeOfficalSupport=For official Dolibarr support in your language:
%s \ No newline at end of file diff --git a/htdocs/langs/es_ES/help.lang b/htdocs/langs/es_ES/help.lang index 9ae200bc52e..e5178751951 100644 --- a/htdocs/langs/es_ES/help.lang +++ b/htdocs/langs/es_ES/help.lang @@ -14,6 +14,7 @@ TypeSupportCommercial=Comercial TypeOfHelp=Tipo NeedHelpCenter=¿Necesita soporte o ayuda? Efficiency=Eficacia +OfficialSupport=Soporte oficial TypeHelpOnly=Sólamente ayuda TypeHelpDev=Ayuda+Desarrollo TypeHelpDevForm=Ayuda+Desarrollo+Formación @@ -25,3 +26,4 @@ LinkToGoldMember=En caso contrario, puede llamar inmediatamente a uno de los asi PossibleLanguages=Idiomas disponibles MakeADonation=Ayude al proyecto Dolibarr, haga una donación SubscribeToFoundation=Ayude al proyecto Dolibarr, adhiérase a la asociación Dolibarr +SeeOfficalSupport=Para obtener soporte oficial Dolibarr en su idioma:
%s diff --git a/htdocs/langs/fr_FR/help.lang b/htdocs/langs/fr_FR/help.lang index e2e55f03943..783d48ae8e3 100644 --- a/htdocs/langs/fr_FR/help.lang +++ b/htdocs/langs/fr_FR/help.lang @@ -14,6 +14,7 @@ TypeSupportCommercial=Commercial TypeOfHelp=Type NeedHelpCenter=Besoin d'assistance ou aide ? Efficiency=Efficacité +OfficialSupport=Assistance officiel TypeHelpOnly=Aide uniquement TypeHelpDev=Aide+Développement TypeHelpDevForm=Aide+Développement+Formation @@ -25,3 +26,4 @@ LinkToGoldMember=Vous pouvez appeler immédiatement un des quelques accompagnate PossibleLanguages=Langues disponibles MakeADonation=Aidez le projet Dolibarr, faites un don SubscribeToFoundation=Aidez le projet Dolibarr, adhérez à l'association Dolibarr +SeeOfficalSupport=Pour un accompagnement officielle Dolibarr dans votre langue :
%s \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 9274004d615..644d8e3464d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1611,8 +1611,13 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me print "\n"; } - //Dolibarr version + //Dolibarr version $doliurl='http://www.dolibarr.org'; + + //local communities + if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr'; + if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es'; + $appli='Dolibarr'; if (! empty($conf->global->MAIN_APPLICATION_TITLE)) { $appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl=''; diff --git a/htdocs/support/index.php b/htdocs/support/index.php index bddcd874073..fd574712600 100644 --- a/htdocs/support/index.php +++ b/htdocs/support/index.php @@ -1,6 +1,7 @@ * Copyright (C) 2008-2012 Regis Houssin + * Copyright (C) 2012 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -100,7 +101,41 @@ print ''; print ''."\n"; print "\n"; +print '
'; + +// Official support +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''."\n"; +print "\n"; print '
'; /* From d57aa65d3056167d125c8ee6256fef3273d767a5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2013 18:45:36 +0100 Subject: [PATCH 3/6] Fix: Add option to fix warning not visible when there is preactivated modules --- htdocs/core/menus/standard/eldy.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 5f62b06c868..1581af09a1d 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -491,7 +491,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } $newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto,1); $warnpicto=''; - if (count($conf->modules) <= 1) // If only user module enabled + if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) // If only user module enabled { $langs->load("errors"); $warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete")); From 5a8f4905d6eda2f95236fbb49b1eb68d977051ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2013 20:36:07 +0100 Subject: [PATCH 4/6] Fix: bad link into ecm module --- htdocs/core/class/html.formfile.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index c467f7aaa84..97ecce50a15 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -770,15 +770,18 @@ class FormFile print ''; + print '&file='.urlencode($relativepath.$file['name']); + /* Restore old code: When file is at level 2+, full relative path must be in url, not only level1 if ($file['level1name'] <> $object->id) $filepath=urlencode($object->id.'/'.$file['level1name'].'/'.$file['name']); else $filepath=urlencode($object->id.'/'.$file['name']); - print '&file='.$filepath.'">'; + print '&file='.$filepath; + */ + print '">'; print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' '; - if ($showrelpart == 1) print $file['level1name'].'/'; + if ($showrelpart == 1) print $relativepath; print dol_trunc($file['name'],$maxlength,'middle'); print ''; print "\n"; From e63542d8a6d7e611adc3de7cc38b08a62714de5d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2013 20:37:05 +0100 Subject: [PATCH 5/6] Fix: avoid scroll --- htdocs/theme/eldy/style.css.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 0adafcccc0a..ea44564b8d5 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1140,6 +1140,7 @@ td.photo { box-shadow: 2px 2px 4px #DDD; padding: 0 4px 0 4px !important; + min-height: 32px; } From 588a30fa80bab4113bc4c87f7e0a1580cfa1cf62 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2013 21:14:11 +0100 Subject: [PATCH 6/6] Fix: Bad status --- htdocs/core/lib/company.lib.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 582922cd60e..462db7c3ba3 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -555,10 +555,10 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''.$langs->trans("PhoneMobile").''; print ''.$langs->trans("Fax").''; print ''.$langs->trans("EMail").''; - if (! empty($conf->skype->enabled)) - { - $colspan++; - print ''.$langs->trans("Skype").''; + if (! empty($conf->skype->enabled)) + { + $colspan++; + print ''.$langs->trans("Skype").''; } print ''.$langs->trans("Status").''; print " "; @@ -592,13 +592,16 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') while ($i < $num) { $obj = $db->fetch_object($result); + + $contactstatic->id = $obj->rowid; + $contactstatic->lastname = $obj->lastname; + $contactstatic->firstname = $obj->firstname; + $contactstatic->statut=$obj->statut; + $var = !$var; print ""; print ''; - $contactstatic->id = $obj->rowid; - $contactstatic->lastname = $obj->lastname; - $contactstatic->firstname = $obj->firstname; print $contactstatic->getNomUrl(1); print ''; @@ -619,15 +622,14 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''; print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL'); print ''; - if (! empty($conf->skype->enabled)) + if (! empty($conf->skype->enabled)) { print ''; print dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE'); print ''; - } + } - if ($obj->statut==0) print ''.$langs->trans('Disabled').' '.img_picto($langs->trans('StatusContactDraftShort'),'statut0').''; - elseif ($obj->statut==1) print ''.$langs->trans('Enabled').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut1').''; + print ''.$contactstatic->getLibStatut(5).''; // copy in clipboard $coords = '';