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

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-08 02:55:55 +02:00
commit 77301c50ee
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/class/accountingjournal.class.php
View File

@ -456,7 +456,7 @@ class AccountingJournal extends CommonObject
$sql .= " SELECT DISTINCT fk_docdet"; $sql .= " SELECT DISTINCT fk_docdet";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping"; $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
$sql .= " WHERE doc_type = 'asset'"; $sql .= " WHERE doc_type = 'asset'";
$sql .= ")"; $sql .= ") ";
}*/ }*/
$sql .= "SELECT ad.fk_asset AS rowid, a.ref AS asset_ref, a.label AS asset_label, a.acquisition_value_ht AS asset_acquisition_value_ht"; $sql .= "SELECT ad.fk_asset AS rowid, a.ref AS asset_ref, a.label AS asset_label, a.acquisition_value_ht AS asset_acquisition_value_ht";

2
htdocs/core/lib/invoice.lib.php
View File

@ -71,6 +71,8 @@ function facture_prepare_head($object)
} else { } else {
dol_print_error($db); dol_print_error($db);
} }
$langs->load("banks");
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.urlencode($object->id); $head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.urlencode($object->id);
$head[$h][1] = $langs->trans('StandingOrders'); $head[$h][1] = $langs->trans('StandingOrders');
if ($nbStandingOrders > 0) { if ($nbStandingOrders > 0) {

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

@ -1985,7 +1985,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if (!empty($arrayfields['t.note']['checked'])) { if (!empty($arrayfields['t.note']['checked'])) {
print '<td class="small">'; print '<td class="small">';
if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) { if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note).'</textarea>'; print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note, 0, 1).'</textarea>';
} else { } else {
print dol_nl2br($task_time->note); print dol_nl2br($task_time->note);
} }
@ -1994,7 +1994,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
} elseif ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) { } elseif ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
print '<input type="hidden" name="timespent_note_line" value="'.dol_escape_htmltag($task_time->note).'">'; print '<input type="hidden" name="timespent_note_line" value="'.dol_escape_htmltag($task_time->note, 0, 1).'">';
} }
// Time spent // Time spent
@ -2216,13 +2216,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if (!empty($arrayfields['t.note']['checked'])) { if (!empty($arrayfields['t.note']['checked'])) {
print '<td class="tdoverflowmax300">'; print '<td class="tdoverflowmax300">';
if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note).'</textarea>'; print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note, 0, 1).'</textarea>';
} else { } else {
print dol_nl2br($task_time->note); print dol_nl2br($task_time->note);
} }
print '</td>'; print '</td>';
} elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { } elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
print '<input type="hidden" name="timespent_note_line" rows="'.ROWS_1.'" value="'.dol_escape_htmltag($task_time->note).'">'; print '<input type="hidden" name="timespent_note_line" rows="'.ROWS_1.'" value="'.dol_escape_htmltag($task_time->note, 0, 1).'">';
} }
// Time spent // Time spent
@ -2354,13 +2354,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if (!empty($arrayfields['t.note']['checked'])) { if (!empty($arrayfields['t.note']['checked'])) {
print '<td class="small tdoverflowmax300"">'; print '<td class="small tdoverflowmax300"">';
if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note).'</textarea>'; print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note, 0, 1).'</textarea>';
} else { } else {
print dol_nl2br($task_time->note); print dol_nl2br($task_time->note);
} }
print '</td>'; print '</td>';
} elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) { } elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
print '<input type="hidden" name="timespent_note_line_2" value="'.dol_escape_htmltag($task_time->note).'">'; print '<input type="hidden" name="timespent_note_line_2" value="'.dol_escape_htmltag($task_time->note, 0, 1).'">';
} }
// Time spent // Time spent

6
htdocs/ticket/class/ticket.class.php
View File

@ -2791,8 +2791,8 @@ class Ticket extends CommonObject
$result = $this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames); $result = $this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
if ($result) { if ($result) {
// update last_msg_sent date // update last_msg_sent date
$object->date_last_msg_sent = dol_now(); $this->date_last_msg_sent = dol_now();
$object->update($user); $this->update($user);
} }
} }
} }
@ -2801,7 +2801,7 @@ class Ticket extends CommonObject
} }
// Set status to "answered" if not set yet, but only if internal user // Set status to "answered" if not set yet, but only if internal user
if ($object->fk_statut < 3 && !$user->socid) { if ($object->status < 3 && !$user->socid) {
$object->setStatut(3); $object->setStatut(3);
} }
return 1; return 1;