Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang

htdocs/adherents/class/adherent.class.php

@@ -1493,19 +1493,17 @@ class Adherent extends CommonObject
 
 
     /**
-     *    Return civility label of a contact
+     *    Return civility label of a member
      *
-     *    @param	int		$nohtmlentities     0=Encode with htmlentities for HTML output, 1=No htmlentities for memory translation
+     *    @return   string              	Translated name of civility
-     *    @return   string              		Name translated of civility
      */
-    function getCivilityLabel($nohtmlentities=0)
+    function getCivilityLabel()
     {
         global $langs;
         $langs->load("dict");
 
         $code=$this->civilite_id;
-        if ($nohtmlentities) return $langs->transnoentities("Civility".$code)!="Civility".$code ? $langs->transnoentities("Civility".$code) : $code;
+        return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
-        else return $langs->trans("Civility".$code)!="Civility".$code ? $langs->trans("Civility".$code) : $code;
     }
 
     /**

htdocs/adherents/fiche.php

@@ -246,9 +246,22 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
 	{
 		$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 	}
+	$lastname=$_POST["lastname"];
+	$firstname=$_POST["firstname"];
+	$morphy=$morphy=$_POST["morphy"];;
+	if ($morphy != 'mor' && empty($lastname)) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";
+	}
+	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
+	}
 
 	// Create new object
-	if ($result > 0)
+	if ($result > 0 && ! $error)
 	{
 		$object->oldcopy=dol_clone($object);
 
@@ -389,6 +402,10 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
 			$action='';
 		}
 	}
+	else
+	{
+		$action='edit';
+	}
 }
 
 if ($action == 'add' && $user->rights->adherent->creer)
@@ -489,7 +506,7 @@ if ($action == 'add' && $user->rights->adherent->creer)
 			$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Password"))."<br>\n";
 		}
 	}
-	if (empty($lastname)) {
+	if ($morphy != 'mor' && empty($lastname)) {
 		$error++;
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";

htdocs/comm/propal.php

@@ -1858,7 +1858,7 @@ else
 				// Convert date into timestamp format
 				if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
 				{
-					$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$object->array_options['options_'.$key];
+					$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]);
 				}
 
 				if ($action == 'edit_extras' && $user->rights->propal->creer)

htdocs/commande/fiche.php

@@ -2158,7 +2158,7 @@ else
 					// Convert date into timestamp format
 					if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
 					{
-						$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$object->array_options['options_'.$key];
+						$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]);
 					}
 
 					if ($action == 'edit_extras' && $user->rights->commande->creer)

htdocs/compta/facture.php

@@ -3304,7 +3304,7 @@ else if ($id > 0 || ! empty($ref))
 						// Convert date into timestamp format
 						if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
 						{
-							$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$object->array_options['options_'.$key];
+							$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]);
 						}
 
 						if ($action == 'edit_extras' && $user->rights->facture->creer)

htdocs/contact/class/contact.class.php

@@ -874,7 +874,7 @@ class Contact extends CommonObject
 	}
 
 	/**
-	 *    Return label of a civility contact
+	 *    Return civility label of contact
 	 *
 	 *    @return	string      			Translated name of civility
 	 */
@@ -884,7 +884,7 @@ class Contact extends CommonObject
 		$langs->load("dict");
 
 		$code=$this->civilite_id;
-        return $langs->trans("Civility".$code)!="Civility".$code ? $langs->trans("Civility".$code) : '';
+        return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
 	}
 
 	/**

htdocs/core/class/commonobject.class.php

@@ -45,6 +45,9 @@ abstract class CommonObject
 
     public $array_options=array();
     
+    public $linkedObjectsIds;
+    public $linkedObjects;
+
     // No constructor as it is an abstract class
 
 
@@ -1649,7 +1652,7 @@ abstract class CommonObject
 	}
 
     /**
-     *	Fetch array of objects linked to current object. Links are loaded into this->linked_object array.
+     *	Fetch array of objects linked to current object. Links are loaded into this->linkedObjects array.
      *
      *	@param	int		$sourceid		Object source id
      *	@param  string	$sourcetype		Object source type
@@ -1708,6 +1711,7 @@ abstract class CommonObject
             $sql.= "(fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."')";
             $sql.= " ".$clause." (fk_target = '".$targetid."' AND targettype = '".$targettype."')";
         }
+        $sql .= ' ORDER BY sourcetype';
         //print $sql;
 
         dol_syslog(get_class($this)."::fetchObjectLink sql=".$sql);
@@ -2236,7 +2240,7 @@ abstract class CommonObject
 					// Convert date into timestamp format
 					if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
 					{
-						$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$this->array_options['options_'.$key];
+						$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$this->db->jdate($this->array_options['options_'.$key]);
 					}
 					$out .= '<td>'.$label.'</td>';
 					$out .='<td colspan="'.$colspan.'">';

htdocs/core/class/extrafields.class.php

@@ -825,7 +825,7 @@ class ExtraFields
 			
 			$sql = 'SELECT '.$InfoFieldList[1];
 			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			$sql.= ' WHERE '.$keyList.'="'.$this->db->escape($value).'"';
+			$sql.= ' WHERE '.$keyList.'=\''.$this->db->escape($value).'\'';
 			//$sql.= ' AND entity = '.$conf->entity;
 			dol_syslog(get_class($this).':showOutputField:$type=sellist sql='.$sql);
 			$resql = $this->db->query($sql);

htdocs/core/class/translate.class.php

@@ -643,13 +643,15 @@ class Translate
 	 *      Store key-label found into cache variable $this->cache_labels to save SQL requests to get labels.
 	 *
 	 * 		@param	DoliBD	$db				Database handler
-	 * 		@param	string	$key			Key to get label (key in language file)
+	 * 		@param	string	$key			Translation key to get label (key in language file)
 	 * 		@param	string	$tablename		Table name without prefix
 	 * 		@param	string	$fieldkey		Field for key
 	 * 		@param	string	$fieldlabel		Field for label
+	 *      @param	string	$keyforselect	Use another value than the translation key for the where into select
 	 *      @return string					Label in UTF8 (but without entities)
+	 *      @see dol_getIdFromCode
 	 */
-	function getLabelFromKey($db,$key,$tablename,$fieldkey,$fieldlabel)
+	function getLabelFromKey($db,$key,$tablename,$fieldkey,$fieldlabel,$keyforselect='')
 	{
 		// If key empty
 		if ($key == '') return '';
@@ -670,7 +672,7 @@ class Translate
 
 		$sql = "SELECT ".$fieldlabel." as label";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
-		$sql.= " WHERE ".$fieldkey." = '".$key."'";
+		$sql.= " WHERE ".$fieldkey." = '".($keyforselect?$keyforselect:$key)."'";
 		dol_syslog(get_class($this).'::getLabelFromKey sql='.$sql,LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)

htdocs/core/lib/functions.lib.php

@@ -4071,6 +4071,7 @@ function dol_osencode($str)
  * 		@param	string	$fieldkey	Field for code
  * 		@param	string	$fieldid	Field for id
  *      @return int					Id of code
+ *      @see getLabelFromKey
  */
 function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
 {

htdocs/core/tpl/login.tpl.php

@@ -134,7 +134,7 @@ if ($forgetpasslink || $helpcenterlink)
 	echo '<br>';
 	echo '<div align="center" style="margin-top: 4px;">';
 	if ($forgetpasslink) {
-		echo '<a style="color: #888888; font-size: 10px" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam.'">(';
+		echo '<a class="alogin" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam.'">(';
 		echo $langs->trans('PasswordForgotten');
 		if (! $helpcenterlink) {
 			echo ')';
@@ -145,7 +145,7 @@ if ($forgetpasslink || $helpcenterlink)
 	if ($helpcenterlink) {
 		$url=DOL_URL_ROOT.'/support/index.php'.$moreparam;
 		if (! empty($conf->global->MAIN_HELPCENTER_LINKTOUSE)) $url=$conf->global->MAIN_HELPCENTER_LINKTOUSE;
-		echo '<a style="color: #888888; font-size: 10px" href="'.dol_escape_htmltag($url).'" target="_blank">';
+		echo '<a class="alogin" href="'.dol_escape_htmltag($url).'" target="_blank">';
 		if ($forgetpasslink) {
 			echo '&nbsp;-&nbsp;';
 		} else {

htdocs/fichinter/class/fichinter.class.php

@@ -372,7 +372,7 @@ class Fichinter extends CommonObject
 			// Define new ref
 			if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref)))
 			{
-				$num = $this->getNextNumRef($soc);
+				$num = $this->getNextNumRef($this->thirdparty);
 			}
 			else
 			{

htdocs/holiday/fiche.php

@@ -854,8 +854,8 @@ else
                 // Si refus de la demande
                 if ($action == 'refuse' && $cp->statut == 2 && $user->id == $cp->fk_validator)
                 {
-                    $array_input = array(array('type'=>"text",'label'=>"Entrez ci-dessous un motif de refus :",'name'=>"detail_refuse",'size'=>"50",'value'=>""));
+                    $array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
-                    $ret=$form->form_confirm("fiche.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), "", "confirm_refuse", $array_input, 1, 0);
+                    $ret=$form->form_confirm("fiche.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
                     if ($ret == 'html') print '<br />';
                 }
 

htdocs/langs/ca_ES/margins.lang

@@ -1,8 +1,6 @@
 # Dolibarr language file - ca_ES - margins
 CHARSET=UTF-8
 
-Module59000Name=Marges
-Module59000Desc=Gestió de marges comercials
 Margin=Marge
 Margins=Marges
 TotalMargin=Marge total

htdocs/langs/el_GR/admin.lang

@@ -74,10 +74,6 @@ OSTZ=Ζώνη Ώρας OS server
 PHPTZ=Ζώνη Ώρας PHP server
 PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds)
 ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds)
-CurrentHour=PHP server hour
-CompanyTZ= Time Zone company (main company)
-CompanyHour= Hour company (main company)
-CurrentSessionTimeOut=Current session timeout
 OSEnv=Περιβάλλον OS
 Box=Πλαίσιο
 Boxes=Πλαίσια

htdocs/langs/en_US/companies.lang

@@ -377,7 +377,7 @@ SupplierCategory=Supplier category
 JuridicalStatus200=Independant
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
-AllocateCommercial=Allocate a commercial
+AllocateCommercial=Assigned to sale representative
 SelectCountry=Select a country
 SelectCompany=Select a third party
 Organization=Organization

htdocs/langs/en_US/margins.lang

@@ -1,8 +1,6 @@
 # Dolibarr language file - en_US - marges
 CHARSET=UTF-8
 
-Module59000Name=Margins
-Module59000Desc=Profit margins management
 Margin=Margin
 Margins=Margins
 TotalMargin=Total Margin

htdocs/langs/es_ES/margins.lang

@@ -1,8 +1,6 @@
 # Dolibarr language file - es_ES - margins
 CHARSET=UTF-8
 
-Module59000Name=Márgenes
-Module59000Desc=Gestión de márgenes comerciales
 Margin=Margen
 Margins=Márgenes
 TotalMargin=Margen total

htdocs/langs/fr_FR/margins.lang

@@ -1,8 +1,6 @@
 # Dolibarr language file - fr_FR - margins
 CHARSET=UTF-8
 
-Module59000Name=Marges
-Module59000Desc=Gestion des marges commerciales
 Margin=Marge
 Margins=Marges
 TotalMargin=Marge totale

htdocs/langs/nb_NO/companies.lang

@@ -248,7 +248,6 @@ NoOtherDeliveryAddress=Ingen alternativ leveringsadresse lagt inn
 JuridicalStatus200=Uavhengig
 DeleteFile=Slett fil
 ConfirmDeleteFile=Er du sikker på at du vil slette denne filen?
-AllocateCommercial=Allocate a commercial
 SelectCountry=Velg land
 SelectCompany=Velg tredjepart
 Organization=Organisasjon

htdocs/langs/nl_NL/dict.lang

@@ -247,10 +247,11 @@ CountryME = Montenegro
 CountryBL = Saint Barthelemy
 CountryMF = Saint Martin
 ##### Civilities ##### = 
-CivilityMME = Mej.
+CivilityMME = Mevrouw
-CivilityMR = Dhr.
+CivilityMR = Meneer
-CivilityMLE = Mevr.
+CivilityMLE = Mejuffrouw
 CivilityMTRE = Meester
+CivilityDR = Dokter
 ##### Currencies ##### = 
 Currencyeuros = Euro
 CurrencyAUD = Australische Dollars

htdocs/langs/tr_TR/margins.lang

@@ -1,8 +1,6 @@
 # Dolibarr language file - en_US - marges
 CHARSET=UTF-8
 
-Module59000Name=Oranlar
-Module59000Desc=Kar oranı yönetimi
 Margin=Oran
 Margins=Oranlar
 TotalMargin=Toplam Oran

htdocs/societe/note.php

@@ -25,10 +25,6 @@
  *   \ingroup    societe
  */
 
-error_reporting(E_ALL);
-ini_set('display_errors', true);
-ini_set('html_errors', false);
-
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 

htdocs/theme/amarok/style.css.php

@@ -557,6 +557,15 @@ img.login, img.printer, img.entity {
 	font-weight:bold;
 }
 
+.alogin {
+	color: #FFF;
+	font-weight: normal;
+}
+.alogin:hover {
+	color: #FFF;
+	text-decoration:underline;
+}
+
 div.login_main_home {
 	color: #000000;
 }

htdocs/theme/auguria/style.css.php

@@ -596,6 +596,15 @@ div.login a:hover {
 	text-decoration:underline;
 }
 
+.alogin, .alogin:hover {
+	color: #888 !important;
+	font-weight: normal !important;
+	font-size: <?php echo $fontsizesmaller; ?>px !important;
+}
+.alogin:hover {
+	text-decoration:underline !important;
+}
+
 img.login, img.printer, img.entity {
 	padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
 	margin: 0px 0px 0px 8px;

htdocs/theme/bureau2crea/style.css.php

@@ -640,6 +640,15 @@ div.login a:hover {
 	text-decoration:underline;
 }
 
+.alogin, .alogin:hover {
+	color: #888 !important;
+	font-weight: normal !important;
+	font-size: <?php echo $fontsizesmaller; ?>px !important;
+}
+.alogin:hover {
+	text-decoration:underline !important;
+}
+
 img.login, img.printer, img.entity {
 	padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
 	margin: 0px 0px 0px 8px;

htdocs/theme/cameleo/style.css.php

@@ -651,6 +651,15 @@ div.login a:hover {
 	text-decoration:underline;
 }
 
+.alogin, .alogin:hover {
+	color: #888 !important;
+	font-weight: normal !important;
+	font-size: <?php echo $fontsizesmaller; ?>px !important;
+}
+.alogin:hover {
+	text-decoration:underline !important;
+}
+
 img.login, img.printer, img.entity {
 	padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
 	margin: 0px 0px 0px 8px;

htdocs/theme/eldy/style.css.php

@@ -854,7 +854,14 @@ div.login a:hover {
 	color: #<?php echo $colortextmain; ?>;
 	text-decoration:underline;
 }
-
+.alogin, .alogin:hover {
+	color: #888 !important;
+	font-weight: normal !important;
+	font-size: <?php echo $fontsizesmaller; ?>px !important;
+}
+.alogin:hover {
+	text-decoration:underline !important;
+}
 img.login, img.printer, img.entity {
 	padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
 	margin: 0px 0px 0px 8px;
@@ -870,6 +877,8 @@ img.login, img.printer, img.entity {
 
 div.vmenu, td.vmenu {
     margin-<?php print $right; ?>: 2px;
+    position: relative;
+    float: left;
     padding: 0px;
     padding-bottom: 0px;
     padding-top: 1px;