diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php index 42675cda7b4..52932b749a0 100644 --- a/htdocs/compta/bank/class/paymentvarious.class.php +++ b/htdocs/compta/bank/class/paymentvarious.class.php @@ -660,6 +660,7 @@ class PaymentVarious extends CommonObject // phpcs:enable global $langs; + /* if (empty($status)) { $status = 0; } @@ -676,6 +677,8 @@ class PaymentVarious extends CommonObject $statusType = 'status'.$status; return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode); + */ + return ''; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0639c01cf70..2a5a51f62d5 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6710,11 +6710,11 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $ $nbdecimal = dol_strlen($decpart); } // Si on depasse max - $max_nbdecimal = getDolGlobalString('MAIN_MAX_DECIMALS_SHOWN'); - if ($trunc && $nbdecimal > (int) $max_nbdecimal) { + $max_nbdecimal = (int) str_replace('...', '', getDolGlobalString('MAIN_MAX_DECIMALS_SHOWN')); + if ($trunc && $nbdecimal > $max_nbdecimal) { $nbdecimal = $max_nbdecimal; - if (preg_match('/\.\.\./i', $nbdecimal)) { - // Si un affichage est tronque, on montre des ... + if (preg_match('/\.\.\./i', getDolGlobalString('MAIN_MAX_DECIMALS_SHOWN'))) { + // If output is truncated, we show ... $end = '...'; } } @@ -6722,9 +6722,9 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $ // If force rounding if ((string) $forcerounding != '-1') { if ($forcerounding === 'MU') { - $nbdecimal = getDolGlobalString('MAIN_MAX_DECIMALS_UNIT'); + $nbdecimal = getDolGlobalInt('MAIN_MAX_DECIMALS_UNIT'); } elseif ($forcerounding === 'MT') { - $nbdecimal = getDolGlobalString('MAIN_MAX_DECIMALS_TOT'); + $nbdecimal = getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'); } elseif ($forcerounding >= 0) { $nbdecimal = $forcerounding; } diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index d0b5c98e64b..1a6541a18c1 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -270,6 +270,8 @@ if (empty($reshook)) { $num = count($objectsrc->lines); $totalqty = 0; + $product_batch_used = array(); + for ($i = 0; $i < $num; $i++) { $idl = "idl".$i; @@ -307,11 +309,17 @@ if (empty($reshook)) { //var_dump($sub_qty[$j]['id_batch']); //var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']); - if ($is_batch_or_serial == 2 && $sub_qty[$j]['q'] > 1) { + if ($is_batch_or_serial == 2 && ($sub_qty[$j]['q'] > 1 || ($sub_qty[$j]['q'] > 0 && in_array($sub_qty[$j]['id_batch'], $product_batch_used)))) { setEventMessages($langs->trans("TooManyQtyForSerialNumber", $product->ref, ''), null, 'errors'); $totalqty = 0; break 2; } + + if ($is_batch_or_serial == 2 && $sub_qty[$j]['q'] > 0) { + // we stock the batch id to test later if the same serial is shipped on another line for the same product + $product_batch_used[$j] = $sub_qty[$j]['id_batch']; + } + $j++; $batch = "batchl".$i."_".$j; $qty = "qtyl".$i.'_'.$j; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 8dd6cd6fe21..461b4abc2a2 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1734,7 +1734,9 @@ if ($action == 'create') { } // Delete + print '
'; print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete); + print '
'; } } } diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index ffb64293935..8e1efb1c773 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -661,7 +661,7 @@ if ($action == 'confirm_generateinvoice') { // Update lineid into line of timespent $sql = 'UPDATE '.MAIN_DB_PREFIX.'element_time SET invoice_line_id = '.((int) $lineid).', invoice_id = '.((int) $tmpinvoice->id); - $sql .= ' WHERE rowid IN ('.$db->sanitize(implode(',', $toselect)).') AND fk_user = '.((int) $userid); + $sql .= ' WHERE rowid = '.((int) $timespent_id).' AND fk_user = '.((int) $userid); $result = $db->query($sql); if (!$result) { $error++; diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php index 4bca4aa3d5a..87acc0f562a 100644 --- a/htdocs/theme/eldy/btn.inc.php +++ b/htdocs/theme/eldy/btn.inc.php @@ -56,6 +56,11 @@ div.tabsAction > div.divButAction > a.butActionDelete, div.tabsAction > div.divButAction > a.butActionRefused { margin-bottom: 1.4em !important; margin-right: 0px !important; + +} +.divButAction { + padding: 0 !important; + margin: 0 !important; } div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused { margin-bottom: 0 !important; @@ -78,7 +83,9 @@ span.butAction, span.butActionDelete { :not(.center) > .butActionRefused:last-child, :not(.center) > .butAction:last-child, :not(.center) > .butActionDelete:last-child { margin-: 0px !important; } -.butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { +.butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, +.divButAction + { text-decoration: none; text-transform: uppercase; font-weight: bold;