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

review

Browse Source
This commit is contained in:
Florian HENRY 2023-03-05 10:40:31 +01:00
parent e81231ed28
commit bea2371bc1
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/html.form.class.php
View File

@ -10074,7 +10074,7 @@ class Form
* @param string $projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
* @param string $showproject 'all' = Show project info, ''=Hide project info
* @param User $usertofilter User object to use for filtering
* @return int Nbr of project if OK, <0 if KO
* @return string HTML Select Invoice
*/
public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
{
@ -10206,6 +10206,7 @@ class Form
$this->db->free($resql);
} else {
dol_print_error($this->db);
return '';
}
}

4
htdocs/core/class/html.formprojet.class.php
View File

@ -762,7 +762,7 @@ class FormProjets
* @param string $morecss More css added to the select component
* @param array $filters Array of filters
* @param int $lineOnly return only option for line
* @return int Nbr of project if OK, <0 if KO
* @return string HTML Select
*/
public function selectInvoiceAndLine($selectedInvoiceId = 0, $selectedLineId = 0, $htmlNameInvoice = 'invoiceid', $htmlNameInvoiceLine = 'invoicelineid', $morecss = 'maxwidth500', $filters = array(), $lineOnly = 0)
{
@ -820,6 +820,7 @@ class FormProjets
$out .= '</select>';
} else {
dol_print_error($this->db->lasterror);
return '';
}
}
@ -871,6 +872,7 @@ class FormProjets
}
} else {
dol_print_error($this->db->lasterror);
return '';
}
return $out;

3
htdocs/projet/tasks/time.php
View File

@ -309,7 +309,8 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
}
$object->timespent_fk_user = GETPOST("userid_line", 'int');
$object->timespent_fk_product = GETPOST("fk_product", 'int');
$object->timespent_fk_product = GETPOST("fk_product", 'int');
$object->timespent_invoiceid = GETPOST("invoiceid", 'int');
$object->timespent_invoicelineid = GETPOST("invoicelineid", 'int');
$result = 0;
if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {