)).'?s='.$width.'&d='.$defaultimg.' "'.$email.' Gravatar avatar")
'; // gravatar need md5 hash
} else {
if ($nophoto == 'company') {
- $ret .= ''.img_picto('', 'company').'
';
+ $ret .= ''.img_picto('', 'company').'
';
+ $ret .= '';
} else {
$ret .= ''.$form->showbarcode($object, 100, 'photoref').'
';
+ $morehtmlleft .= ''.$form->showbarcode($object, 100, 'photoref valignmiddle').'
';
}
if ($object->element == 'societe') {
@@ -5001,7 +5001,7 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
* @param string $field Field to use for new sorting
* @param string $begin ("" by defaut)
* @param string $moreparam Add more parameters on sort url links ("" by default)
- * @param string $moreattrib Options of attribute td ("" by defaut, example: 'align="center"')
+ * @param string $moreattrib Options of attribute td ("" by defaut)
* @param string $sortfield Current field used to sort
* @param string $sortorder Current sort order
* @param string $prefix Prefix for css. Use space after prefix to add your own CSS tag.
@@ -5023,7 +5023,7 @@ function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $m
* @param string $field Field to use for new sorting. Empty if this field is not sortable. Example "t.abc" or "t.abc,t.def"
* @param string $begin ("" by defaut)
* @param string $moreparam Add more parameters on sort url links ("" by default)
- * @param string $moreattrib Add more attributes on th ("" by defaut, example: 'align="center"'). To add more css class, use param $prefix.
+ * @param string $moreattrib Add more attributes on th ("" by defaut). To add more css class, use param $prefix.
* @param string $sortfield Current field used to sort (Ex: 'd.datep,d.id')
* @param string $sortorder Current sort order (Ex: 'asc,desc')
* @param string $prefix Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 273922ff615..776d0f0776f 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -824,10 +824,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
}
+ // Budget task
if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) {
print '22 if option FTP_CONNECT_WITH_SFTP (See Home-Setup-Other) is on (SFTP)
">
+
+ ">
';
+ print ''; ?>
@@ -242,10 +245,12 @@ if (!function_exists('ftp_connect')) { $idrss = $reg[0]; //print "x".join(',',$reg)."=".$obj->name."=".$idrss; - print "
'; + print '
';
print '';
-print '
| '; -print $langs->trans("FinancialCommitment"); -print ' | '; -print '|||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| '.$langs->trans("Term").' | '; @@ -276,10 +275,10 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0) { print '|||||||||||||||||||||||||||||||||||||||
| '.$i.' | '; print ''.dol_print_date(dol_time_plus_duree($object->datestart, $i - 1, 'm'), 'day').' | '; - print ''.price($insurance + (($i == 1) ? $regulInsurance : 0), 0, '', 1, -1, -1, $conf->currency).' | '; - print ''.price($int, 0, '', 1, -1, -1, $conf->currency).' | '; - print ''; - print ' | '.price($cap_rest).' | '; + print ''.price($insurance + (($i == 1) ? $regulInsurance : 0), 0, '', 1, -1, -1, $conf->currency).' | '; + print ''.price($int, 0, '', 1, -1, -1, $conf->currency).' | '; + print ''; + print ' | '.price($cap_rest).' | '; print '||||||||||||||||||||||||||||||
| '.$i.' | '; print ''.dol_print_date($line->datep, 'day').' | '; - print ''.price($insu, 0, '', 1, -1, -1, $conf->currency).' | '; - print ''.price($int, 0, '', 1, -1, -1, $conf->currency).' | '; + print ''.price($insu, 0, '', 1, -1, -1, $conf->currency).' | '; + print ''.price($int, 0, '', 1, -1, -1, $conf->currency).' | '; if (empty($line->fk_bank)) { - print ''; + print ' | '; } else { - print ' | '.price($mens, 0, '', 1, -1, -1, $conf->currency).' | '; + print ''.price($mens, 0, '', 1, -1, -1, $conf->currency).' | '; } - print ''.price($cap_rest, 0, '', 1, -1, -1, $conf->currency).' | '; + print ''.price($cap_rest, 0, '', 1, -1, -1, $conf->currency).' | '; print ''; if (!empty($line->fk_bank)) { print $langs->trans('Paid'); @@ -316,7 +315,7 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0) { print ' ('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')'; } } elseif (!$printed) { - print ''.$langs->trans('DoPayment').''; + print ''.$langs->trans('DoPayment').''; $printed = true; } print ' | '; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index c1ce8b4cf59..2b5485efd2a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -573,7 +573,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt( $sessiontokenforthisurl = (empty($_SESSION['token']) ? '' : $_SESSION['token']); // TODO Get the sessiontokenforthisurl into an array of session token (one array per base URL so we can use the CSRF per page and we keep ability for several tabs per url in a browser) if (GETPOSTISSET('token') && GETPOST('token') != 'notrequired' && GETPOST('token', 'alpha') != $sessiontokenforthisurl) { - dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING); + dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referer=".(empty($_SERVER['HTTP_REFERER'])?'':$_SERVER['HTTP_REFERER']).", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING); //dol_syslog("_SESSION['token']=".$sessiontokenforthisurl, LOG_DEBUG); // Do not output anything on standard output because this create problems when using the BACK button on browsers. So we just set a message into session. setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings'); diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php index 0166c7f2017..ed003d85667 100644 --- a/htdocs/product/class/productcustomerprice.class.php +++ b/htdocs/product/class/productcustomerprice.class.php @@ -797,9 +797,9 @@ class Productcustomerprice extends CommonObject /** * Force update price on child companies so child company has same prices than parent. * - * @param User $user that modifies - * @param int $forceupdateaffiliate update price on each soc child - * @return int <0 if KO, 0 = action disabled, >0 if OK + * @param User $user User that modifies + * @param int $forceupdateaffiliate update price on each soc child + * @return int <0 if KO, 0 = action disabled, >0 if OK */ public function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate) { diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 85848942fbe..31b2aa8e187 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -336,11 +336,11 @@ if ($action == 'importCSV' && !empty($user->rights->stock->mouvement->creer)) { continue; } //var_dump($data); - $tmp_id_sw = $data[$i][0]['val']; - $tmp_id_tw = $data[$i][1]['val']; - $tmp_id_product = $data[$i][2]['val']; - $tmp_qty = $data[$i][3]['val']; - $tmp_batch = $data[$i][4]['val']; + $tmp_id_sw = (int) $data[$i][0]['val']; + $tmp_id_tw = (int) $data[$i][1]['val']; + $tmp_id_product = (int) $data[$i][2]['val']; + $tmp_qty = price2num((float) $data[$i][3]['val'], 'MS'); + $tmp_batch = dol_escape_htmltag($data[$i][4]['val']); if (!is_numeric($tmp_id_product)) { $result = fetchref($productstatic, $tmp_id_product); diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php index d933e6f55a0..69e439fdf1f 100644 --- a/htdocs/projet/ajax/projects.php +++ b/htdocs/projet/ajax/projects.php @@ -41,7 +41,7 @@ if (!defined('NOREQUIRESOC')) { if (!defined('NOCSRFCHECK')) { define('NOCSRFCHECK', '1'); } -if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) { +if (!defined('NOREQUIREHTML')) { define('NOREQUIREHTML', '1'); } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 4d851b86270..8c48b7b1ae6 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1294,7 +1294,7 @@ class Project extends CommonObject $result .= $linkstart; if ($withpicto) { - $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip pictofixedwidth"'), 0, 0, $notooltip ? 0 : 1); + $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip pictofixedwidth em088"'), 0, 0, $notooltip ? 0 : 1); } if ($withpicto != 2) { $result .= $this->ref; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 52902604cec..018cb5c3408 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -152,18 +152,18 @@ $planned_workload = $planned_workloadhour * 3600 + $planned_workloadmin * 60; // Definition of fields for list $arrayfields = array( - 't.ref'=>array('label'=>$langs->trans("RefTask"), 'checked'=>1, 'position'=>1), - 't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>2), - 't.description'=>array('label'=>$langs->trans("Description"), 'checked'=>0, 'position'=>3), - 't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>4), - 't.datee'=>array('label'=>$langs->trans("Deadline"), 'checked'=>1, 'position'=>5), - 't.planned_workload'=>array('label'=>$langs->trans("PlannedWorkload"), 'checked'=>1, 'position'=>6), - 't.duration_effective'=>array('label'=>$langs->trans("TimeSpent"), 'checked'=>1, 'position'=>7), - 't.progress_calculated'=>array('label'=>$langs->trans("ProgressCalculated"), 'checked'=>1, 'position'=>8), - 't.progress'=>array('label'=>$langs->trans("ProgressDeclared"), 'checked'=>1, 'position'=>9), - 't.progress_summary'=>array('label'=>$langs->trans("TaskProgressSummary"), 'checked'=>1, 'position'=>10), - 't.budget_amount'=>array('label'=>"Budget", 'checked'=>1, 'position'=>11), - 'c.assigned'=>array('label'=>$langs->trans("TaskRessourceLinks"), 'checked'=>1, 'position'=>12), + 't.ref'=>array('label'=>"RefTask", 'checked'=>1, 'position'=>1), + 't.label'=>array('label'=>"LabelTask", 'checked'=>1, 'position'=>2), + 't.description'=>array('label'=>"Description", 'checked'=>0, 'position'=>3), + 't.dateo'=>array('label'=>"DateStart", 'checked'=>1, 'position'=>4), + 't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>5), + 't.planned_workload'=>array('label'=>"PlannedWorkload", 'checked'=>1, 'position'=>6), + 't.duration_effective'=>array('label'=>"TimeSpent", 'checked'=>1, 'position'=>7), + 't.progress_calculated'=>array('label'=>"ProgressCalculated", 'checked'=>1, 'position'=>8), + 't.progress'=>array('label'=>"ProgressDeclared", 'checked'=>1, 'position'=>9), + 't.progress_summary'=>array('label'=>"TaskProgressSummary", 'checked'=>1, 'position'=>10), + 't.budget_amount'=>array('label'=>"Budget", 'checked'=>0, 'position'=>11), + 'c.assigned'=>array('label'=>"TaskRessourceLinks", 'checked'=>1, 'position'=>12), ); if ($object->usage_bill_time) { $arrayfields['t.tobill'] = array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>11); diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index e1d45fc3471..5a91f47dbd9 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -162,7 +162,7 @@ $arrayfields = array( 't.progress_calculated'=>array('label'=>"ProgressCalculated", 'checked'=>1, 'position'=>104), 't.progress'=>array('label'=>"ProgressDeclared", 'checked'=>1, 'position'=>105), 't.progress_summary'=>array('label'=>"TaskProgressSummary", 'checked'=>1, 'position'=>106), - 't.budget_amount'=>array('label'=>"Budget", 'checked'=>1, 'position'=>107), + 't.budget_amount'=>array('label'=>"Budget", 'checked'=>0, 'position'=>107), 't.tobill'=>array('label'=>"TimeToBill", 'checked'=>0, 'position'=>110), 't.billed'=>array('label'=>"TimeBilled", 'checked'=>0, 'position'=>111), 't.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500), @@ -1290,9 +1290,12 @@ while ($i < $imaxinloop) { $totalarray['totalprogress_summary'] = $totalarray['nbfield']; } } + // Budget for task if (!empty($arrayfields['t.budget_amount']['checked'])) { print ''; - print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency); + if ($object->budget_amount) { + print ''.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).''; + } print ' | '; if (!$i) { $totalarray['nbfield']++; diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 24cadfd38f4..ef00a85a0d4 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -37,11 +37,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php'; // Load translation files required by the page $langs->loadlangs(array('projects', 'companies')); +$action = GETPOST('action', 'aZ09'); +$confirm = GETPOST('confirm', 'alpha'); + $id = GETPOST('id', 'int'); $ref = GETPOST("ref", 'alpha', 1); // task ref $taskref = GETPOST("taskref", 'alpha'); // task ref -$action = GETPOST('action', 'aZ09'); -$confirm = GETPOST('confirm', 'alpha'); $withproject = GETPOST('withproject', 'int'); $project_ref = GETPOST('project_ref', 'alpha'); $planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ?GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ?GETPOST('planned_workloadmin', 'int') * 60 : 0) : ''); @@ -262,7 +263,7 @@ if ($id > 0 || !empty($ref)) { // Title $morehtmlref .= $projectstatic->title; // Thirdparty - if ($projectstatic->thirdparty->id > 0) { + if (!empty($projectstatic->thirdparty->id) &&$projectstatic->thirdparty->id > 0) { $morehtmlref .= '||||||||||||||||||||||||||
| '.$langs->trans("Budget").' | '; if (strcmp($projectstatic->budget_amount, '')) { - print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency); + print ''.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).''; } print ' |
| '.$langs->trans("Description").' | '; @@ -554,7 +555,7 @@ if ($id > 0 || !empty($ref)) { // Third party $morehtmlref .= $langs->trans("ThirdParty").': '; - if (!empty($projectstatic->thirdparty)) { + if (!empty($projectstatic->thirdparty) && is_object($projectstatic->thirdparty)) { $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1); } $morehtmlref .= ''; @@ -633,7 +634,7 @@ if ($id > 0 || !empty($ref)) { // Budget print ' | ||||||||||||||||||
| '.$langs->trans("Budget").' | '; if (strcmp($object->budget_amount, '')) { - print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency); + print ''.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).''; } print ' |
| '; print $langs->trans("Usage"); print ' | '; @@ -942,7 +944,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser print $form->textwithpicto($langs->trans("BillTime"), $htmltext); print '
| '.$langs->trans("ChildOfTask").' | '; + if ($object->fk_task_parent > 0) { + $tasktmp = new Task($db); + $tasktmp->fetch($object->fk_task_parent); + print $tasktmp->getNomUrl(1); + } + print ' | ||||||
| '.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").' | '; + print ' | ||||||
| '.$langs->trans("DateStart").' - '.$langs->trans("Deadline").' | '; $start = dol_print_date($object->date_start, 'dayhour'); print ($start ? $start : '?'); $end = dol_print_date($object->date_end, 'dayhour'); @@ -1856,7 +1867,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Date if (!empty($arrayfields['t.task_date']['checked'])) { print ' | '; - if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) { if (empty($task_time->task_date_withhour)) { print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0); } else { @@ -1909,7 +1920,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser if (!empty($arrayfields['t.task_ref']['checked'])) { if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task print ' | '; - if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) { $formproject->selectTasks(-1, GETPOST('taskid', 'int') ? GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, ''); } else { $tasktmp->id = $task_time->fk_task; @@ -1941,7 +1952,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // By User if (!empty($arrayfields['author']['checked'])) { print ' | '; - if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) { if (empty($object->id)) { $object->fetch($id); } @@ -1972,7 +1983,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Note if (!empty($arrayfields['t.note']['checked'])) { print ' | '; - if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ''; } else { print dol_nl2br($task_time->note); @@ -1981,14 +1992,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser if (!$i) { $totalarray['nbfield']++; } - } elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { + } elseif ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ''; } // Time spent if (!empty($arrayfields['t.task_duration']['checked'])) { print ' | '; - if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ''; print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text'); } else { @@ -2125,13 +2136,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Add line to split - if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ' | |
| '; - if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { if (empty($task_time->task_date_withhour)) { print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0); } else { @@ -2175,7 +2186,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // User if (!empty($arrayfields['author']['checked'])) { print ' | '; - if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { if (empty($object->id)) { $object->fetch($id); } @@ -2203,20 +2214,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Note if (!empty($arrayfields['t.note']['checked'])) { print ' | '; - if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ''; } else { print dol_nl2br($task_time->note); } print ' | '; - } elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + } elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ''; } // Time spent if (!empty($arrayfields['t.task_duration']['checked'])) { print ''; - if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ''; print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text'); } else { @@ -2269,7 +2280,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Date if (!empty($arrayfields['t.task_date']['checked'])) { print ' | '; - if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { if (empty($task_time->task_date_withhour)) { print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0); } else { @@ -2313,7 +2324,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // User if (!empty($arrayfields['author']['checked'])) { print ' | '; - if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { if (empty($object->id)) { $object->fetch($id); } @@ -2341,20 +2352,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Note if (!empty($arrayfields['t.note']['checked'])) { print ' | '; - if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ''; } else { print dol_nl2br($task_time->note); } print ' | '; - } elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { + } elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { print ''; } // Time spent if (!empty($arrayfields['t.task_duration']['checked'])) { print '';
- if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+ if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
print '';
print $form->select_duration('new_duration_2', 0, 0, 'text');
} else {
diff --git a/htdocs/public/cron/cron_run_jobs_by_url.php b/htdocs/public/cron/cron_run_jobs_by_url.php
index fea2a2d7f82..fa81b8d8bd7 100644
--- a/htdocs/public/cron/cron_run_jobs_by_url.php
+++ b/htdocs/public/cron/cron_run_jobs_by_url.php
@@ -135,7 +135,7 @@ if (!empty($id)) {
$filter['t.rowid'] = $id;
}
-$result = $object->fetch_all('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
+$result = $object->fetchAll('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
if ($result < 0) {
echo "Error: ".$object->error;
dol_syslog("cron_run_jobs.php fetch Error".$object->error, LOG_ERR);
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index c2cd40f6b6d..517bbca5c19 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -93,11 +93,11 @@ if ((float) DOL_VERSION >= 6) {
}
if ($action == 'updateMask') {
- $maskconstorder = GETPOST('maskconstorder', 'alpha');
- $maskorder = GETPOST('maskorder', 'alpha');
+ $maskconstjob = GETPOST('maskconstjob', 'alpha');
+ $maskjob = GETPOST('maskjob', 'alpha');
- if ($maskconstorder) {
- $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+ if ($maskconstjob) {
+ $res = dolibarr_set_const($db, $maskconstjob, $maskjob, 'chaine', 0, '', $conf->entity);
}
if (!($res > 0)) {
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 1ab24288401..adc12a656f4 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -93,11 +93,11 @@ if ((float) DOL_VERSION >= 6) {
}
if ($action == 'updateMask') {
- $maskconstorder = GETPOST('maskconstorder', 'alpha');
- $maskorder = GETPOST('maskorder', 'alpha');
+ $maskconstcand = GETPOST('maskconstcand', 'alpha');
+ $maskcand = GETPOST('maskcand', 'alpha');
- if ($maskconstorder) {
- $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+ if ($maskconstcand) {
+ $res = dolibarr_set_const($db, $maskconstcand, $maskcand, 'chaine', 0, '', $conf->entity);
}
if (!($res > 0)) {
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index cc56b1c9cd7..e0a59b0e3a6 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -105,9 +105,9 @@ class RecruitmentJobPosition extends CommonObject
'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'2', 'autofocusoncreate'=>1),
'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500', 'picto'=>'project'),
- 'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
+ 'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php:status=1', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail', 'picto'=>'email'),
- 'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
+ 'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php::t.statut = 1', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'$conf->societe->enabled', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
'date_planned' => array('type'=>'date', 'label'=>'DateExpected', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php
new file mode 100644
index 00000000000..000c045a03f
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php
@@ -0,0 +1,143 @@
+
+ * Copyright (C) 2004-2007 Laurent Destailleur \n"; + $texte .= ''; + + return $texte; + } + + /** + * Return an example of numbering + * + * @return string Example + */ + public function getExample() + { + global $conf, $langs, $mysoc; + + $old_code_client = $mysoc->code_client; + $old_code_type = $mysoc->typent_code; + $mysoc->code_client = 'CCCCCCCCCC'; + $mysoc->typent_code = 'TTTTTTTTTT'; + $numExample = $this->getNextValue($mysoc, ''); + $mysoc->code_client = $old_code_client; + $mysoc->typent_code = $old_code_type; + + if (!$numExample) { + $numExample = $langs->trans('NotConfigured'); + } + return $numExample; + } + + /** + * Return next free value + * + * @param Object $object Object we need next value for + * @return string Value if KO, <0 if KO + */ + public function getNextValue($object) + { + global $db, $conf; + + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + + // We get cursor rule + $mask = getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADVANCED_MASK'); + + if (!$mask) { + $this->error = 'NotConfigured'; + return 0; + } + + $date = $object->date; + + $numFinal = get_next_value($db, $mask, 'recruitment_recruitmentcandidature', 'ref', '', null, $date); + + return $numFinal; + } +} diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php index e4a07c63633..c7253f182bf 100644 --- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php +++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php @@ -68,7 +68,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi $texte .= ' |