lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-04 15:29:36 +01:00
commit 950b1506d1
8 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/hrm.php
View File

@ -91,11 +91,11 @@ if ($action == 'update') {
} }
} }
} elseif ($action == 'updateMask') { } elseif ($action == 'updateMask') {
$maskconstorder = GETPOST('maskconstorder', 'aZ09'); $maskconst = GETPOST('maskconstEvaluation', 'aZ09');
$maskorder = GETPOST('maskorder', 'alpha'); $maskvalue = GETPOST('maskEvaluation', 'alpha');
if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) { if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) { if (!($res > 0)) {
$error++; $error++;
} }

2
htdocs/compta/stats/cabyprodserv.php
View File

@ -324,7 +324,7 @@ if ($modecompta == 'CREANCES-DETTES') {
} }
if ($selected_cat === -2) { // Without any category if ($selected_cat === -2) { // Without any category
$sql .= " AND cp.fk_product is null"; $sql .= " AND cp.fk_product is null";
} elseif ($selected_cat) { // Into a specific category } elseif ($selected_cat > 0) { // Into a specific category
if ($subcat) { if ($subcat) {
$TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1); $TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);

2
htdocs/core/modules/hrm/mod_evaluation_advanced.php
View File

@ -68,7 +68,7 @@ class mod_evaluation_advanced extends ModeleNumRefEvaluation
$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
$texte .= '<input type="hidden" name="token" value="'.newToken().'">'; $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
$texte .= '<input type="hidden" name="action" value="updateMask">'; $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%">'; $texte .= '<table class="nobordernopadding" width="100%">';
$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Evaluation"), $langs->transnoentities("Evaluation")); $tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Evaluation"), $langs->transnoentities("Evaluation"));

8
htdocs/product/class/product.class.php
View File

@ -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) { if (!$error) {
// We remove directory // We remove directory
$ref = dol_sanitizeFileName($this->ref); $ref = dol_sanitizeFileName($this->ref);

8
htdocs/recruitment/admin/setup.php
View File

@ -92,11 +92,11 @@ if ((float) DOL_VERSION >= 6) {
} }
if ($action == 'updateMask') { if ($action == 'updateMask') {
$maskconstjob = GETPOST('maskconstjob', 'aZ09'); $maskconst = GETPOST('maskconstjob', 'alpha');
$maskjob = GETPOST('maskjob', 'alpha'); $maskvalue = GETPOST('maskjob', 'alpha');
if ($maskconstjob && preg_match('/_MASK$/', $maskconstjob)) { if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconstjob, $maskjob, 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
} }
if (!($res > 0)) { if (!($res > 0)) {

8
htdocs/recruitment/admin/setup_candidatures.php
View File

@ -92,11 +92,11 @@ if ((float) DOL_VERSION >= 6) {
} }
if ($action == 'updateMask') { if ($action == 'updateMask') {
$maskconstcand = GETPOST('maskconstcand', 'aZ09'); $maskconst = GETPOST('maskconstcand', 'aZ09');
$maskcand = GETPOST('maskcand', 'alpha'); $maskvalue = GETPOST('maskcand', 'alpha');
if ($maskconstcand && preg_match('/_MASK$/', $maskconstcand)) { if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconstcand, $maskcand, 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
} }
if (!($res > 0)) { if (!($res > 0)) {

2
htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php
View File

@ -69,7 +69,7 @@ class mod_recruitmentcandidature_advanced extends ModeleNumRefRecruitmentCandida
$texte .= '<input type="hidden" name="token" value="'.newToken().'">'; $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
$texte .= '<input type="hidden" name="action" value="updateMask">'; $texte .= '<input type="hidden" name="action" value="updateMask">';
$texte .= '<input type="hidden" name="maskconstcand" value="RECRUITMENT_RECRUITMENTCANDIDATURE_ADVANCED_MASK">'; $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("GenericMaskCodes", $langs->transnoentities("RecruitmentCandidature"), $langs->transnoentities("RecruitmentCandidature"));
$tooltip .= $langs->trans("GenericMaskCodes2"); $tooltip .= $langs->trans("GenericMaskCodes2");

2
htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
View File

@ -69,7 +69,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
$texte .= '<input type="hidden" name="token" value="'.newToken().'">'; $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
$texte .= '<input type="hidden" name="action" value="updateMask">'; $texte .= '<input type="hidden" name="action" value="updateMask">';
$texte .= '<input type="hidden" name="maskconstjob" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK">'; $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("GenericMaskCodes", $langs->transnoentities("RecruitmentJobPosition"), $langs->transnoentities("RecruitmentJobPosition"));
$tooltip .= $langs->trans("GenericMaskCodes2"); $tooltip .= $langs->trans("GenericMaskCodes2");