Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
ldestailleur
2025-03-19 13:47:25 +01:00
parent af9b45a186 557cda5161
commit a0ec0002f6
15 changed files with 172 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/admin/dict.php
View File

@@ -2457,7 +2457,7 @@ if ($id > 0) {
} elseif ($valuetoshow == 2) {
$valuetoshow = $langs->trans('CurrentNext');
}
$class = "center";
$class = "center tdoverflowmax125";
} elseif ($value == 'price' || preg_match('/^amount/i', $value)) {
$valuetoshow = price($valuetoshow);
}
@@ -2469,6 +2469,8 @@ if ($id > 0) {
$key = $langs->trans("PaymentCondition".strtoupper($obj->code));
$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->$value);
$valuetoshow = nl2br($valuetoshow);
$titletoshow = $valuetoshow;
$class = 'small tdoverflowmax200';
} elseif ($value == 'label' && $tabname[$id] == 'c_country') {
$key = $langs->trans("Country".strtoupper($obj->code));
$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->$value);
@@ -2496,6 +2498,8 @@ if ($id > 0) {
} elseif ($value == 'libelle' && $tabname[$id] == 'c_payment_term') {
$key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->$value);
$titletoshow = $key;
$class = "tdoverflowmax150";
} elseif ($value == 'libelle' && $tabname[$id] == 'c_paiement') {
$transavailableforcode = $langs->tab_translate["PaymentType".strtoupper($obj->code)];
$key = $langs->trans("PaymentType".strtoupper($obj->code));
@@ -2641,7 +2645,7 @@ if ($id > 0) {
// Favorite, EEC & Sepa
// Only for country dictionary
if ($id == DICT_COUNTRY) {
print '<td class="nowrap center">';
print '<td class="nowraponall center">';
// Is in EEC
if ($iserasable) {
print '<a class="reposition" href="'.$url.'action='.$acts[$obj->eec].'_eec&token='.newToken().'">'.$actl[$obj->eec].'</a>';
@@ -2649,7 +2653,7 @@ if ($id > 0) {
print '<span class="opacitymedium">'.$langs->trans("AlwaysActive").'</span>';
}
print '</td>';
print '<td class="nowrap center">';
print '<td class="nowraponall center">';
// Is in Sepa
if ($iserasable) {
print '<a class="reposition" href="'.$url.'action='.$acts[$obj->sepa].'_sepa&token='.newToken().'">'.$actl[$obj->sepa].'</a>';
@@ -2657,7 +2661,7 @@ if ($id > 0) {
print '<span class="opacitymedium">'.$langs->trans("AlwaysActive").'</span>';
}
print '</td>';
print '<td class="nowrap center">';
print '<td class="nowraponall center">';
// Favorite
if ($iserasable) {
print '<a class="reposition" href="'.$url.'action='.$acts[$obj->favorite].'_favorite&token='.newToken().'">'.$actl[$obj->favorite].'</a>';
@@ -2669,7 +2673,7 @@ if ($id > 0) {
}
// Active
print '<td class="nowrap center">';
print '<td class="nowraponall center">';
if ($canbedisabled) {
print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
} else {

15
htdocs/admin/mails_templates.php
View File

@@ -70,6 +70,7 @@ $massaction = GETPOST('massaction', 'alpha');
$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
$mode = GETPOST('mode', 'aZ09');
$optioncss = GETPOST('optioncss', 'alpha');
$backtopage = GETPOST('backtopage');
$contextpage = GETPOST('contextpage', 'aZ09');
$id = $rowid = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('rowid'));
@@ -290,15 +291,21 @@ if ($rowid > 0) {
* Actions
*/
if (GETPOST('cancel', 'alpha')) {
if (GETPOST('cancel', 'alpha') || GETPOST('actioncancel', 'alpha')) {
$action = 'list';
$massaction = '';
if (!empty($backtopage)) {
header("Location: ".$backtopage);
exit(1);
}
}
if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
$massaction = '';
}
$parameters = array();
$object = null;
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -442,6 +449,11 @@ if (empty($reshook)) {
if ($result) { // Add is ok
setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
$_POST = array('id' => 25); // Clean $_POST array, we keep only id
if (!empty($backtopage)) {
header("Location: ".$backtopage);
exit(1);
}
} else {
if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
@@ -743,6 +755,7 @@ if ($action == 'create') {
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';

2
htdocs/comm/propal/card.php
View File

@@ -2106,7 +2106,7 @@ if ($action == 'create') {
print '</td></tr>';
// Validaty duration
print '<tr class="field_duree_validitee"><td class="titlefieldcreate fieldrequired">'.$langs->trans("ValidityDuration").'</td><td class="valuefieldcreate">'.img_picto('', 'clock', 'class="pictofixedwidth"').'<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
print '<tr class="field_duree_validitee"><td class="titlefieldcreate fieldrequired">'.$langs->trans("ValidityDuration").'</td><td class="valuefieldcreate">'.img_picto('', 'clock', 'class="pictofixedwidth"').'<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : getDolGlobalString('PROPALE_VALIDITY_DURATION')).'"> '.$langs->trans("days").'</td></tr>';
// Terms of payment
print '<tr class="field_cond_reglement_id"><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';

65
htdocs/compta/facture/class/facture.class.php
View File

@@ -3422,9 +3422,14 @@ class Facture extends CommonInvoice
$num = $this->ref;
}
if (!$num) {
$error++;
} else {
$this->oldref = $this->ref;
$this->newref = dol_sanitizeFileName($num);
}
if ($num) {
if (!$error) {
$this->update_price(1);
// Validate
@@ -3442,13 +3447,7 @@ class Facture extends CommonInvoice
$this->error = $this->db->lasterror();
$error++;
}
// We check if the invoice was provisional
/*
if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref))) {
// La verif qu'une remise n'est pas utilisee 2 fois est faite au moment de l'insertion de ligne
}
*/
if (!$error) {
// Define third party as a customer
@@ -3573,7 +3572,6 @@ class Facture extends CommonInvoice
}
}
}
}
/*
* Set situation_final to 0 if is a credit note and the invoice source is a invoice situation (case when invoice situation is at 100%)
@@ -3605,8 +3603,6 @@ class Facture extends CommonInvoice
}
if (!$error) {
$this->oldref = $this->ref;
// Rename directory if dir was a temporary ref
if (preg_match('/^[\(]?PROV/i', $this->ref)) {
// Now we rename also files into index
@@ -3624,28 +3620,6 @@ class Facture extends CommonInvoice
$error++;
$this->error = $this->db->lasterror();
}
// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->facture->dir_output.'/'.$oldref;
$dirdest = $conf->facture->dir_output.'/'.$newref;
if (!$error && file_exists($dirsource)) {
dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
if (@rename($dirsource, $dirdest)) {
dol_syslog("Rename ok");
// Rename docs starting with $oldref with $newref
$listoffiles = dol_dir_list($conf->facture->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
foreach ($listoffiles as $fileentry) {
$dirsource = $fileentry['name'];
$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
$dirsource = $fileentry['path'].'/'.$dirsource;
$dirdest = $fileentry['path'].'/'.$dirdest;
@rename($dirsource, $dirdest);
}
}
}
}
}
@@ -3689,8 +3663,31 @@ class Facture extends CommonInvoice
$this->setFinal($user);
}
}
} else {
$error++;
}
// Rename directory if dir was a temporary ref
if (!$error && preg_match('/^[\(]?PROV/i', $this->oldref)) {
// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
$oldref = dol_sanitizeFileName($this->oldref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->facture->dir_output.'/'.$oldref;
$dirdest = $conf->facture->dir_output.'/'.$newref;
if (!$error && file_exists($dirsource)) {
dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
if (@rename($dirsource, $dirdest)) {
dol_syslog("Rename ok");
// Rename docs starting with $oldref with $newref
$listoffiles = dol_dir_list($conf->facture->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
foreach ($listoffiles as $fileentry) {
$dirsource = $fileentry['name'];
$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
$dirsource = $fileentry['path'].'/'.$dirsource;
$dirdest = $fileentry['path'].'/'.$dirdest;
@rename($dirsource, $dirdest);
}
}
}
}
if (!$error) {

2
htdocs/core/boxes/box_factures_fourn_imp.php
View File

@@ -229,7 +229,7 @@ class box_factures_fourn_imp extends ModeleBoxes
'text' => "&nbsp;",
);
$this->info_box_contents[$line][] = array(
'td' => 'class="right liste_total" ',
'td' => 'class="nowraponall right liste_total"',
'text' => price($totalamount, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(

4
htdocs/core/boxes/box_factures_imp.php
View File

@@ -235,7 +235,7 @@ class box_factures_imp extends ModeleBoxes
// Add the sum à the bottom of the boxes
$this->info_box_contents[$line][] = array(
'tr' => 'class="liste_total_wrap"',
'tr' => 'class="liste_total"',
'td' => 'class="liste_total"',
'text' => $langs->trans("Total"),
);
@@ -244,7 +244,7 @@ class box_factures_imp extends ModeleBoxes
'text' => "&nbsp;",
);
$this->info_box_contents[$line][] = array(
'td' => 'class="right liste_total" ',
'td' => 'class="nowraponall right liste_total" ',
'text' => price($totalamount, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(

1
htdocs/core/class/notify.class.php
View File

@@ -957,6 +957,7 @@ class Notify
}
$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
complete_substitutions_array($substitutionarray, $outputlangs, $object);
// Note the substitution array should contains __REF__, __NEWREF__ ....
$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
$message = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
} else {

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

@@ -1906,6 +1906,8 @@ function form_constantes($tableau, $strictw3c = 2, $helptext = '', $text = 'Valu
//var_dump($arraydefaultmessage);
//var_dump($arrayofmessagename);
print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
print '<a href="'.DOL_URL_ROOT.'/admin/mails_templates.php?action=create&type_template='.urlencode($tmp[1]).'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_picto('', 'add').'</a>';
} elseif (preg_match('/MAIL_FROM$/i', $const)) {
print img_picto('', 'email', 'class="pictofixedwidth"').'<input type="text" class="flat minwidth300" name="constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.dol_escape_htmltag($obj->value).'">';
} else { // type = 'string' ou 'chaine'

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

@@ -927,9 +927,9 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
$filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
$result .= '<tr class="nowrap">';
$result .= '<tr class="oddeven">';
$result .= '<td class="oddeven">';
$result .= '<td class="nowrap">';
$result .= '<table class="nobordernopadding">';
$result .= '<tr class="nocellnopadd">';
@@ -942,7 +942,7 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
$result .= '</td>';
$result .= '<td class="tdoverflowmax150">'.$companystatic->getNomUrl(1, 'customer').'</td>';
$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
$result .= '<td title="'.dol_print_date($db->jdate($obj->datec), 'day').'">'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
$result .= '<td class="right amount">'.price($obj->total_ttc).'</td>';
// Load amount of existing payment of invoice (needed for complete status)
@@ -1207,7 +1207,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
print '<td class="nowrap tdoverflowmax100">';
print $societestatic->getNomUrl(1, 'customer');
print '</td>';
print '<td class="right">';
print '<td class="right" title="'.dol_print_date($db->jdate($obj->datelimite), 'day').'">';
print dol_print_date($db->jdate($obj->datelimite), 'day');
if ($tmpinvoice->hasDelay()) {
print img_warning($langs->trans("Late"));

2
htdocs/core/triggers/interface_50_modNotification_Notification.class.php
View File

@@ -99,7 +99,7 @@ class InterfaceNotification extends DolibarrTriggers
$notify = new Notify($this->db);
$resultSend = $notify->send($action, $object);
if ($resultSend < 0) {
$this->errors = array_merge($this->errors, $notify->errors);
$this->errors = array_merge(empty($this->errors) ? array() : $this->errors, $notify->errors);
return $resultSend;
}

7
htdocs/fourn/facture/card.php
View File

@@ -132,7 +132,7 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture',
// Common permissions
$usercanread = ($user->hasRight("fournisseur", "facture", "lire") || $user->hasRight("supplier_invoice", "lire"));
$usercancreate = ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"));
$usercandelete = ($user->hasRight("fournisseur", "facture", "supprimer") || $user->hasRight("supplier_invoice", "supprimer"));
$usercandelete = (($user->hasRight("fournisseur", "facture", "supprimer") || $user->hasRight("supplier_invoice", "supprimer")) || ($usercancreate && $object->is_erasable() == 1));
$usercancreatecontract = $user->hasRight("contrat", "creer");
// Advanced permissions
@@ -279,7 +279,7 @@ if (empty($reshook)) {
$isErasable = $object->is_erasable();
if (($usercandelete && $isErasable > 0) || ($usercancreate && $isErasable == 1)) {
if ($usercandelete && $isErasable > 0) {
$revertstock = GETPOST('revertstock');
if ($revertstock) {
@@ -4175,8 +4175,9 @@ if ($action == 'create') {
}
// Delete
if ($action != 'confirm_edit' && $usercandelete) {
$isErasable = $object->is_erasable();
if ($action != 'confirm_edit' && ($usercandelete || ($usercancreate && $isErasable == 1))) { // isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
$enableDelete = false;
$htmltooltip = '';
$params = (empty($conf->use_javascript_ajax) ? array() : array('attr' => array('class' => 'reposition')));

10
htdocs/societe/notify/card.php
View File

@@ -249,7 +249,7 @@ if ($result > 0) {
// Add notification form
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.urlencode((string) ($id)).'" method="POST">';
print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.urlencode((string) $socid).'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="page_y" value="">';
if ($action == 'create') {
@@ -276,7 +276,7 @@ if ($result > 0) {
dol_print_error($db);
}
$param = '';
$param = "&socid=".$socid;
$newcardbutton = '';
$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->hasRight("societe", "creer"));
@@ -290,12 +290,6 @@ if ($result > 0) {
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
print_barre_liste($titlelist, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, (empty($nbtotalofrecords) ? -1 : $nbtotalofrecords), 'email', 0, $newcardbutton, '', $limitforsubscription, 0, 0, 1);
print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="add">';
$param = "&socid=".$socid;
// Line with titles
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';

2
htdocs/theme/eldy/global.inc.php
View File

@@ -319,7 +319,7 @@ th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decora
tr.liste_titre th.liste_titre_sel:not(.maxwidthsearch), tr.liste_titre td.liste_titre_sel:not(.maxwidthsearch),
tr.liste_titre th.liste_titre:not(.maxwidthsearch), tr.liste_titre td.liste_titre:not(.maxwidthsearch) { opacity: 0.8; }
/* th.liste_titre_sel a, th.liste_titre a, td.liste_titre_sel a, td.liste_titre a { color: #766; } */
tr.liste_titre_filter th.liste_titre { text-align: unset; }
tr.liste_titre_filter th.liste_titre:not(.center) { text-align: unset; }
.liste_titre.trheight5em {
height: 4em !important;
}

2
htdocs/theme/md/style.css.php
View File

@@ -4984,7 +4984,7 @@ tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_tit
/* border-bottom: 1px solid var(--colortopbordertitle1); */
border-bottom: none;
}
tr.liste_titre_filter th.liste_titre { text-align: unset; }
tr.liste_titre_filter th.liste_titre:not(.center) { text-align: unset; }
/*
div.liste_titre {

1
scripts/cron/cron_run_jobs.php
View File

@@ -299,6 +299,7 @@ if (is_array($object->lines) && (count($object->lines) > 0)) {
} else {
$nbofjobslaunchedok++;
$resultstring = 'OK';
echo " - ";
}
echo "Result of run_jobs ".$resultstring." result = ".$result;