Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
cabaf7aad4
14 changed files with 175 additions and 497 deletions
|
|
@ -199,6 +199,7 @@ QUAL: Standardize code and look and feel for dictionaries
|
|||
QUAL: Standardize code. Renamed ID of user properties into ->user_xxx_id
|
||||
QUAL: Use dol_clone with parameter 2 for ->oldcopy
|
||||
QUAL: use switch case instead of if elseif statements for actions
|
||||
QUAL: Better respect of REST API RFC.
|
||||
|
||||
NEW: [Add hook in user bank page]
|
||||
NEW: #19501 Add two hooks in dolreceiptprinter.php (#26439)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -245,6 +245,16 @@ export list="
|
|||
--ignore-table=$base.llx_c_ticketsup_category
|
||||
--ignore-table=$base.llx_c_ticketsup_severity
|
||||
--ignore-table=$base.llx_c_ticketsup_type
|
||||
--ignore-table=$base.llx_cabinetmed_c_banques
|
||||
--ignore-table=$base.llx_cabinetmed_c_examconclusion
|
||||
--ignore-table=$base.llx_cabinetmed_cons_extrafields
|
||||
--ignore-table=$base.llx_cabinetmed_diaglec
|
||||
--ignore-table=$base.llx_cabinetmed_examaut
|
||||
--ignore-table=$base.llx_cabinetmed_exambio
|
||||
--ignore-table=$base.llx_cabinetmed_examenprescrit
|
||||
--ignore-table=$base.llx_cabinetmed_motifcons
|
||||
--ignore-table=$base.llx_cabinetmed_patient
|
||||
--ignore-table=$base.llx_cabinetmed_societe
|
||||
--ignore-table=$base.llx_congespayes
|
||||
--ignore-table=$base.llx_congespayes_config
|
||||
--ignore-table=$base.llx_congespayes_events
|
||||
|
|
@ -328,6 +338,8 @@ export list="
|
|||
--ignore-table=$base.tmp_llx_accouting_account
|
||||
--ignore-table=$base.tmp_llx_product_batch
|
||||
--ignore-table=$base.tmp_llx_product_batch2
|
||||
--ignore-table=$base.tmp_tmp
|
||||
--ignore-table=$base.tmp_user
|
||||
"
|
||||
echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile"
|
||||
mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ if ($action == 'updateMask') {
|
|||
setEventMessages($langs->trans("Error"), null, 'errors');
|
||||
}
|
||||
} elseif ($action == "allowonlinesign") {
|
||||
if (!dolibarr_set_const($db, "CONTRACT_ALLOW_ONLINESIGN", $value, 0, 'int', $conf->entity)) {
|
||||
if (!dolibarr_set_const($db, "CONTRACT_ALLOW_ONLINESIGN", $value, 'int', 0, '', $conf->entity)) {
|
||||
$error++;
|
||||
}
|
||||
} elseif (preg_match('/set_(.*)/', $action, $reg)) {
|
||||
|
|
|
|||
|
|
@ -226,13 +226,15 @@ foreach ($syslogModules as $moduleName) {
|
|||
|
||||
print '<td class="nowrap">';
|
||||
$setuparray = $module->configure();
|
||||
|
||||
if ($setuparray) {
|
||||
foreach ($setuparray as $option) {
|
||||
$tmpoption = $option['constant'];
|
||||
$value = '';
|
||||
if (!empty($tmpoption)) {
|
||||
if (GETPOSTISSET($tmpoption)) {
|
||||
$value = GETPOST($tmpoption);
|
||||
} elseif (getDolGlobalString($tmpoption)) {
|
||||
} else {
|
||||
$value = getDolGlobalString($tmpoption);
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -320,6 +320,15 @@ class BlockedLog
|
|||
} else {
|
||||
$this->error++;
|
||||
}
|
||||
} elseif ($this->element === 'project') {
|
||||
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
|
||||
|
||||
$object = new Project($this->db);
|
||||
if ($object->fetch($this->fk_object) > 0) {
|
||||
return $object->getNomUrl(1);
|
||||
} else {
|
||||
$this->error++;
|
||||
}
|
||||
} elseif ($this->action == 'MODULE_SET') {
|
||||
return '<i class="opacitymedium">'.$langs->trans("BlockedLogEnabled").'</i>';
|
||||
} elseif ($this->action == 'MODULE_RESET') {
|
||||
|
|
|
|||
|
|
@ -639,7 +639,7 @@ foreach ($accounts as $key => $type) {
|
|||
}
|
||||
}
|
||||
//print $object->getKanbanView('', array('thirdparty'=>$object->thirdparty, 'selected' => $selected));
|
||||
print $object->getKanbanView('', array('selected' => $selected));
|
||||
print $objecttmp->getKanbanView('', array('selected' => $selected));
|
||||
if ($i == ($imaxinloop - 1)) {
|
||||
print '</div>';
|
||||
print '</td></tr>';
|
||||
|
|
|
|||
|
|
@ -1214,7 +1214,7 @@ class FormFile
|
|||
}
|
||||
}
|
||||
// For backward compatiblity, we detect file stored into an old path
|
||||
if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO') && $filearray[0]['level1name'] == 'photos') {
|
||||
if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO') && isset($filearray[0]) && $filearray[0]['level1name'] == 'photos') {
|
||||
$relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -230,8 +230,8 @@ if ($resql) {
|
|||
|
||||
print '<td class="nobordernopadding">';
|
||||
print $obj->societe;
|
||||
print($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
|
||||
print dolGetFirstLastname($obj->lastname, $obj->firstname);
|
||||
print ($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
|
||||
print dolGetFirstLastname($obj->firstname, $obj->lastname);
|
||||
print '</td>';
|
||||
|
||||
print '<td class="right nobordernopadding nowraponall amount">';
|
||||
|
|
|
|||
|
|
@ -3079,7 +3079,7 @@ function top_menu_search()
|
|||
* @param array $menu_array_after Table of menu entries to show after entries of menu handler
|
||||
* @param int $leftmenuwithoutmainarea Must be set to 1. 0 by default for backward compatibility with old modules.
|
||||
* @param string $title Title of web page
|
||||
* @param string $acceptdelayedhtml 1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
|
||||
* @param int $acceptdelayedhtml 1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
|
||||
* @return void
|
||||
*/
|
||||
function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_array_after = array(), $leftmenuwithoutmainarea = 0, $title = '', $acceptdelayedhtml = 0)
|
||||
|
|
|
|||
|
|
@ -523,10 +523,12 @@ class Productbatch extends CommonObject
|
|||
$tmp->context['stock_date_entry'] = $obj->date_entree;
|
||||
}
|
||||
|
||||
// Some properties of the lot
|
||||
$tmp->lotid = $obj->lotid; // ID in table of the details of properties of each lots
|
||||
$tmp->sellby = $dbs->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
|
||||
$tmp->eatby = $dbs->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
|
||||
if ($fk_product > 0) {
|
||||
// Some properties of the lot
|
||||
$tmp->lotid = $obj->lotid; // ID in table of the details of properties of each lots
|
||||
$tmp->sellby = $dbs->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
|
||||
$tmp->eatby = $dbs->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
|
||||
}
|
||||
|
||||
$ret[$tmp->batch] = $tmp; // $ret is for a $fk_product_stock and unique key is on $fk_product_stock+batch
|
||||
$i++;
|
||||
|
|
|
|||
|
|
@ -1159,7 +1159,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|||
if (!empty($arrayfields['m.rowid']['checked'])) {
|
||||
// Ref
|
||||
print '<td class="liste_titre left">';
|
||||
print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
||||
print '<input class="flat maxwidth40" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
||||
print '</td>';
|
||||
}
|
||||
if (!empty($arrayfields['m.datem']['checked'])) {
|
||||
|
|
|
|||
|
|
@ -397,7 +397,7 @@ class Tickets extends DolibarrApi
|
|||
$this->ticket->$field = $value;
|
||||
}
|
||||
|
||||
if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
|
||||
if ($this->ticket->update(DolibarrApiAccess::$user)) {
|
||||
return $this->get($id);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -929,7 +929,7 @@ class Ticket extends CommonObject
|
|||
* @param int $notrigger 0=launch triggers after, 1=disable triggers
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
public function update($user = 0, $notrigger = 0)
|
||||
public function update($user, $notrigger = 0)
|
||||
{
|
||||
$error = 0;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue