Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-18 23:03:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v23

Browse Source
This commit is contained in:
Laurent Destailleur
2026-01-05 01:11:10 +01:00
parent d558db5eca
commit 85d5f90cc0
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/blockedlog/ajax/block-info.php
View File

@@ -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)) {

5
htdocs/blockedlog/class/blockedlog.class.php
View File

@@ -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)) {

1
htdocs/langs/en_US/cashdesk.lang
View File

@@ -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