Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
6fe6f6ab89
6 changed files with 12 additions and 13 deletions
|
|
@ -200,7 +200,7 @@ foreach ($modulesdir as $dir) {
|
|||
dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
|
||||
}
|
||||
} else {
|
||||
print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
|
||||
print info_admin("Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)", 0, 0, '1', 'warning');
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
|
||||
|
|
|
|||
|
|
@ -485,7 +485,7 @@ foreach ($modulesdir as $dir) {
|
|||
dol_syslog("Module ".get_class($objMod)." not qualified");
|
||||
}
|
||||
} else {
|
||||
print "admin/modules.php Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
|
||||
print info_admin("admin/modules.php Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)", 0, 0, '1', 'warning');
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ $arrayfields = array(
|
|||
|
||||
$arrayfields = dol_sort_array($arrayfields, 'position');
|
||||
$param = '';
|
||||
|
||||
$info_admin = '';
|
||||
|
||||
/*
|
||||
* Actions
|
||||
|
|
@ -120,7 +120,7 @@ foreach ($modulesdir as $dir) {
|
|||
dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
|
||||
}
|
||||
} else {
|
||||
print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
|
||||
$info_admin .= info_admin("Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)", 0, 0, '1', 'warning');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -202,7 +202,7 @@ foreach ($modules as $key => $module) {
|
|||
*/
|
||||
|
||||
llxHeader();
|
||||
|
||||
print $info_admin;
|
||||
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
|
||||
if ($optioncss != '') {
|
||||
print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
|
||||
|
|
|
|||
|
|
@ -75,10 +75,10 @@ class DolibarrApi
|
|||
*
|
||||
* Display a short message an return a http code 200
|
||||
*
|
||||
* @param string $field Field name
|
||||
* @param mixed $value Value to check/clean
|
||||
* @param Object $object Object
|
||||
* @return string Value cleaned
|
||||
* @param string $field Field name
|
||||
* @param string|array $value Value to check/clean
|
||||
* @param Object $object Object
|
||||
* @return string|array Value cleaned
|
||||
*/
|
||||
protected function _checkValForAPI($field, $value, $object)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ class FormSetup
|
|||
* saveConfFromPost
|
||||
*
|
||||
* @param bool $noMessageInUpdate display event message on errors and success
|
||||
* @return int -1 if KO, 1 if OK
|
||||
* @return int|null Return -1 if KO, 1 if OK, null if no items
|
||||
*/
|
||||
public function saveConfFromPost($noMessageInUpdate = false)
|
||||
{
|
||||
|
|
@ -266,7 +266,6 @@ class FormSetup
|
|||
return $reshook;
|
||||
}
|
||||
|
||||
|
||||
if (empty($this->items)) {
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1225,8 +1225,8 @@ class Productlot extends CommonObject
|
|||
$this->sellby = $now - 100000;
|
||||
$this->datec = $now - 3600;
|
||||
$this->tms = $now;
|
||||
$this->fk_user_creat = null;
|
||||
$this->fk_user_modif = null;
|
||||
$this->fk_user_creat = 0;
|
||||
$this->fk_user_modif = 0;
|
||||
$this->import_key = '123456';
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue