From 85d5f90cc099cd6d5944fd6c8704cd71a8405c19 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 5 Jan 2026 01:11:10 +0100 Subject: [PATCH] Debug v23 --- htdocs/blockedlog/ajax/block-info.php | 9 +++++++++ htdocs/blockedlog/class/blockedlog.class.php | 5 ++++- htdocs/langs/en_US/cashdesk.lang | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php index e10076b5b41..9a9791ff8c8 100644 --- a/htdocs/blockedlog/ajax/block-info.php +++ b/htdocs/blockedlog/ajax/block-info.php @@ -133,6 +133,7 @@ function formatObject($objtoshow, $prefix) 'email_sent_counter' => "NumberOfEmailsSent", 'managers' => 'Managers', 'type_code' => 'PaymentMode', + 'date_creation' => 'DateCreation', 'datec' => 'DateCreation', 'dateh' => 'DateSubscription', 'datef' => 'DateEndSubscription', @@ -180,6 +181,14 @@ function formatObject($objtoshow, $prefix) 'type' => 'InvoiceType', 'info_bits' => 'TVA NPR or NOT', 'special_code' => 'Special line (WEEE line, option, id of module...)', + 'status' => 'Status', + 'cash' => 'PaymentTypeLIQ', + 'cash_lifetime' => $langs->transnoentities('LifetimeAmount', $langs->transnoentities('PaymentTypeLIQ')), + 'card' => 'PaymentTypeCB', + 'card_lifetime' => $langs->transnoentities('LifetimeAmount', $langs->transnoentities('PaymentTypeCB')), + 'cheque' => 'PaymentTypeCHQ', + 'cheque_lifetime' => $langs->transnoentities('LifetimeAmount', $langs->transnoentities('PaymentTypeCHQ')), + 'lifetime_start' => 'LifetimeStartDate' ); if (is_object($newobjtoshow) || is_array($newobjtoshow)) { diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index f02f04542b5..2b8193880a2 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -596,7 +596,10 @@ class BlockedLog 'name', 'lastname', 'firstname', 'region', 'region_id', 'region_code', 'state', 'state_id', 'state_code', 'country', 'country_id', 'country_code', 'total_ht', 'total_tva', 'total_ttc', 'total_localtax1', 'total_localtax2', 'barcode_type', 'barcode_type_code', 'barcode_type_label', 'barcode_type_coder', 'mode_reglement_id', 'cond_reglement_id', 'mode_reglement', 'cond_reglement', 'shipping_method_id', - 'extraparams', 'fk_incoterms', 'fk_user_creat', 'fk_user_valid', 'label_incoterms', 'location_incoterms', 'lines', 'nb', 'tms', 'comments', 'array_options', 'warnings')); + 'extraparams', 'fk_incoterms', 'fk_user_creat', 'fk_user_valid', 'label_incoterms', 'location_incoterms', 'lines', 'nb', 'tms', 'comments', 'array_options', 'warnings', + 'opening', 'status', 'date_valid' + ) + ); } if (!empty($object->thirdparty)) { diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 4a996848dee..43464f55577 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -181,4 +181,5 @@ CashControlEndDayMustNotBeInPast=It is not possible to make a daily cash control TheoricalView=Theorical view SentOrderToKitchen=Send order to kitchen LifetimeAmount=Lifetime amount +LifetimeStatDate=Lifetime amount start date AllTerminals=All terminals