From 3a4221f78d033134d4e1a85d10c2f75252ff8f63 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 2 Jan 2026 17:00:43 +0100 Subject: [PATCH] Debug v23 --- htdocs/core/lib/takepos.lib.php | 2 ++ htdocs/takepos/admin/appearance.php | 3 ++- htdocs/takepos/admin/bar.php | 3 ++- htdocs/takepos/admin/orderprinters.php | 9 ++++----- htdocs/takepos/admin/other.php | 3 ++- htdocs/takepos/admin/receipt.php | 16 ++++++++-------- htdocs/takepos/admin/setup.php | 4 ++-- htdocs/takepos/admin/terminal.php | 3 ++- 8 files changed, 24 insertions(+), 19 deletions(-) diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php index c956308145f..df9376563e1 100644 --- a/htdocs/core/lib/takepos.lib.php +++ b/htdocs/core/lib/takepos.lib.php @@ -63,10 +63,12 @@ function takepos_admin_prepare_head() $h++; } + /* $head[$h][0] = DOL_URL_ROOT.'/takepos/admin/other.php'; $head[$h][1] = $langs->trans("About"); $head[$h][2] = 'other'; $h++; + */ complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos_admin'); diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php index 2b9ad9e153c..7369a45ad49 100644 --- a/htdocs/takepos/admin/appearance.php +++ b/htdocs/takepos/admin/appearance.php @@ -85,7 +85,8 @@ $formproduct = new FormProduct($db); llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, '', '', '', 'mod-takepos page-admin_appearance'); -$linkback = ''.$langs->trans("BackToModuleList").''; +$linkback = ''.img_picto($langs->trans("GoBack"), 'back', 'class="pictofixedwidth"').''.$langs->trans("GoBack").''; + print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup'); $head = takepos_admin_prepare_head(); print dol_get_fiche_head($head, 'appearance', 'TakePOS', -1, 'cash-register'); diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php index 1de9516dcd4..c317d3d2c33 100644 --- a/htdocs/takepos/admin/bar.php +++ b/htdocs/takepos/admin/bar.php @@ -96,7 +96,8 @@ $arrayofcss = array("/takepos/css/colorbox.css"); llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, $arrayofjs, $arrayofcss, '', 'mod-takepos page-admin_bar'); -$linkback = ''.$langs->trans("BackToModuleList").''; +$linkback = ''.img_picto($langs->trans("GoBack"), 'back', 'class="pictofixedwidth"').''.$langs->trans("GoBack").''; + print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup'); $head = takepos_admin_prepare_head(); print dol_get_fiche_head($head, 'bar', 'TakePOS', -1, 'cash-register'); diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php index c5c283ebdb4..6ce9f83ecf7 100644 --- a/htdocs/takepos/admin/orderprinters.php +++ b/htdocs/takepos/admin/orderprinters.php @@ -30,11 +30,6 @@ // Load Dolibarr environment require '../../main.inc.php'; // Load $user and permissions -require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -42,6 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->loadLangs(array("main", "categories", "takepos", "printing")); diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php index 8f64863c9dc..7678ef0941b 100644 --- a/htdocs/takepos/admin/other.php +++ b/htdocs/takepos/admin/other.php @@ -79,7 +79,8 @@ if ($resql) { llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, '', '', '', 'mod-takepos page-admin_other'); -$linkback = ''.$langs->trans("BackToModuleList").''; +$linkback = ''.img_picto($langs->trans("GoBack"), 'back', 'class="pictofixedwidth"').''.$langs->trans("GoBack").''; + print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup'); $head = takepos_admin_prepare_head(); diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php index 62194e541c5..421bd2a1507 100644 --- a/htdocs/takepos/admin/receipt.php +++ b/htdocs/takepos/admin/receipt.php @@ -28,11 +28,6 @@ // Load Dolibarr environment require '../../main.inc.php'; // Load $user and permissions -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; -require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php"; - /** * @var Conf $conf * @var DoliDB $db @@ -40,6 +35,10 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php"; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php"; // Security check if (!$user->admin) { @@ -90,16 +89,17 @@ if (GETPOST('action', 'alpha') == 'set') { */ $form = new Form($db); -$formproduct = new FormProduct($db); llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, '', '', '', 'mod-takepos page-admin_receipt'); -$linkback = ''.$langs->trans("BackToModuleList").''; +$linkback = ''.img_picto($langs->trans("GoBack"), 'back', 'class="pictofixedwidth"').''.$langs->trans("GoBack").''; + print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup'); + $head = takepos_admin_prepare_head(); print dol_get_fiche_head($head, 'receipt', 'TakePOS', -1, 'cash-register'); -print '
'; +print ''; print ''; print ''; diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 5142608304f..7f21799075e 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -136,13 +136,13 @@ if ($action != '') { */ $form = new Form($db); -$formproduct = new FormProduct($db); $help_url = 'EN:Module_Point_of_sale_(TakePOS)'; llxHeader('', $langs->trans("CashDeskSetup"), $help_url, '', 0, 0, '', '', '', 'mod-takepos page-admin_setup'); -$linkback = ''.$langs->trans("BackToModuleList").''; +$linkback = ''.img_picto($langs->trans("GoBack"), 'back', 'class="pictofixedwidth"').''.$langs->trans("GoBack").''; + print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup'); diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php index c77f775d311..137b11a1675 100644 --- a/htdocs/takepos/admin/terminal.php +++ b/htdocs/takepos/admin/terminal.php @@ -180,7 +180,8 @@ $formproduct = new FormProduct($db); llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, '', '', '', 'mod-takepos page-admin_terminal'); -$linkback = ''.$langs->trans("BackToModuleList").''; +$linkback = ''.img_picto($langs->trans("GoBack"), 'back', 'class="pictofixedwidth"').''.$langs->trans("GoBack").''; + print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup'); $head = takepos_admin_prepare_head(); print dol_get_fiche_head($head, 'terminal'.$terminal, 'TakePOS', -1, 'cash-register');