Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

develop

Conflicts:
	htdocs/core/lib/company.lib.php

Change-Id: Iec6a98430bfd500defda256862a1ed7869ef407a

htdocs/core/class/html.formfile.class.php

@@ -770,15 +770,18 @@ class FormFile
 					print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
 					if (! empty($object->entity)) print '&entity='.$object->entity;
-					//print '&file='.urlencode($relativepath.$file['name']).'">';
+					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 '</a>';
 					print "</td>\n";

htdocs/core/lib/company.lib.php

@@ -576,12 +576,12 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'',$sortfield,$sortorder);
     if (! empty($conf->skype->enabled)) 
     { 
       $colspan++;
       print '<td>'.$langs->trans("Skype").'</td>';
     }
+    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'',$sortfield,$sortorder);
     print "<td>&nbsp;</td>";
     if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
     {
@@ -610,21 +610,24 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     
      print '<td>&nbsp;</td>';
     
-    print '<td class="liste_titre">';
+   
-    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
-    print '</td>';
     
     if (! empty($conf->skype->enabled)) 
     { 
       $colspan++;
       print '<td>&nbsp;</td>';
     }
+    print '<td class="liste_titre">';
+    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
+    print '</td>';
+      		
     print "<td>&nbsp;</td>";
     if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
     {
     	$colspan++;
         print '<td>&nbsp;</td>';
     }
+        		
     
     print '<td class="liste_titre" align="right">';
     print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -688,9 +691,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
                 print '</td>';
             }   
 
-			print '<td>';
+			print '<td>'.$contactstatic->getLibStatut(5).'</td>';
-            print $contactstatic->getLibStatut(3);
-            print '</td>';
 
 			// copy in clipboard
 			$coords = '';

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"));

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;

htdocs/langs/en_US/help.lang

@@ -24,4 +24,5 @@ BackToHelpCenter=Otherwise, click here to go <a href="%s">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
+SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></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: <br><b><a href="%s" target="_blank">%s</a></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 : <br><b><a href="%s" target="_blank">%s</a></b>

htdocs/main.inc.php

@@ -1611,8 +1611,13 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        print "<!-- End Bookmarks -->\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='';

htdocs/support/index.php

@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2013	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2008-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  *
  * 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 '</tr>';
 print '</table>'."\n";
 print "\n";
 
+print '</div><div class="inline-block">';
 
+
+// Official support
+print '<table class="login" width="100%">';
+print '<tr class="title">';
+print '<td width="100%" align="left" valign="top">';
+
+print '<table summary="community"><tr><td>'.img_picto('','internet.png','',1).'</td><td>';
+print '<font style="'.$style1.'">'.$langs->trans("OfficialSupport").'</font>';
+print '<br>'.$langs->trans("TypeOfSupport").': <font style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</font>';
+print '<br>'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").': ';
+print $langs->trans("TypeHelpOnly").'/'.img_picto_common('','redstar','',1).img_picto_common('','redstar','',1).img_picto_common('','redstar','',1).img_picto_common('','redstar','',1).'/'.img_picto_common('','star','',1).img_picto_common('','star','',1);
+
+print '</td></tr></table>';
+
+print '</td>';
+print '</tr><tr>';
+print '<td align="center" valign="top">';
+print '<table class="nocellnopadd">';
+print '<tr><td align="center">';
+
+//TODO Create commercial dedicated page into dolibarr.org?
+$urlofficialsupport='http://wiki.dolibarr.org/index.php/Dolibarr_help_and_support';
+
+//TODO Create commercial dedicated page into dolibarr.fr?
+if (preg_match('/fr/i',$langs->defaultlang)) $urlofficialsupport='http://wiki.dolibarr.org/index.php/Assistance_Dolibarr';
+
+if (preg_match('/es/i',$langs->defaultlang)) $urlofficialsupport='http://www.dolibarr.es/soporte/';
+print '<br>'.$langs->trans("SeeOfficalSupport",$urlofficialsupport,$langs->transnoentities("ClickHere")).'<br>';
+print '</td></tr></table>';
+print '</td>';
+print '</tr>';
+print '</table>'."\n";
+print "\n";
 print '</div><div class="inline-block">';
 
 /*

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;
 }