From bef9146bb1df76e93c3d1f0a52fa9e5d94aeab68 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Aug 2023 12:50:09 +0200 Subject: [PATCH 1/3] Fix warnings --- htdocs/comm/propal/class/propal.class.php | 4 +++- htdocs/commande/card.php | 2 +- htdocs/commande/class/commande.class.php | 5 +++++ htdocs/compta/facture/class/facture.class.php | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index ce1758e7591..efdc7b26ed8 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -212,9 +212,11 @@ class Propal extends CommonObject public $total; public $cond_reglement_code; - public $deposit_percent; + public $cond_reglement_doc; public $mode_reglement_code; + public $deposit_percent; + /** * @deprecated */ diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index e7c22e460c7..78b127ebfff 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1963,7 +1963,7 @@ if ($action == 'create' && $usercancreate) { if (empty($reshook)) { if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER) && !empty($soc->id)) { // copy from thirdparty - $tpExtrafields = new Extrafields($db); + $tpExtrafields = new ExtraFields($db); $tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element); if ($soc->fetch_optionals() > 0) { $object->array_options = array_merge($object->array_options, $soc->array_options); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 29b4fc2aa70..78c4aa4c7db 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -134,6 +134,11 @@ class Commande extends CommonOrder */ public $cond_reglement_code; + /** + * @var string Condition payment label + */ + public $cond_reglement_doc; + /** * @var double Deposit % for payment terms */ diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 851fc3a08b1..c97f2dd0564 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -225,6 +225,7 @@ class Facture extends CommonInvoice public $date_lim_reglement; public $cond_reglement_code; // Code in llx_c_paiement + public $cond_reglement_doc; // Code in llx_c_paiement public $mode_reglement_code; // Code in llx_c_paiement /** From df76b9940de808369e7f7868329146ceea2a321b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Aug 2023 13:27:56 +0200 Subject: [PATCH 2/3] Debug v18 --- htdocs/admin/mrp.php | 4 ++-- .../modules/asset/doc/doc_generic_asset_odt.modules.php | 2 +- htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php | 2 +- .../modules/commande/doc/doc_generic_order_odt.modules.php | 2 +- .../contract/doc/doc_generic_contract_odt.modules.php | 2 +- .../expedition/doc/doc_generic_shipment_odt.modules.php | 2 +- .../modules/facture/doc/doc_generic_invoice_odt.modules.php | 2 +- .../modules/member/doc/doc_generic_member_odt.class.php | 2 +- htdocs/core/modules/modPaybox.class.php | 2 +- htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php | 4 ++-- .../modules/product/doc/doc_generic_product_odt.modules.php | 2 +- .../modules/project/doc/doc_generic_project_odt.modules.php | 2 +- .../project/task/doc/doc_generic_task_odt.modules.php | 2 +- .../propale/doc/doc_generic_proposal_odt.modules.php | 2 +- .../reception/doc/doc_generic_reception_odt.modules.php | 2 +- htdocs/core/modules/societe/doc/doc_generic_odt.modules.php | 2 +- .../modules/stock/doc/doc_generic_stock_odt.modules.php | 2 +- .../doc/doc_generic_supplier_invoice_odt.modules.php | 2 +- .../doc/doc_generic_supplier_order_odt.modules.php | 2 +- .../doc/doc_generic_supplier_proposal_odt.modules.php | 2 +- .../modules/ticket/doc/doc_generic_ticket_odt.modules.php | 2 +- .../core/modules/user/doc/doc_generic_user_odt.modules.php | 2 +- .../usergroup/doc/doc_generic_usergroup_odt.modules.php | 2 +- htdocs/core/photos_resize.php | 2 +- htdocs/ecm/class/ecmfiles.class.php | 6 +++--- htdocs/fourn/class/paiementfourn.class.php | 2 +- .../mymodule/doc/doc_generic_myobject_odt.modules.php | 2 +- .../doc/doc_generic_recruitmentjobposition_odt.modules.php | 2 +- .../class/api_supplier_proposals.class.php | 2 +- 29 files changed, 33 insertions(+), 33 deletions(-) diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php index 21fff1c45e6..e24abdbfa94 100644 --- a/htdocs/admin/mrp.php +++ b/htdocs/admin/mrp.php @@ -71,7 +71,7 @@ if ($action == 'updateMask') { } elseif ($action == 'specimen') { $modele = GETPOST('module', 'alpha'); - $mo = new MO($db); + $mo = new Mo($db); $mo->initAsSpecimen(); // Search template files @@ -244,7 +244,7 @@ foreach ($dirmodels as $reldir) { } print ''; - $mrp = new MO($db); + $mrp = new Mo($db); $mrp->initAsSpecimen(); // Info diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php index 657bf4fee22..15d95bde92e 100644 --- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php +++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php @@ -332,7 +332,7 @@ class doc_generic_asset_odt extends ModelePDFAsset // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->asset->dir_temp, diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php index 8ef4046c466..8404d61049c 100644 --- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php +++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php @@ -340,7 +340,7 @@ class doc_generic_bom_odt extends ModelePDFBom // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->bom->dir_temp, diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index f37c35b185a..e8d7abfe0d7 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -350,7 +350,7 @@ class doc_generic_order_odt extends ModelePDFCommandes // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->commande->dir_temp, diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php index 478799d4518..515109c4f20 100644 --- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php +++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php @@ -362,7 +362,7 @@ class doc_generic_contract_odt extends ModelePDFContract // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->contrat->dir_temp, diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index 5f216bb0ac6..219c0f47029 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -348,7 +348,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->expedition->dir_temp, diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index ba273ef270c..b74934d96a4 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -362,7 +362,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->facture->dir_temp, diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php index 024248a0ce1..2076e156bac 100644 --- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php +++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php @@ -317,7 +317,7 @@ class doc_generic_member_odt extends ModelePDFMember // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->adherent->dir_temp, diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php index f86e90eab9e..510ae24b0ff 100644 --- a/htdocs/core/modules/modPaybox.class.php +++ b/htdocs/core/modules/modPaybox.class.php @@ -29,7 +29,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php'; /** * Description and activation class for module Paybox */ -class modPayBox extends DolibarrModules +class modPaybox extends DolibarrModules { /** * Constructor. Define names, constants, directories, boxes, permissions diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php index a87c920e40b..fe18e6eb6ea 100644 --- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php +++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php @@ -233,7 +233,7 @@ class doc_generic_mo_odt extends ModelePDFMo // If $object is id instead of object if (!is_object($object)) { $id = $object; - $object = new MO($this->db); + $object = new Mo($this->db); $result = $object->fetch($id); if ($result < 0) { dol_print_error($this->db, $object->error); @@ -333,7 +333,7 @@ class doc_generic_mo_odt extends ModelePDFMo // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->mrp->dir_temp, diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php index 0b8d6676bbf..2728bf266c2 100644 --- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php +++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php @@ -345,7 +345,7 @@ class doc_generic_product_odt extends ModelePDFProduct // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->product->dir_temp, diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 12f99221fef..e8c1357e7a2 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -611,7 +611,7 @@ class doc_generic_project_odt extends ModelePDFProjects // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->project->dir_temp, diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index 175be5efc94..51e53e21d3f 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -544,7 +544,7 @@ class doc_generic_task_odt extends ModelePDFTask // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->project->dir_temp, diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index 161eead8533..734ebdc5137 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -381,7 +381,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->propal->multidir_temp[$object->entity], diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php index 86d69220ca7..d254f676e3c 100644 --- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php +++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php @@ -342,7 +342,7 @@ class doc_generic_reception_odt extends ModelePdfReception // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->reception->dir_temp, diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index b67cdd61056..261aeef9ad5 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -280,7 +280,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->societe->multidir_temp[$object->entity], diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index f7cdf97f2e5..5aae143fc2b 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -347,7 +347,7 @@ class doc_generic_stock_odt extends ModelePDFStock // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->product->dir_temp, diff --git a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php index 2b36d7a7a40..6031907b305 100644 --- a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php +++ b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php @@ -341,7 +341,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->fournisseur->dir_temp, diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php index ed5fd1fa126..285be7c2799 100644 --- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php +++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php @@ -335,7 +335,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->fournisseur->dir_temp, diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index acb0774e8a0..bbc0fdb583a 100644 --- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -370,7 +370,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->supplier_proposal->dir_temp, diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php index 0e42d2fda58..7aa6b4a07e4 100644 --- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php +++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php @@ -315,7 +315,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->ticket->dir_temp, diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php index ca43431055c..d6e52e2f21e 100644 --- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php +++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php @@ -346,7 +346,7 @@ class doc_generic_user_odt extends ModelePDFUser // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->user->dir_temp, diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php index 6df859ed5b1..74ad5902966 100644 --- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php +++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php @@ -350,7 +350,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->user->dir_temp, diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index d65eeae8558..68899012433 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -238,7 +238,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv } } elseif ($modulepart == 'mrp') { require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php'; - $object = new MO($db); + $object = new Mo($db); if ($id > 0) { $result = $object->fetch($id); if ($result <= 0) { diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index 6851abd0b81..f723ec60a51 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -588,7 +588,7 @@ class EcmFiles extends CommonObject $num = $this->db->num_rows($resql); while ($obj = $this->db->fetch_object($resql)) { - $line = new EcmfilesLine(); + $line = new EcmFilesLine(); $line->id = $obj->rowid; $line->ref = $obj->rowid; @@ -816,7 +816,7 @@ class EcmFiles extends CommonObject dol_syslog(__METHOD__, LOG_DEBUG); $error = 0; - $object = new Ecmfiles($this->db); + $object = new EcmFiles($this->db); $this->db->begin(); @@ -981,7 +981,7 @@ class EcmFiles extends CommonObject /** * Class of an index line of a document */ -class EcmfilesLine +class EcmFilesLine { /** * @var string ECM files line label diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 1a90e971df3..7c8d816e160 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -194,7 +194,7 @@ class PaiementFourn extends Paiement continue; } // $key is id of invoice, $value is amount, $way is a 'dolibarr' if amount is in main currency, 'customer' if in foreign currency - $value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value ? $value : 0, $way, 'facture_fourn'); + $value_converted = MultiCurrency::getAmountConversionFromInvoiceRate($key, $value ? $value : 0, $way, 'facture_fourn'); // Add controls of input validity if ($value_converted === false) { // We failed to find the conversion for one invoice diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php index de55003d86d..0063ba76b73 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php @@ -353,7 +353,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->mymodule->dir_temp, diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php index b46c2c2e17b..a93a724fbd9 100644 --- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php +++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php @@ -337,7 +337,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi // Open and load template require_once ODTPHP_PATH.'odf.php'; try { - $odfHandler = new odf( + $odfHandler = new Odf( $srctemplatepath, array( 'PATH_TO_TMP' => $conf->recruitment->dir_temp, diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php index 6e162258d17..4588e1eba41 100644 --- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php +++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php @@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class * @access protected * @class DolibarrApiAccess {@requires user,external} */ -class Supplierproposals extends DolibarrApi +class SupplierProposals extends DolibarrApi { /** From 310832a95bd45ca0f282e3a521624d168873bb1a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Aug 2023 13:44:49 +0200 Subject: [PATCH 3/3] Debug v18 --- htdocs/fichinter/stats/index.php | 2 +- htdocs/hrm/compare.php | 4 ++-- htdocs/imports/import.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 540534f34f6..6e1f1f08c8c 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -59,7 +59,7 @@ $langs->loadLangs(array('interventions', 'companies', 'other', 'suppliers')); */ $form = new Form($db); -$objectstatic = new FichInter($db); +$objectstatic = new Fichinter($db); $title = $langs->trans("InterventionStatistics"); $dir = $conf->ficheinter->dir_temp; diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php index 15b03e587c7..824a60933c7 100644 --- a/htdocs/hrm/compare.php +++ b/htdocs/hrm/compare.php @@ -492,7 +492,7 @@ function getSkillForUsers($TUser) $sql.= ' MAX(sr.rankorder) as rankorder'; $sql.= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)'; - $sql.= " WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_USER."'"; + $sql.= " WHERE sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'"; $sql.= ' AND sr.fk_object IN ('.$db->sanitize(implode(',', $TUser)).')'; $sql.= " GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill "; // group par competence @@ -505,7 +505,7 @@ function getSkillForUsers($TUser) while ($obj = $db->fetch_object($resql) ) { $sql1 = "SELECT COUNT(rowid) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank as sr"; $sql1.=" WHERE sr.rankorder = ".((int) $obj->rankorder); - $sql1.=" AND sr.objecttype = '".Skillrank::SKILLRANK_TYPE_USER."'"; + $sql1.=" AND sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'"; $sql1.=" AND sr.fk_skill = ".((int) $obj->fk_skill); $sql1.=" AND sr.fk_object IN (".$db->sanitize(implode(',', $TUser)).")"; $resql1 = $db->query($sql1); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 9422172a4f9..fb324ba5f65 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1508,7 +1508,7 @@ if ($step == 4 && $datatoimport) { if ($resql) { $num = $db->num_rows($resql); - $tmpuser = new user($db); + $tmpuser = new User($db); $i = 0; while ($i < $num) {