Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

htdocs/core/modules/holiday/modules_holiday.php

@@ -96,7 +96,7 @@ class ModelNumRefHolidays
 	public function info()
 	{
 		global $langs;
-		$langs->load("holidays");
+		$langs->load("holiday");
 		return $langs->trans("NoDescription");
 	}
 
@@ -108,7 +108,7 @@ class ModelNumRefHolidays
 	public function getExample()
 	{
 		global $langs;
-		$langs->load("holidays");
+		$langs->load("holiday");
 		return $langs->trans("NoExample");
 	}
 

htdocs/core/modules/modSociete.class.php

@@ -269,8 +269,6 @@ class modSociete extends DolibarrModules
 			't.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel',
 			'st.code'=>'ProspectStatus','payterm.libelle'=>'PaymentConditions','paymode.libelle'=>'PaymentMode'
 		);
-		if (! empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix']='Prefix';
-
 		if (! empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix']='Prefix';
 		if (! empty($conf->global->PRODUIT_MULTIPRICES)) $this->export_fields_array[$r]['s.price_level']='PriceLevel';
 		// Add multicompany field

htdocs/fourn/card.php

@@ -85,10 +85,7 @@ if (empty($reshook))
 		$result=$object->fetch($id);
    		$object->code_compta_fournisseur=$_POST["supplieraccountancycode"];
 	    $result=$object->update($object->id, $user, 1, 0, 1);
-	    if ($result < 0)
+	    if ($result < 0)	setEventMessages($object->error, $object->errors, 'errors');
-	    {
-	        $mesg=join(',', $object->errors);
-	    }
 	}
 	// terms of the settlement
 	if ($action == 'setconditions' && $user->rights->societe->creer)

htdocs/holiday/document.php

@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('other', 'holidays', 'companies'));
+$langs->loadLangs(array('other', 'holiday', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -48,8 +48,6 @@ $confirm = GETPOST('confirm', 'alpha');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'holiday', $id, 'holiday');
 
-$langs->load("holiday");
-
 // Get parameters
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');

htdocs/holiday/list.php

@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('users', 'holidays', 'hrm'));
+$langs->loadLangs(array('users', 'holiday', 'hrm'));
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();

htdocs/index.php

@@ -218,7 +218,7 @@ if (empty($user->societe_id))
 	                'askprice',
 	                'projects',
 	                'expensereports',
-                    'holidays',
+                    'holiday',
 					'donations'
 	    );
 	    // Dashboard Icon lines

htdocs/product/stock/class/productlot.class.php

@@ -53,6 +53,19 @@ class Productlot extends CommonObject
 	 */
     public $ismultientitymanaged = 1;
 
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' 		=> array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'batch'         =>array('type'=>'varchar(30)', 'label'=>'Batch',           'enabled'=>1, 'visible'=>1,  'notnull'=>0,  'showoncombobox'=>1, 'index'=>1, 'position'=>10,  'comment'=>'Batch'),
+		'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1,  'notnull'=>1,  'index'=>1, 'position'=>20),
+		'datec'         =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
+		'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
+		'fk_user_author'=>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510, 'foreignkey'=>'llx_user.rowid'),
+		'fk_user_modif' =>array('type'=>'integer',      'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511)
+	);
+
 	/**
 	 * @var int Entity
 	 */