From ce0c4601bbc6d28ee0c05fcf9e3de31e90c461d6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 15 Feb 2024 17:05:54 +0100 Subject: [PATCH] Close #28181 New substitution variables for invoice --- htdocs/core/lib/functions.lib.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f1917579c99..77ab12ae863 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -8472,6 +8472,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, } } + if (is_object($object) && $object->element == 'facture') { + $substitutionarray['__INVOICE_SITUATION_NUMBER__'] = isset($object->situation_counter) ? $object->situation_counter : ''; + } if (is_object($object) && $object->element == 'shipping') { $substitutionarray['__SHIPPINGTRACKNUM__'] = $object->tracking_number; $substitutionarray['__SHIPPINGTRACKNUMURL__'] = $object->tracking_url; @@ -8663,8 +8666,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, if ((empty($exclude) || !in_array('objectamount', $exclude)) && (empty($include) || in_array('objectamount', $include))) { include_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php'; - $substitutionarray['__DATE_YMD__'] = is_object($object) ? (isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : null) : ''; - $substitutionarray['__DATE_DUE_YMD__'] = is_object($object) ? (isset($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : null) : ''; + $substitutionarray['__DATE_YMD__'] = is_object($object) ? (isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : null) : ''; + $substitutionarray['__DATE_DUE_YMD__'] = is_object($object) ? (isset($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : null) : ''; + $substitutionarray['__DATE_YMD_TEXT__'] = is_object($object) ? (isset($object->date) ? dol_print_date($object->date, 'daytext', 0, $outputlangs) : null) : ''; + $substitutionarray['__DATE_DUE_YMD_TEXT__'] = is_object($object) ? (isset($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'daytext', 0, $outputlangs) : null) : ''; $already_payed_all = 0; if (is_object($object) && ($object instanceof Facture)) {