Debug v17
This commit is contained in:
commit
950b1506d1
@ -91,11 +91,11 @@ if ($action == 'update') {
|
||||
}
|
||||
}
|
||||
} elseif ($action == 'updateMask') {
|
||||
$maskconstorder = GETPOST('maskconstorder', 'aZ09');
|
||||
$maskorder = GETPOST('maskorder', 'alpha');
|
||||
$maskconst = GETPOST('maskconstEvaluation', 'aZ09');
|
||||
$maskvalue = GETPOST('maskEvaluation', 'alpha');
|
||||
|
||||
if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) {
|
||||
$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
|
||||
if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
|
||||
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
|
||||
if (!($res > 0)) {
|
||||
$error++;
|
||||
}
|
||||
|
||||
@ -324,7 +324,7 @@ if ($modecompta == 'CREANCES-DETTES') {
|
||||
}
|
||||
if ($selected_cat === -2) { // Without any category
|
||||
$sql .= " AND cp.fk_product is null";
|
||||
} elseif ($selected_cat) { // Into a specific category
|
||||
} elseif ($selected_cat > 0) { // Into a specific category
|
||||
if ($subcat) {
|
||||
$TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
|
||||
|
||||
|
||||
@ -68,7 +68,7 @@ class mod_evaluation_advanced extends ModeleNumRefEvaluation
|
||||
$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
||||
$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
$texte .= '<input type="hidden" name="action" value="updateMask">';
|
||||
$texte .= '<input type="hidden" name="maskconstBom" value="HRM_EVALUATION_ADVANCED_MASK">';
|
||||
$texte .= '<input type="hidden" name="maskconstEvaluation" value="HRM_EVALUATION_ADVANCED_MASK">';
|
||||
$texte .= '<table class="nobordernopadding" width="100%">';
|
||||
|
||||
$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Evaluation"), $langs->transnoentities("Evaluation"));
|
||||
|
||||
@ -1463,6 +1463,14 @@ class Product extends CommonObject
|
||||
}
|
||||
}
|
||||
|
||||
// Delete record into ECM index and physically
|
||||
if (!$error) {
|
||||
$res = $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
|
||||
if (!$res) {
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$error) {
|
||||
// We remove directory
|
||||
$ref = dol_sanitizeFileName($this->ref);
|
||||
|
||||
@ -92,11 +92,11 @@ if ((float) DOL_VERSION >= 6) {
|
||||
}
|
||||
|
||||
if ($action == 'updateMask') {
|
||||
$maskconstjob = GETPOST('maskconstjob', 'aZ09');
|
||||
$maskjob = GETPOST('maskjob', 'alpha');
|
||||
$maskconst = GETPOST('maskconstjob', 'alpha');
|
||||
$maskvalue = GETPOST('maskjob', 'alpha');
|
||||
|
||||
if ($maskconstjob && preg_match('/_MASK$/', $maskconstjob)) {
|
||||
$res = dolibarr_set_const($db, $maskconstjob, $maskjob, 'chaine', 0, '', $conf->entity);
|
||||
if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
|
||||
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
|
||||
}
|
||||
|
||||
if (!($res > 0)) {
|
||||
|
||||
@ -92,11 +92,11 @@ if ((float) DOL_VERSION >= 6) {
|
||||
}
|
||||
|
||||
if ($action == 'updateMask') {
|
||||
$maskconstcand = GETPOST('maskconstcand', 'aZ09');
|
||||
$maskcand = GETPOST('maskcand', 'alpha');
|
||||
$maskconst = GETPOST('maskconstcand', 'aZ09');
|
||||
$maskvalue = GETPOST('maskcand', 'alpha');
|
||||
|
||||
if ($maskconstcand && preg_match('/_MASK$/', $maskconstcand)) {
|
||||
$res = dolibarr_set_const($db, $maskconstcand, $maskcand, 'chaine', 0, '', $conf->entity);
|
||||
if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
|
||||
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
|
||||
}
|
||||
|
||||
if (!($res > 0)) {
|
||||
|
||||
@ -69,7 +69,7 @@ class mod_recruitmentcandidature_advanced extends ModeleNumRefRecruitmentCandida
|
||||
$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
$texte .= '<input type="hidden" name="action" value="updateMask">';
|
||||
$texte .= '<input type="hidden" name="maskconstcand" value="RECRUITMENT_RECRUITMENTCANDIDATURE_ADVANCED_MASK">';
|
||||
$texte .= '<table class="nobordernopadding" width="100%">';
|
||||
$texte .= '<table class="nobordernopadding centpercent">';
|
||||
|
||||
$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("RecruitmentCandidature"), $langs->transnoentities("RecruitmentCandidature"));
|
||||
$tooltip .= $langs->trans("GenericMaskCodes2");
|
||||
|
||||
@ -69,7 +69,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
|
||||
$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
$texte .= '<input type="hidden" name="action" value="updateMask">';
|
||||
$texte .= '<input type="hidden" name="maskconstjob" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK">';
|
||||
$texte .= '<table class="nobordernopadding" width="100%">';
|
||||
$texte .= '<table class="nobordernopadding centpercent">';
|
||||
|
||||
$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("RecruitmentJobPosition"), $langs->transnoentities("RecruitmentJobPosition"));
|
||||
$tooltip .= $langs->trans("GenericMaskCodes2");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user