From 2affbb79f83b108a725ce5c07127bc462867db82 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Tue, 7 Apr 2026 20:46:58 +0200 Subject: [PATCH] QUAL - Supplier modules - Separate - admin supplier invoice head (#37779) --- htdocs/core/lib/supplier_invoice.lib.php | 2 +- .../admin/supplier_invoice.php | 40 ++++++++++++------- .../admin/supplier_payment.php | 26 ++++++++---- .../admin/supplierinvoice_extrafields.php | 32 ++++++++++----- .../admin/supplierinvoice_rec_extrafields.php | 34 ++++++++++------ .../admin/supplierinvoicedet_extrafields.php | 35 ++++++++++------ .../supplierinvoicedet_rec_extrafields.php | 37 ++++++++++------- 7 files changed, 132 insertions(+), 74 deletions(-) diff --git a/htdocs/core/lib/supplier_invoice.lib.php b/htdocs/core/lib/supplier_invoice.lib.php index 2c0e71d40c3..d5e4e9a3ed6 100644 --- a/htdocs/core/lib/supplier_invoice.lib.php +++ b/htdocs/core/lib/supplier_invoice.lib.php @@ -173,7 +173,7 @@ function supplierinvoice_prepare_head(FactureFournisseur $object) * * @return array head array with tabs */ -function supplierinvoice_admin_prepare_head() +function supplier_invoice_admin_prepare_head() { global $langs, $conf, $user, $db; diff --git a/htdocs/supplier_invoice/admin/supplier_invoice.php b/htdocs/supplier_invoice/admin/supplier_invoice.php index aac6e7388d4..2173cdda746 100644 --- a/htdocs/supplier_invoice/admin/supplier_invoice.php +++ b/htdocs/supplier_invoice/admin/supplier_invoice.php @@ -1,14 +1,15 @@ - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2005-2011 Regis Houssin - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2011-2018 Philippe Grand - * Copyright (C) 2024-2025 MDW +/* Copyright (C) 2003-2007 Rodolphe Quiedeville + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2011-2018 Philippe Grand + * Copyright (C) 2024-2025 MDW * Copyright (C) 2024-2025 Frédéric France - * Copyright (C) 2026 Pierre Ardoin + * Copyright (C) 2026 Pierre Ardoin + * Copyright (C) 2026 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,11 +33,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; -require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; /** * @var Conf $conf @@ -47,6 +43,16 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/supplier_invoice.lib.php'; +} else { + require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php'; +} +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; + // Load translation files required by the page $langs->loadLangs(array("admin", "other", "orders")); @@ -213,7 +219,11 @@ print load_fiche_titre($langs->trans("SuppliersSetup"), $linkback, 'title_setup' print "
"; -$head = supplierorder_admin_prepare_head(); +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + $head = supplier_invoice_admin_prepare_head(); +} else { + $head = supplierorder_admin_prepare_head(); +} print dol_get_fiche_head($head, 'invoice', $langs->trans("Suppliers"), -1, 'company'); diff --git a/htdocs/supplier_invoice/admin/supplier_payment.php b/htdocs/supplier_invoice/admin/supplier_payment.php index 7124f4911f2..6a3bce7cf71 100644 --- a/htdocs/supplier_invoice/admin/supplier_payment.php +++ b/htdocs/supplier_invoice/admin/supplier_payment.php @@ -1,9 +1,10 @@ - * Copyright (C) 2016 Laurent Destailleur - * Copyright (C) 2020 Maxime DEMAREST - * Copyright (C) 2024-2025 MDW +/* Copyright (C) 2015 Juanjo Menent + * Copyright (C) 2016 Laurent Destailleur + * Copyright (C) 2020 Maxime DEMAREST + * Copyright (C) 2024-2025 MDW * Copyright (C) 2024 Frédéric France + * Copyright (C) 2026 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,9 +28,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; /** * @var Conf $conf @@ -40,6 +38,14 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/supplier_invoice.lib.php'; +} else { + require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php'; +} +require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; + // Load translation files required by the page $langs->loadLangs(array("admin", "errors", "other", "bills", "orders")); @@ -175,7 +181,11 @@ print load_fiche_titre($langs->trans("SuppliersSetup"), $linkback, 'title_setup' print "
"; -$head = supplierorder_admin_prepare_head(); +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + $head = supplier_invoice_admin_prepare_head(); +} else { + $head = supplierorder_admin_prepare_head(); +} print dol_get_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), -1, 'company'); /* diff --git a/htdocs/supplier_invoice/admin/supplierinvoice_extrafields.php b/htdocs/supplier_invoice/admin/supplierinvoice_extrafields.php index 16f71b27a9d..99c37af3a69 100644 --- a/htdocs/supplier_invoice/admin/supplierinvoice_extrafields.php +++ b/htdocs/supplier_invoice/admin/supplierinvoice_extrafields.php @@ -1,12 +1,13 @@ - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 Florian Henry - * Copyright (C) 2013-2018 Philippe Grand - * Copyright (C) 2013 Juanjo Menent - * Copyright (C) 2024-2025 Frédéric France +/* Copyright (C) 2001-2002 Rodolphe Quiedeville + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 Florian Henry + * Copyright (C) 2013-2018 Philippe Grand + * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2026 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,8 +31,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; /** * @var Conf $conf @@ -41,6 +40,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; * @var User $user */ +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/supplier_invoice.lib.php'; +} else { + require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php'; +} +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + // Load translation files required by the page $langs->loadLangs(array("admin", "other", "bills", "orders", "suppliers")); @@ -80,7 +86,11 @@ $linkback = '\n"; -$head = supplierorder_admin_prepare_head(); +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + $head = supplier_invoice_admin_prepare_head(); +} else { + $head = supplierorder_admin_prepare_head(); +} print dol_get_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), -1, 'company'); diff --git a/htdocs/supplier_invoice/admin/supplierinvoice_rec_extrafields.php b/htdocs/supplier_invoice/admin/supplierinvoice_rec_extrafields.php index 97104814b63..e0b12aebcac 100644 --- a/htdocs/supplier_invoice/admin/supplierinvoice_rec_extrafields.php +++ b/htdocs/supplier_invoice/admin/supplierinvoice_rec_extrafields.php @@ -1,13 +1,14 @@ - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 Florian Henry - * Copyright (C) 2013-2018 Philippe Grand - * Copyright (C) 2013 Juanjo Menent - * Copyright (C) 2023 Nick Fragoulis - * Copyright (C) 2024-2025 Frédéric France +/* Copyright (C) 2001-2002 Rodolphe Quiedeville + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 Florian Henry + * Copyright (C) 2013-2018 Philippe Grand + * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2023 Nick Fragoulis + * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2026 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,8 +32,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; /** * @var Conf $conf @@ -42,6 +41,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; * @var User $user */ +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/supplier_invoice.lib.php'; +} else { + require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php'; +} +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + // Load translation files required by the page $langs->loadLangs(array("admin", "other", "bills", "orders", "suppliers")); @@ -81,7 +87,11 @@ $linkback = '\n"; -$head = supplierorder_admin_prepare_head(); +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + $head = supplier_invoice_admin_prepare_head(); +} else { + $head = supplierorder_admin_prepare_head(); +} print dol_get_fiche_head($head, 'attributesrec', $langs->trans("Suppliers"), -1, 'company'); diff --git a/htdocs/supplier_invoice/admin/supplierinvoicedet_extrafields.php b/htdocs/supplier_invoice/admin/supplierinvoicedet_extrafields.php index 51c222a7f53..b1ba1fc910d 100644 --- a/htdocs/supplier_invoice/admin/supplierinvoicedet_extrafields.php +++ b/htdocs/supplier_invoice/admin/supplierinvoicedet_extrafields.php @@ -1,13 +1,14 @@ - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 Florian Henry - * Copyright (C) 2013 Philippe Grand - * Copyright (C) 2013 Juanjo Menent - * Copyright (C) 2015 Claudio Aschieri - * Copyright (C) 2024-2025 Frédéric France +/* Copyright (C) 2001-2002 Rodolphe Quiedeville + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 Florian Henry + * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2015 Claudio Aschieri + * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2026 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,9 +32,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; - /** * @var Conf $conf @@ -43,6 +41,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; * @var User $user */ +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/supplier_invoice.lib.php'; +} else { + require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php'; +} +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + if (!$user->admin) { accessforbidden(); } @@ -83,7 +88,11 @@ $linkback = '\n"; -$head = supplierorder_admin_prepare_head(); +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + $head = supplier_invoice_admin_prepare_head(); +} else { + $head = supplierorder_admin_prepare_head(); +} print dol_get_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers"), -1, 'company'); diff --git a/htdocs/supplier_invoice/admin/supplierinvoicedet_rec_extrafields.php b/htdocs/supplier_invoice/admin/supplierinvoicedet_rec_extrafields.php index f541caa680a..709113bfa7f 100644 --- a/htdocs/supplier_invoice/admin/supplierinvoicedet_rec_extrafields.php +++ b/htdocs/supplier_invoice/admin/supplierinvoicedet_rec_extrafields.php @@ -1,14 +1,15 @@ - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 Florian Henry - * Copyright (C) 2013 Philippe Grand - * Copyright (C) 2013 Juanjo Menent - * Copyright (C) 2015 Claudio Aschieri - * Copyright (C) 2023 Nick Fragoulis - * Copyright (C) 2024-2025 Frédéric France +/* Copyright (C) 2001-2002 Rodolphe Quiedeville + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 Florian Henry + * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2015 Claudio Aschieri + * Copyright (C) 2023 Nick Fragoulis + * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2026 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,9 +33,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; - /** * @var Conf $conf @@ -44,6 +42,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; * @var User $user */ +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/supplier_invoice.lib.php'; +} else { + require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php'; +} +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + if (!$user->admin) { accessforbidden(); } @@ -84,7 +89,11 @@ $linkback = '\n"; -$head = supplierorder_admin_prepare_head(); +if (getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + $head = supplier_invoice_admin_prepare_head(); +} else { + $head = supplierorder_admin_prepare_head(); +} print dol_get_fiche_head($head, 'attributeslinesrec', $langs->trans("Suppliers"), -1, 'company');