*
* 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
@@ -84,6 +85,7 @@ $error = 0;
if ($action == 'confirm_rejet' && $permissiontoadd) {
if (GETPOST("confirm") == 'yes') {
+ $datarej = null;
if (GETPOSTINT('remonth')) {
$daterej = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
}
@@ -156,6 +158,7 @@ $h++;
if ($id) {
$lipre = new LignePrelevement($db);
+ $bon = null;
if ($lipre->fetch($id) >= 0) {
$bon = new BonPrelevement($db);
@@ -264,7 +267,7 @@ if ($id) {
print '';
if ($action == '') {
- if ($bon->statut == BonPrelevement::STATUS_CREDITED) {
+ if (is_object($bon) && $bon->statut == BonPrelevement::STATUS_CREDITED) {
if ($lipre->statut == 2) {
if ($user->hasRight('prelevement', 'bons', 'credit')) {
print '
'.$langs->trans("StandingOrderReject").'';
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 58948ec2aa8..38060f89b73 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -154,7 +154,7 @@ abstract class CommonDocGenerator
public $phpmin = array(7, 1);
/**
- * @var array
Array of columns
+ * @var array Array of columns
*/
public $cols;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 45e68e0abd4..29c7a9f6661 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -843,8 +843,8 @@ abstract class CommonObject
public $cond_reglement_supplier_id;
/**
- * @var float Deposit percent for payment terms.
- * Populated by setPaymentTerms().
+ * @var float|string Deposit percent for payment terms.
+ * Populated by setPaymentTerms().
* @see setPaymentTerms()
*/
public $deposit_percent;
@@ -2160,13 +2160,13 @@ abstract class CommonObject
* Setter generic. Update a specific field into database.
* Warning: Trigger is run only if param trigkey is provided.
*
- * @param string $field Field to update
- * @param mixed $value New value
- * @param string $table To force other table element or element line (should not be used)
- * @param int $id To force other object id (should not be used)
- * @param string $format Data format ('text', 'int', 'date'). 'text' is used if not defined
- * @param string $id_field To force rowid field name. 'rowid' is used if not defined
- * @param User|string $fuser Update the user of last update field with this user. If not provided, current user is used except if value is 'none'
+ * @param string $field Field to update
+ * @param mixed $value New value
+ * @param string $table To force other table element or element line (should not be used)
+ * @param ?int $id To force other object id (should not be used)
+ * @param string $format Data format ('text', 'int', 'date'). 'text' is used if not defined
+ * @param string $id_field To force rowid field name. 'rowid' is used if not defined
+ * @param User|string|null $fuser Update the user of last update field with this user. If not provided, current user is used except if value is 'none'
* @param string $trigkey Trigger key to run (in most cases something like 'XXX_MODIFY')
* @param string $fk_user_field Name of field to save user id making change
* @return int<-2,1> Return integer <0 if KO, >0 if OK
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index c8dbda9c9bf..6d42c9de5f2 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -205,7 +205,7 @@ abstract class CommonOrderLine extends CommonObjectLine
/**
* Percent line discount
- * @var float
+ * @var float|string
*/
public $remise_percent;
@@ -217,7 +217,7 @@ abstract class CommonOrderLine extends CommonObjectLine
/**
* VAT %
- * @var float
+ * @var float|string
*/
public $tva_tx;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d83543dabf9..7ec13372775 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -45,7 +45,7 @@ class ExtraFields
public $db;
/**
- * @var array,type:array,size:array,default:array,computed:array,unique:array,required:array,param:array,perms:array,list:array,pos:array,totalizable:array,help:array,printable:array,enabled:array,langfile:array,css:array,csslist:array,hidden:array,mandatoryfieldsofotherentities:array,loaded?:int,count:int}> New array to store extrafields definition Note: count set as present to avoid static analysis notices
+ * @var array,type:array,size:array,default:array,computed:array,unique:array,required:array,param:array,perms:array,list:array,pos:array,totalizable:array,help:array,printable:array,enabled:array,langfile:array,css:array,csslist:array,cssview:array,hidden:array,mandatoryfieldsofotherentities:array,loaded?:int,count:int}> New array to store extrafields definition Note: count set as present to avoid static analysis notices
*/
public $attributes = array();
diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
index 3c3b12131ae..7491eca24ff 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -81,7 +81,7 @@ class pdf_standard_asset extends ModelePDFAsset
public $situationinvoice;
/**
- * @var array Array of document table columns
+ * @var array Array of document table columns
*/
public $cols;
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 92bb510c107..c1470f290ef 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -224,18 +224,22 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
*
* @param DoliDB $db Database handler
* @param string $code Code to check/correct
- * @param Product $product Object product
- * @param int $thirdparty_type 0 = customer/prospect , 1 = supplier
+ * @param Product|Societe $product Object product
+ * @param int<0,1> $thirdparty_type 0 = customer/prospect , 1 = supplier
* @param string $type type of barcode (EAN, ISBN, ...)
- * @return int 0 if OK
+ * @return int<-7,0> 0 if OK
* -1 ErrorBadCustomerCodeSyntax
* -2 ErrorCustomerCodeRequired
* -3 ErrorCustomerCodeAlreadyUsed
* -4 ErrorPrefixRequired
+ * -7 ErrorBadClass
*/
public function verif($db, &$code, $product, $thirdparty_type, $type)
{
- global $conf;
+ if (!$product instanceof Product) {
+ dol_syslog(get_class($this)."::verif called with ".get_class($product)." Expected Product", LOG_ERR);
+ return -7;
+ }
//var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit;
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index bcaeeea69a5..036a5b4a4cb 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -231,17 +231,22 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
*
* @param DoliDB $db Database handler
* @param string $code Code to check/correct
- * @param Societe $thirdparty Object third-party
- * @param int $thirdparty_type 0 = customer/prospect , 1 = supplier
+ * @param Societe|Product $thirdparty Object third party
+ * @param int<0,1> $thirdparty_type 0 = customer/prospect , 1 = supplier
* @param string $type type of barcode (EAN, ISBN, ...)
- * @return int 0 if OK
+ * @return int<-7,0> 0 if OK
* -1 ErrorBadCustomerCodeSyntax
* -2 ErrorCustomerCodeRequired
* -3 ErrorCustomerCodeAlreadyUsed
* -4 ErrorPrefixRequired
+ * -7 ErrorBadClass
*/
public function verif($db, &$code, $thirdparty, $thirdparty_type, $type)
{
+ if (!$thirdparty instanceof Societe) {
+ dol_syslog(get_class($this)."::verif called with ".get_class($thirdparty)." Expected Societe", LOG_ERR);
+ return -7;
+ }
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$result = 0;
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index c531c97aeed..51ba9c9a0d6 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -156,4 +156,22 @@ abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
return $s;
}
+
+
+ /**
+ * Check validity of code according to its rules
+ *
+ * @param DoliDB $db Database handler
+ * @param string $code Code to check/correct
+ * @param Product|Societe $object Object product or ThirdParty
+ * @param int<0,1> $thirdparty_type 0 = customer/prospect , 1 = supplier
+ * @param string $type type of barcode (EAN, ISBN, ...)
+ * @return int<-7,0> 0 if OK
+ * -1 ErrorBadCustomerCodeSyntax
+ * -2 ErrorCustomerCodeRequired
+ * -3 ErrorCustomerCodeAlreadyUsed
+ * -4 ErrorPrefixRequired
+ * -7 ErrorBadClass
+ */
+ abstract public function verif($db, &$code, $object, $thirdparty_type, $type);
}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 42ac7d00046..7627e5725c4 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -80,7 +80,7 @@ class pdf_eratosthene extends ModelePDFCommandes
public $version = 'dolibarr';
/**
- * @var array Array of document table columns
+ * @var array Array of document table columns
*/
public $cols;
diff --git a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
index 7ddafc39eb3..0800058f148 100644
--- a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
@@ -117,7 +117,7 @@ class pdf_octopus extends ModelePDFFactures
/**
- * @var array Array of columns
+ * @var array Array of document table columns
*/
public $cols;
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 13285e9aa25..3a9a320981b 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -109,7 +109,7 @@ class pdf_sponge extends ModelePDFFactures
/**
- * @var array Array of columns
+ * @var array Array of document table columns
*/
public $cols;
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 65f5e84f0a4..348ee5bbaac 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -160,9 +160,9 @@ class mod_facture_mars extends ModeleNumRefFactures
* Return next value not used or last value used
*
* @param Societe $objsoc Object third party
- * @param Facture $invoice Object invoice
- * @param string $mode 'next' for next value or 'last' for last value
- * @return string|int Value if OK, 0 if KO
+ * @param Facture $invoice Object invoice
+ * @param string $mode 'next' for next value or 'last' for last value
+ * @return string|int<-1,0> Value if OK, <=0 if KO
*/
public function getNextValue($objsoc, $invoice, $mode = 'next')
{
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index a3607cac7a0..55b74491ad4 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -6,6 +6,7 @@
* Copyright (C) 2013 Juanjo Menent
* Copyright (C) 2022 Anthony Berton
* Copyright (C) 2024 Frédéric France
+ * Copyright (C) 2024 MDW
*
* 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
@@ -135,12 +136,12 @@ class mod_facture_mercure extends ModeleNumRefFactures
}
/**
- * Return next value
+ * Return next value not used or last value used
*
- * @param Societe $objsoc Object third party
- * @param Facture $invoice Object invoice
- * @param string $mode 'next' for next value or 'last' for last value
- * @return string|int Value if OK, 0 if KO
+ * @param Societe $objsoc Object third party
+ * @param Facture $invoice Object invoice
+ * @param string $mode 'next' for next value or 'last' for last value
+ * @return string|int<-1,0> Value if OK, <=0 if KO
*/
public function getNextValue($objsoc, $invoice, $mode = 'next')
{
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 7c7392e30eb..05f3859c92e 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -4,6 +4,7 @@
* Copyright (C) 2004 Eric Seigne
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2014 Marcos García
+ * Copyright (C) 2024 MDW
*
* 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
@@ -250,5 +251,13 @@ abstract class ModelePDFFactures extends CommonDocGenerator
*/
abstract class ModeleNumRefFactures extends CommonNumRefGenerator
{
- // No overload code
+ /**
+ * Return next value not used or last value used
+ *
+ * @param Societe $objsoc Object third party
+ * @param Facture $invoice Object invoice
+ * @param string $mode 'next' for next value or 'last' for last value
+ * @return string|int<-1,0> Value if OK, <=0 if KO
+ */
+ abstract public function getNextValue($objsoc, $invoice, $mode = 'next');
}
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 1296c735070..0e5e7cbecc5 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -74,7 +74,7 @@ class pdf_cyan extends ModelePDFPropales
public $version = 'dolibarr';
/**
- * @var array Array of columns
+ * @var array Array of document table columns
*/
public $cols;
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 9f363057497..52180617a6e 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -289,8 +289,8 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
* @param DoliDB $db Database handler
* @param string $code Code to check/correct
* @param Societe $soc Object third party
- * @param int $type 0 = customer/prospect , 1 = supplier
- * @return int 0 if OK
+ * @param int<0,1> $type 0 = customer/prospect , 1 = supplier
+ * @return int<-6,0> 0 if OK
* -1 ErrorBadCustomerCodeSyntax
* -2 ErrorCustomerCodeRequired
* -3 ErrorCustomerCodeAlreadyUsed
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 39c7bda525b..d684dfa2040 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -106,12 +106,14 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
* @param DoliDB $db Database handler
* @param string $code Code to check/correct
* @param Societe $soc Object third party
- * @param int $type 0 = customer/prospect , 1 = supplier
- * @return int 0 if OK
+ * @param int<0,1> $type 0 = customer/prospect , 1 = supplier
+ * @return int<-6,0> 0 if OK
* -1 ErrorBadCustomerCodeSyntax
* -2 ErrorCustomerCodeRequired
* -3 ErrorCustomerCodeAlreadyUsed
* -4 ErrorPrefixRequired
+ * -5 NotConfigured - Setup empty so any value may be ok or not
+ * -6 Other (see this->error)
*/
public function verif($db, &$code, $soc, $type)
{
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index b0f6cc1114a..a9ba86c8c7e 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -151,12 +151,14 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
* @param DoliDB $db Database handler
* @param string $code Code to check/correct
* @param Societe $soc Object third party
- * @param int $type 0 = customer/prospect , 1 = supplier
- * @return int 0 if OK
+ * @param int<0,1> $type 0 = customer/prospect , 1 = supplier
+ * @return int<-6,0> 0 if OK
* -1 ErrorBadCustomerCodeSyntax
* -2 ErrorCustomerCodeRequired
* -3 ErrorCustomerCodeAlreadyUsed
* -4 ErrorPrefixRequired
+ * -5 NotConfigured - Setup empty so any value may be ok or not
+ * -6 Other (see this->error)
*/
public function verif($db, &$code, $soc, $type)
{
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index f5ac07fb2ff..86c4103cf2b 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -194,6 +194,23 @@ abstract class ModeleThirdPartyCode extends CommonNumRefGenerator
// phpcs:enable
return 0;
}
+
+ /**
+ * Check validity of code according to its rules
+ *
+ * @param DoliDB $db Database handler
+ * @param string $code Code to check/correct
+ * @param Societe $soc Object third party
+ * @param int<0,1> $type 0 = customer/prospect , 1 = supplier
+ * @return int<-6,0> 0 if OK
+ * -1 ErrorBadCustomerCodeSyntax
+ * -2 ErrorCustomerCodeRequired
+ * -3 ErrorCustomerCodeAlreadyUsed
+ * -4 ErrorPrefixRequired
+ * -5 NotConfigured - Setup empty so any value may be ok or not
+ * -6 Other (see this->error)
+ */
+ abstract public function verif($db, &$code, $soc, $type);
}
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index e11fa61a3b0..e9ee32958d1 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -6,6 +6,7 @@
* Copyright (C) 2013 Juanjo Menent
* Copyright (C) 2020 Open-DSI
* Copyright (C) 2024 Frédéric France
+ * Copyright (C) 2024 MDW
*
* 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
@@ -142,7 +143,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
$date = (empty($invoice->date) ? dol_now() : $invoice->date);
$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
- $mask = str_replace('{TN}', $pos_source, $mask);
+ $mask = str_replace('{TN}', (string) $pos_source, $mask);
$numFinal = get_next_value($db, $mask, 'facture', 'ref', '', $objsoc, $date, $mode, false, null, $entity);
return $numFinal;
diff --git a/htdocs/core/tpl/formlayoutai.tpl.php b/htdocs/core/tpl/formlayoutai.tpl.php
index 8cf9f934d32..088fc6d776b 100644
--- a/htdocs/core/tpl/formlayoutai.tpl.php
+++ b/htdocs/core/tpl/formlayoutai.tpl.php
@@ -1,5 +1,6 @@
+ * Copyright (C) 2024 MDW
*
* 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
@@ -40,6 +41,9 @@ if (empty($htmlname)) {
';
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 8270b068a7a..db51f5e36d9 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -106,6 +106,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (isModEnabled('invoice') && getDolGlobalString('WORKFLOW_ORDER_AUTOCREATE_INVOICE')) {
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+ '@phan-var-force Facture $object';
$newobject = new Facture($this->db);
$newobject->context['createfromorder'] = 'createfromorder';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 5bf5b0d930f..e403acb9cca 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3885,7 +3885,7 @@ class SupplierInvoiceLine extends CommonObjectLine
/**
* Percent of discount
- * @var float
+ * @var float|string
*/
public $remise_percent;
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 326e927f5d5..c9badc4c1ef 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -61,6 +61,7 @@ class ProductFournisseur extends Product
public $id;
/**
+ * @var string
* @deprecated
* @see $ref_supplier
*/
@@ -82,11 +83,12 @@ class ProductFournisseur extends Product
public $desc_supplier;
/**
- * @var float The VAT rate by default for this {supplier, qty, product}. Can be set by get_buyprice().
+ * @var string The VAT rate by default for this {supplier, qty, product}. Can be set by get_buyprice().
*/
public $vatrate_supplier;
/**
+ * @var int
* @deprecated
* @see $product_id
*/
@@ -772,7 +774,7 @@ class ProductFournisseur extends Product
* @param int $limit Limit
* @param int $offset Offset
* @param int $socid Filter on a third party id
- * @return array|int Array of ProductFournisseur with new properties to define supplier price
+ * @return ProductFournisseur[]|int<-1,-1> Array of ProductFournisseur with new properties to define supplier price
* @see find_min_price_product_fournisseur()
*/
public function list_product_fournisseur_price($prodid, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0, $socid = 0)
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index 19c64acc849..1d997d650eb 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -560,7 +560,7 @@ if (empty($reshook)) {
$tva_tx = $datapriceofproduct['tva_tx'];
$tva_npr = $datapriceofproduct['tva_npr'];
- $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
+ $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', (string) $tva_tx));
$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', (string) $prod->tva_tx));
// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 1b3fbeb2c44..f35f94dba18 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -93,7 +93,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
public $emetteur;
/**
- * @var array Array of columns
+ * @var array Array of document table columns
*/
public $cols;
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 4c869bc0203..fd2d9eaa115 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -2158,7 +2158,7 @@ class Products extends DolibarrApi
$children[] = array_combine($keys, $values);
}
- $this->product->sousprods = $children;
+ $this->product->sousprods = $children; // @phpstan-ignore-line
}
if ($includeparentid) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d700fa9c81a..3ee571bb504 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -104,9 +104,14 @@ class Product extends CommonObject
*/
protected $table_ref_field = 'ref';
- public $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into images.lib.php
+ /**
+ * @var string
+ * @see images.lib.php
+ */
+ public $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm';
/**
+ * @var string
* @deprecated Use $label instead
* @see $label
*/
@@ -147,6 +152,9 @@ class Product extends CommonObject
*/
public $price;
+ /**
+ * @var string
+ */
public $price_formated; // used by takepos/ajax/ajax.php
/**
@@ -156,6 +164,9 @@ class Product extends CommonObject
*/
public $price_ttc;
+ /**
+ * @var string
+ */
public $price_ttc_formated; // used by takepos/ajax/ajax.php
/**
@@ -177,22 +188,64 @@ class Product extends CommonObject
* @var string
*/
public $price_base_type;
+ /**
+ * @var string
+ */
public $price_label;
//! Arrays for multiprices
+ /**
+ * @var array
+ */
public $multiprices = array();
+ /**
+ * @var array
+ */
public $multiprices_ttc = array();
+ /**
+ * @var array
+ */
public $multiprices_base_type = array();
+ /**
+ * @var array
+ */
public $multiprices_default_vat_code = array();
+ /**
+ * @var array
+ */
public $multiprices_min = array();
+ /**
+ * @var array
+ */
public $multiprices_min_ttc = array();
+ /**
+ * @var array
+ */
public $multiprices_tva_tx = array();
+ /**
+ * @var array
+ */
public $multiprices_recuperableonly = array();
+ /**
+ * @var array
+ */
//! Price by quantity arrays
+ /**
+ * @var int<0,0>|float
+ */
public $price_by_qty;
+ /**
+ * @var array
+ */
public $prices_by_qty = array();
+ /**
+ * @var array
+ */
public $prices_by_qty_id = array();
+ /**
+ * @var array>
+ */
public $prices_by_qty_list = array();
/**
@@ -200,13 +253,19 @@ class Product extends CommonObject
*/
public $level;
- //! Array for multilangs
+ /**
+ * @var ?array Array for multilangs
+ */
public $multilangs = array();
- //! Default VAT code for product (link to code into llx_c_tva but without foreign keys)
+ /**
+ * @var string Default VAT code for product (link to code into llx_c_tva but without foreign keys)
+ */
public $default_vat_code;
- //! Default VAT rate of product
+ /**
+ * @var string|int Default VAT rate of product
+ */
public $tva_tx;
/**
@@ -214,25 +273,65 @@ class Product extends CommonObject
*/
public $tva_npr = 0;
- //! Default discount percent
+ /**
+ * @var string Default discount percent
+ */
public $remise_percent;
- //! Other local taxes
+ /**
+ * @var string|int|float Other local taxes
+ */
public $localtax1_tx;
+ /**
+ * @var string|int|float
+ */
public $localtax2_tx;
+ /**
+ * @var string
+ */
public $localtax1_type;
+ /**
+ * @var string
+ */
public $localtax2_type;
// Properties set by get_buyprice() for return
+ /**
+ * @var string
+ */
public $desc_supplier;
+ /**
+ * @var string
+ */
public $vatrate_supplier;
+ /**
+ * @var string
+ */
public $default_vat_code_supplier;
+ /**
+ * @var string|int
+ */
public $fourn_multicurrency_price;
+ /**
+ * @var string|int
+ */
public $fourn_multicurrency_unitprice;
+ /**
+ * @var string|int
+ */
public $fourn_multicurrency_tx;
+ /**
+ * @var string
+ */
public $fourn_multicurrency_id;
+ /**
+ * @var string
+ */
public $fourn_multicurrency_code;
+ /**
+ * @var float
+ */
public $packaging;
@@ -273,7 +372,9 @@ class Product extends CommonObject
*/
public $cost_price;
- //! Average price value for product entry into stock (PMP)
+ /**
+ * @var float Average price value for product entry in stock (PMP)
+ */
public $pmp;
/**
@@ -284,20 +385,20 @@ class Product extends CommonObject
public $seuil_stock_alerte = 0;
/**
- * Ask for replenishment when $desiredstock < $stock_reel
+ * @var float Ask for replenishment when $desiredstock < $stock_reel
*/
public $desiredstock = 0;
/**
- * Service expiration
+ * @var ?int Service expiration
*/
public $duration_value;
/**
- * Service expiration unit
+ * @var string Service expiration unit
*/
public $duration_unit;
/**
- * Service expiration label (value + unit)
+ * @var string Service expiration label (value + unit)
*/
public $duration;
@@ -407,28 +508,88 @@ class Product extends CommonObject
*/
public $url;
- //! Metric of products
+ //! Metrics of products
+ /**
+ * @var float|string
+ */
public $weight;
+ /**
+ * @var int|string
+ */
public $weight_units; // scale -3, 0, 3, 6
+ /**
+ * @var float|string
+ */
public $length;
+ /**
+ * @var int|string
+ */
public $length_units; // scale -3, 0, 3, 6
+ /**
+ * @var float|string
+ */
public $width;
+ /**
+ * @var int|string
+ */
public $width_units; // scale -3, 0, 3, 6
+ /**
+ * @var float|string|null
+ */
public $height;
+ /**
+ * @var int|string|null
+ */
public $height_units; // scale -3, 0, 3, 6
+ /**
+ * @var float|string|null
+ */
public $surface;
+ /**
+ * @var int|string|null
+ */
public $surface_units; // scale -3, 0, 3, 6
+ /**
+ * @var float|string|null
+ */
public $volume;
+ /**
+ * @var int|string|null
+ */
public $volume_units; // scale -3, 0, 3, 6
+ /**
+ * @var float|string|null
+ */
public $net_measure;
+ /**
+ * @var ?string
+ */
public $net_measure_units; // scale -3, 0, 3, 6
+ /**
+ * @var string
+ */
public $accountancy_code_sell;
+ /**
+ * @var string
+ */
public $accountancy_code_sell_intra;
+ /**
+ * @var string
+ */
public $accountancy_code_sell_export;
+ /**
+ * @var string
+ */
public $accountancy_code_buy;
+ /**
+ * @var string
+ */
public $accountancy_code_buy_intra;
+ /**
+ * @var string
+ */
public $accountancy_code_buy_export;
/**
@@ -461,8 +622,13 @@ class Product extends CommonObject
public $stats_facturerec = array();
public $stats_facture_fournisseur = array();
- //! Size of image
+ /**
+ * @var int|string Size of image / height
+ */
public $imgWidth;
+ /**
+ * @var int|string Size of image / height
+ */
public $imgHeight;
/**
@@ -520,6 +686,7 @@ class Product extends CommonObject
public $fourn_socid;
/**
+ * @var string
* @deprecated
* @see $ref_supplier
*/
@@ -547,19 +714,19 @@ class Product extends CommonObject
/**
* Array with list of supplier prices of product
*
- * @var array
+ * @var ProductFournisseur[]
*/
public $supplierprices;
/**
* Array with list of sub-products for Kits
*
- * @var array
+ * @var array>
*/
public $sousprods;
/**
- * @var array Path of subproducts. Build from ->sousprods with get_arbo_each_prod()
+ * @var array,entity:CommonObject}> Path of subproducts. Build from ->sousprods with get_arbo_each_prod()
*/
public $res;
@@ -594,6 +761,9 @@ class Product extends CommonObject
*/
public $is_sousproduit_incdec;
+ /**
+ * @var int
+ */
public $mandatory_period;
@@ -623,7 +793,7 @@ class Product extends CommonObject
*/
/**
- * @var array|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array,comment?:string}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+ * @var array|string,position:int,notnull?:int,visible:int<-2,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,2>,disabled?:int<0,1>,arrayofkeyval?:array,comment?:string,validate?:int<0,1>}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
public $fields = array(
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
@@ -1141,19 +1311,19 @@ class Product extends CommonObject
$this->note_private = (isset($this->note_private) ? trim($this->note_private) : null);
$this->note_public = (isset($this->note_public) ? trim($this->note_public) : null);
$this->net_measure = price2num($this->net_measure);
- $this->net_measure_units = (empty($this->net_measure_units) ? '' : trim($this->net_measure_units));
+ $this->net_measure_units = (empty($this->net_measure_units) ? '' : trim((string) $this->net_measure_units));
$this->weight = price2num($this->weight);
- $this->weight_units = (empty($this->weight_units) ? '' : trim($this->weight_units));
+ $this->weight_units = (empty($this->weight_units) ? '' : trim((string) $this->weight_units));
$this->length = price2num($this->length);
- $this->length_units = (empty($this->length_units) ? '' : trim($this->length_units));
+ $this->length_units = (empty($this->length_units) ? '' : trim((string) $this->length_units));
$this->width = price2num($this->width);
- $this->width_units = (empty($this->width_units) ? '' : trim($this->width_units));
+ $this->width_units = (empty($this->width_units) ? '' : trim((string) $this->width_units));
$this->height = price2num($this->height);
- $this->height_units = (empty($this->height_units) ? '' : trim($this->height_units));
+ $this->height_units = (empty($this->height_units) ? '' : trim((string) $this->height_units));
$this->surface = price2num($this->surface);
- $this->surface_units = (empty($this->surface_units) ? '' : trim($this->surface_units));
+ $this->surface_units = (empty($this->surface_units) ? '' : trim((string) $this->surface_units));
$this->volume = price2num($this->volume);
- $this->volume_units = (empty($this->volume_units) ? '' : trim($this->volume_units));
+ $this->volume_units = (empty($this->volume_units) ? '' : trim((string) $this->volume_units));
// set unit not defined
if (is_numeric($this->length_units)) {
@@ -1699,7 +1869,7 @@ class Product extends CommonObject
/**
* Get sell or eat by mandatory list
*
- * @return array Sell or eat by mandatory list
+ * @return array{0:string,1:string,2:string,3:string} Sell or eat by mandatory list
*/
public static function getSellOrEatByMandatoryList()
{
@@ -1782,7 +1952,7 @@ class Product extends CommonObject
return -1;
}
} elseif (isset($this->multilangs[$key])) {
- if (empty($this->multilangs["$key"]["label"])) {
+ if (empty($this->multilangs[$key]["label"])) {
$this->errors[] = $key . ' : ' . $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
return -1;
}
@@ -1974,7 +2144,7 @@ class Product extends CommonObject
* used to check if price have really change to avoid log pollution
*
* @param int $level price level to change
- * @return array
+ * @return array{level:int,multiprices:float,multiprices_ttc:float,multiprices_base_type:string,multiprices_min:float,multiprices_min_ttc:float,multiprices_tva_tx:float,multiprices_recuperableonly:float}|array{}
*/
private function getArrayForPriceCompare($level = 0)
{
@@ -2048,9 +2218,9 @@ class Product extends CommonObject
/**
* Delete a price line
*
- * @param User $user Object user
- * @param int $rowid Line id to delete
- * @return int Return integer <0 if KO, >0 if OK
+ * @param User $user Object user
+ * @param int $rowid Line id to delete
+ * @return int Return integer <0 if KO, >0 if OK
*/
public function log_price_delete($user, $rowid)
{
@@ -2077,7 +2247,7 @@ class Product extends CommonObject
* @param Societe $thirdparty_seller Seller
* @param Societe $thirdparty_buyer Buyer
* @param int $pqp Id of product price per quantity if a selection was done of such a price
- * @return array Array of price information array('pu_ht'=> , 'pu_ttc'=> , 'tva_tx'=>'X.Y (code)', ...), 'tva_npr'=>0, ...)
+ * @return array{pu_ht:float|int|string,pu_ttc:float|int|string,price_min:float|int|string,price_base_type:string,tva_tx:float|string|null|int,tva_npr:float|int}
* @see get_buyprice(), find_min_price_product_fournisseur()
*/
public function getSellPrice($thirdparty_seller, $thirdparty_buyer, $pqp = 0)
@@ -2195,12 +2365,12 @@ class Product extends CommonObject
* We enter as input couple prodfournprice/qty or triplet qty/product_id/fourn_ref.
* This also set some properties on product like ->buyprice, ->fourn_pu, ...
*
- * @param int $prodfournprice Id du tarif = rowid table product_fournisseur_price
- * @param double $qty Quantity asked or -1 to get first entry found
- * @param int $product_id Filter on a particular product id
- * @param string $fourn_ref Filter on a supplier price ref. 'none' to exclude ref in search.
- * @param int $fk_soc If of supplier
- * @return int|string Return integer <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...), or printable result of hook
+ * @param int $prodfournprice Id du tarif = rowid table product_fournisseur_price
+ * @param float|int<-1,-1> $qty Quantity asked or -1 to get first entry found
+ * @param int $product_id Filter on a particular product id
+ * @param string $fourn_ref Filter on a supplier price ref. 'none' to exclude ref in search.
+ * @param int $fk_soc If of supplier
+ * @return int|string|mixed[] Return integer <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...), or printable result of hook
* @see getSellPrice(), find_min_price_product_fournisseur()
*/
public function get_buyprice($prodfournprice, $qty, $product_id = 0, $fourn_ref = '', $fk_soc = 0)
@@ -2362,20 +2532,20 @@ class Product extends CommonObject
/**
* Modify customer price of a product/Service for a given level
*
- * @param double $newprice New price
- * @param string $newpricebase HT or TTC
- * @param User $user Object user that make change
- * @param ?double $newvat New VAT Rate (For example 8.5. Should not be a string)
- * @param double|int $newminprice New price min
- * @param int $level 0=standard, >0 = level if multilevel prices
- * @param int $newnpr 0=Standard vat rate, 1=Special vat rate for French NPR VAT
- * @param int $newpbq 1 if it has price by quantity
- * @param int $ignore_autogen Used to avoid infinite loops
- * @param array $localtaxes_array Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
- * @param string $newdefaultvatcode Default vat code
- * @param string $price_label Price Label
- * @param int $notrigger Disable triggers
- * @return int Return integer <0 if KO, >0 if OK
+ * @param double $newprice New price
+ * @param string $newpricebase HT or TTC
+ * @param User $user Object user that make change
+ * @param ?float $newvat New VAT Rate (For example 8.5. Should not be a string)
+ * @param float|int $newminprice New price min
+ * @param int $level 0=standard, >0 = level if multilevel prices
+ * @param int<0,1> $newnpr 0=Standard vat rate, 1=Special vat rate for French NPR VAT
+ * @param int<0,1> $newpbq 1 if it has price by quantity
+ * @param int<0,1> $ignore_autogen Used to avoid infinite loops
+ * @param array{}|array{0:string,1:int|string,2:string,3:string}|array{0:string,1:int|string,2:string,3:int|string,4:string,5:string} $localtaxes_array Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
+ * @param string $newdefaultvatcode Default vat code
+ * @param string $price_label Price Label
+ * @param int $notrigger Disable triggers
+ * @return int<-1,1> Return integer <0 if KO, >0 if OK
*/
public function updatePrice($newprice, $newpricebase, $user, $newvat = null, $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '', $price_label = '', $notrigger = 0)
{
@@ -2401,6 +2571,9 @@ class Product extends CommonObject
$newvat = $this->tva_tx;
}
+ $localtaxtype1 = '';
+ $localtaxtype2 = '';
+
// If multiprices are enabled, then we check if the current product is subject to price autogeneration
// Price will be modified ONLY when the first one is the one that is being modified
if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !$ignore_autogen && $this->price_autogen && ($level == 1)) {
@@ -2442,7 +2615,6 @@ class Product extends CommonObject
}
}
//print 'x'.$id.'-'.$newprice.'-'.$newpricebase.'-'.$price.'-'.$price_ttc.'-'.$price_min.'-'.$price_min_ttc;
-
if (count($localtaxes_array) > 0) {
$localtaxtype1 = $localtaxes_array['0'];
$localtax1 = $localtaxes_array['1'];
@@ -3880,8 +4052,8 @@ class Product extends CommonObject
/**
* Charge tableau des stats facture recurrentes pour le produit/service
*
- * @param int $socid Id societe
- * @return int Array of stats in $this->stats_facture, <0 if ko or >0 if ok
+ * @param int $socid Id societe
+ * @return int Array of stats in $this->stats_facture, <0 if ko or >0 if ok
*/
public function load_stats_facturerec($socid = 0)
{
@@ -4007,10 +4179,10 @@ class Product extends CommonObject
/**
* Return an array formatted for showing graphs
*
- * @param string $sql Request to execute
- * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
- * @param int $year Year (0=current year, -1=all years)
- * @return array|int Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @param string $sql Request to execute
+ * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
+ * @param int $year Year (0=current year, -1=all years)
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
private function _get_stats($sql, $mode, $year = 0)
{
@@ -4090,7 +4262,7 @@ class Product extends CommonObject
* @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
* @param int $year Year (0=last 12 month, -1=all years)
* @param string $morefilter More sql filters
- * @return array Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
public function get_nb_vente($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
{
@@ -4143,7 +4315,7 @@ class Product extends CommonObject
* @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
* @param int $year Year (0=last 12 month, -1=all years)
* @param string $morefilter More sql filters
- * @return array Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
public function get_nb_achat($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
{
@@ -4195,7 +4367,7 @@ class Product extends CommonObject
* @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
* @param int $year Year (0=last 12 month, -1=all years)
* @param string $morefilter More sql filters
- * @return array Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
public function get_nb_propal($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
{
@@ -4247,7 +4419,7 @@ class Product extends CommonObject
* @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
* @param int $year Year (0=last 12 month, -1=all years)
* @param string $morefilter More sql filters
- * @return array Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
public function get_nb_propalsupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
{
@@ -4299,7 +4471,7 @@ class Product extends CommonObject
* @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
* @param int $year Year (0=last 12 month, -1=all years)
* @param string $morefilter More sql filters
- * @return array Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
public function get_nb_order($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
{
@@ -4346,12 +4518,12 @@ class Product extends CommonObject
/**
* Return nb of units in orders in which product is included
*
- * @param int $socid Limit count on a particular third party id
- * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
- * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
- * @param int $year Year (0=last 12 month, -1=all years)
- * @param string $morefilter More sql filters
- * @return array Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @param int $socid Limit count on a particular third party id
+ * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
+ * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
+ * @param int $year Year (0=last 12 month, -1=all years)
+ * @param string $morefilter More sql filters
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
public function get_nb_ordersupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
{
@@ -4403,7 +4575,7 @@ class Product extends CommonObject
* @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
* @param int $year Year (0=last 12 month, -1=all years)
* @param string $morefilter More sql filters
- * @return array Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
public function get_nb_contract($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
{
@@ -4452,12 +4624,12 @@ class Product extends CommonObject
/**
* Return nb of units in orders in which product is included
*
- * @param int $socid Limit count on a particular third party id
- * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
- * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
- * @param int $year Year (0=last 12 month, -1=all years)
- * @param string $morefilter More sql filters
- * @return array Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+ * @param int $socid Limit count on a particular third party id
+ * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
+ * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only
+ * @param int $year Year (0=last 12 month, -1=all years)
+ * @param string $morefilter More sql filters
+ * @return array,array>|int<-1,-1> Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
*/
public function get_nb_mos($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
{
@@ -4696,9 +4868,9 @@ class Product extends CommonObject
/**
* Check if it is a sub-product into a kit
*
- * @param int $fk_parent Id of parent kit product
- * @param int $fk_child Id of child product
- * @return int Return 1 or 0; -1 if error
+ * @param int $fk_parent Id of parent kit product
+ * @param int $fk_child Id of child product
+ * @return int<-1,1> Return 1 or 0; -1 if error
*/
public function is_sousproduit($fk_parent, $fk_child)
{
@@ -4734,11 +4906,11 @@ class Product extends CommonObject
* Add a supplier price for the product.
* Note: Duplicate ref is accepted for different quantity only, or for different companies.
*
- * @param User $user User that make link
- * @param int $id_fourn Supplier id
- * @param string $ref_fourn Supplier ref
- * @param float $quantity Quantity minimum for price
- * @return int Return integer < 0 if KO, 0 if link already exists for this product, > 0 if OK
+ * @param User $user User that make link
+ * @param int $id_fourn Supplier id
+ * @param string $ref_fourn Supplier ref
+ * @param float $quantity Quantity minimum for price
+ * @return int<-3,1> Return integer < 0 if KO, 0 if link already exists for this product, > 0 if OK
*/
public function add_fournisseur($user, $id_fourn, $ref_fourn, $quantity)
{
@@ -4834,7 +5006,7 @@ class Product extends CommonObject
/**
* Return list of suppliers providing the product or service
*
- * @return array Array of vendor ids
+ * @return int[] Array of vendor ids
*/
public function list_suppliers()
{
@@ -5095,9 +5267,9 @@ class Product extends CommonObject
* Build the tree of subproducts and return it.
* this->sousprods must have been loaded by this->get_sousproduits_arbo()
*
- * @param int $multiply Because each sublevel must be multiplicated by parent nb
- * @param int $ignore_stock_load Ignore stock load
- * @return array Array with tree
+ * @param int $multiply Because each sublevel must be multiplicated by parent nb
+ * @param int $ignore_stock_load Ignore stock load
+ * @return array,entity:CommonObject}> Array with tree
*/
public function get_arbo_each_prod($multiply = 1, $ignore_stock_load = 0)
{
@@ -5238,11 +5410,11 @@ class Product extends CommonObject
/**
* Return children of product $id
*
- * @param int $id Id of product to search children of
- * @param int $firstlevelonly Return only direct child
- * @param int $level Level of recursing call (start to 1)
- * @param array $parents Array of all parents of $id
- * @return array|int Return array(prodid=>array(0=prodid, 1=>qty, 2=>product type, 3=>label, 4=>incdec, 5=>product ref)
+ * @param int $id Id of product to search children of
+ * @param int $firstlevelonly Return only direct child
+ * @param int $level Level of recursing call (start to 1)
+ * @param int[] $parents Array of all parents of $id
+ * @return array|array{}|int<-1,-1> Return array(prodid=>array(0=prodid, 1=>qty, 2=>product type, 3=>label, 4=>incdec, 5=>product ref,6:int,7:int)
*/
public function getChildsArbo($id, $firstlevelonly = 0, $level = 1, $parents = array())
{
@@ -5327,15 +5499,16 @@ class Product extends CommonObject
$parent[$this->label][$keyChild] = $valueChild;
}
foreach ($parent as $key => $value) { // key=label, value is array of children
- $this->sousprods[$key] = $value;
+ $this->sousprods[$key] = $value; // @phan-suppress-current-line PhanTypeMismatchProperty
}
}
/**
* getTooltipContentArray
- * @param array $params params to construct tooltip data
+ *
+ * @param array $params params to construct tooltip data
+ * @return array Data to show in tooltip
* @since v18
- * @return array
*/
public function getTooltipContentArray($params)
{
@@ -5731,18 +5904,18 @@ class Product extends CommonObject
/**
* Adjust stock in a warehouse for product
*
- * @param User $user user asking change
- * @param int $id_entrepot id of warehouse
- * @param double $nbpiece nb of units (should be always positive, use $movement to decide if we add or remove)
- * @param int $movement 0 = add, 1 = remove
- * @param string $label Label of stock movement
- * @param double $price Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
- * @param string $inventorycode Inventory code
- * @param string $origin_element Origin element type
- * @param int $origin_id Origin id of element
- * @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (useful only if product is a subproduct)
- * @param Extrafields $extrafields Array of extrafields
- * @return int Return integer <0 if KO, >0 if OK
+ * @param User $user user asking change
+ * @param int $id_entrepot id of warehouse
+ * @param float $nbpiece nb of units (should be always positive, use $movement to decide if we add or remove)
+ * @param int<0,1> $movement 0 = add, 1 = remove
+ * @param string $label Label of stock movement
+ * @param float $price Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
+ * @param string $inventorycode Inventory code
+ * @param string $origin_element Origin element type
+ * @param ?int $origin_id Origin id of element
+ * @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (useful only if product is a subproduct)
+ * @param ?ExtraFields $extrafields Array of extrafields
+ * @return int Return integer <0 if KO, >0 if OK
*/
public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null)
{
@@ -5790,21 +5963,21 @@ class Product extends CommonObject
/**
* Adjust stock in a warehouse for product with batch number
*
- * @param User $user user asking change
- * @param int $id_entrepot id of warehouse
- * @param double $nbpiece nb of units (should be always positive, use $movement to decide if we add or remove)
- * @param int $movement 0 = add, 1 = remove
- * @param string $label Label of stock movement
- * @param double $price Price to use for stock eval
- * @param int|string $dlc eat-by date
- * @param int|string $dluo sell-by date
- * @param string $lot Lot number
- * @param string $inventorycode Inventory code
- * @param string $origin_element Origin element type
- * @param int $origin_id Origin id of element
- * @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (useful only if product is a subproduct)
- * @param Extrafields $extrafields Array of extrafields
- * @param boolean $force_update_batch Force update batch
+ * @param User $user user asking change
+ * @param int $id_entrepot id of warehouse
+ * @param float $nbpiece nb of units (should be always positive, use $movement to decide if we add or remove)
+ * @param int<0,1> $movement 0 = add, 1 = remove
+ * @param string $label Label of stock movement
+ * @param float $price Price to use for stock eval
+ * @param int|string $dlc eat-by date
+ * @param int|string $dluo sell-by date
+ * @param string $lot Lot number
+ * @param string $inventorycode Inventory code
+ * @param string $origin_element Origin element type
+ * @param ?int $origin_id Origin id of element
+ * @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (useful only if product is a subproduct)
+ * @param ?ExtraFields $extrafields Array of extrafields
+ * @param boolean $force_update_batch Force update batch
* @return int Return integer <0 if KO, >0 if OK
*/
public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null, $force_update_batch = false)
@@ -6061,9 +6234,9 @@ class Product extends CommonObject
/**
* Load existing information about a serial
*
- * @param string $batch Lot/serial number
- * @return array Array with record into product_batch
- * @see load_stock(), load_virtual_stock()
+ * @param string $batch Lot/serial number
+ * @return array Array with record into product_batch
+ * @see load_stock(), load_virtual_stock()
*/
public function loadBatchInfo($batch)
{
@@ -6094,9 +6267,10 @@ class Product extends CommonObject
/**
* Move an uploaded file described into $file array into target directory $sdir.
*
- * @param string $sdir Target directory
- * @param string $file Array of file info of file to upload: array('name'=>..., 'tmp_name'=>...)
- * @return int Return integer <0 if KO, >0 if OK
+ * @param string $sdir Target directory
+
+ * @param array{name:string,tmp_name:string} $file Array of file info of file to upload: array('name'=>..., 'tmp_name'=>...)
+ * @return int Return integer <0 if KO, >0 if OK
*/
public function add_photo($sdir, $file)
{
@@ -6179,7 +6353,7 @@ class Product extends CommonObject
*
* @param string $dir Directory to scan
* @param int $nbmax Number maximum of photos (0=no maximum)
- * @return array Array of photos
+ * @return array Array of photos
*/
public function liste_photos($dir, $nbmax = 0)
{
@@ -6400,7 +6574,7 @@ class Product extends CommonObject
}
$var = getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM');
$mod = new $var();
- '@phan-var-force ModeleNumRefBarCode $module';
+ '@phan-var-force ModeleNumRefBarCode $mod';
$result = $mod->getNextValue($object, $type);
@@ -6709,9 +6883,9 @@ class Product extends CommonObject
/**
* Return clickable link of object (with eventually picto)
*
- * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
- * @param array $arraydata Array of data
- * @return string HTML Code for Kanban thumb.
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @param ?array{string,mixed} $arraydata Array of data
+ * @return string HTML Code for Kanban thumb.
*/
public function getKanbanView($option = '', $arraydata = null)
{
@@ -6773,7 +6947,7 @@ class Product extends CommonObject
/**
* Class to manage products or services.
- * Do not use 'Service' as class name since it is already used by APIs.
+ * Do not use 'Service' as class name since it is already used by APIs (Note: in namespace Stripe\Service)
*/
class ProductService extends Product
{
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 791577fe95a..5652daf890f 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -68,8 +68,8 @@ $cancel = GETPOST('cancel', 'alpha');
$id = GETPOSTINT('id');
$ref = GETPOST('ref', 'alpha');
-$stocklimit = (float) GETPOST('seuil_stock_alerte');
-$desiredstock = GETPOST('desiredstock');
+$stocklimit = GETPOSTFLOAT('seuil_stock_alerte');
+$desiredstock = GETPOSTFLOAT('desiredstock');
$cancel = GETPOST('cancel', 'alpha');
$fieldid = GETPOSTISSET("ref") ? 'ref' : 'rowid';
$d_eatby = dol_mktime(0, 0, 0, GETPOSTINT('eatbymonth'), GETPOSTINT('eatbyday'), GETPOSTINT('eatbyyear'));
@@ -175,11 +175,13 @@ if ($action == 'addlimitstockwarehouse' && $user->hasRight('produit', 'creer'))
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("StockLimit")), null, 'errors');
$maj_ok = false;
}
- if ($desiredstock == '') {
+ if ($desiredstock == '' || is_array($desiredstock)) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DesiredStock")), null, 'errors');
$maj_ok = false;
}
+ $desiredstock = (float) $desiredstock;
+
if ($maj_ok) {
$pse = new ProductStockEntrepot($db);
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
@@ -195,7 +197,7 @@ if ($action == 'addlimitstockwarehouse' && $user->hasRight('produit', 'creer'))
$pse->fk_entrepot = GETPOSTINT('fk_entrepot');
$pse->fk_product = $id;
$pse->seuil_stock_alerte = GETPOST('seuil_stock_alerte');
- $pse->desiredstock = GETPOST('desiredstock');
+ $pse->desiredstock = GETPOSTFLOAT('desiredstock');
if ($pse->create($user) > 0) {
setEventMessages($langs->trans('ProductStockWarehouseCreated'), null, 'mesgs');
}
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index f7640d2a2bf..cf358161eb4 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -7,6 +7,7 @@
* Copyright (C) 2019 Frédéric France
* Copyright (C) 2021 Ferran Marcet
* Copyright (C) 2021 Antonin MARCHAL
+ * Copyright (C) 2024 MDW
*
* 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
@@ -202,7 +203,7 @@ if ($action == 'order' && GETPOST('valid')) {
$tva = $line->tva_tx / 100;
$line->total_tva = $line->total_ht * $tva;
$line->total_ttc = $line->total_ht + $line->total_tva;
- $line->remise_percent = $productsupplier->remise_percent;
+ $line->remise_percent = (float) $productsupplier->remise_percent;
$line->ref_fourn = $productsupplier->ref_supplier;
$line->type = $productsupplier->type;
$line->fk_unit = $productsupplier->fk_unit;
@@ -243,7 +244,7 @@ if ($action == 'order' && GETPOST('valid')) {
foreach ($supplier['lines'] as $line) {
if (empty($line->remise_percent)) {
- $line->remise_percent = $order->thirdparty->remise_supplier_percent;
+ $line->remise_percent = (float) $order->thirdparty->remise_supplier_percent;
}
$result = $order->addline(
$line->desc,
@@ -285,12 +286,12 @@ if ($action == 'order' && GETPOST('valid')) {
foreach ($supplier['lines'] as $line) {
if (empty($line->remise_percent)) {
- $line->remise_percent = $order->thirdparty->remise_supplier_percent;
+ $line->remise_percent = (float) $order->thirdparty->remise_supplier_percent;
}
$order->lines[] = $line;
}
- $order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;
- $order->mode_reglement_id = $order->thirdparty->mode_reglement_supplier_id;
+ $order->cond_reglement_id = (int) $order->thirdparty->cond_reglement_supplier_id;
+ $order->mode_reglement_id = (int) $order->thirdparty->mode_reglement_supplier_id;
$id = $order->create($user);
if ($id < 0) {
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index a0b165e98e8..fd1189fcfba 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -108,7 +108,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
public $defaultTitlesFieldsStyle = array();
/**
- * @var array Array of document tablecolumns
+ * @var array Array of document table columns
*/
public $cols = array();
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index dd781cbc3b0..64ea19bf2fd 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1213,7 +1213,7 @@ class Thirdparties extends DolibarrApi
$exists_sql .= " AND fk_contact = '".$this->db->escape($contact_id)."'";
$exists_result = $this->db->query($exists_sql);
- if ($this->db->num_rows($exists_sql) > 0) {
+ if ($this->db->num_rows($exists_result) > 0) {
throw new RestException(403, 'Notification already exists');
}
@@ -1235,6 +1235,7 @@ class Thirdparties extends DolibarrApi
* @param array $request_data Request data
*
* @return array|mixed Notification of thirdparty
+ * @phan-return Notify
*
* @url POST {id}/notificationsbycode/{code}
*/
@@ -1279,7 +1280,7 @@ class Thirdparties extends DolibarrApi
$exists_sql .= " AND fk_contact = '".$this->db->escape($contact_id)."'";
$exists_result = $this->db->query($exists_sql);
- if ($this->db->num_rows($exists_sql) > 0) {
+ if ($this->db->num_rows($exists_result) > 0) {
throw new RestException(403, 'Notification already exists');
}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 97054dcf2e7..aa67f97c5a4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -129,7 +129,7 @@ class Societe extends CommonObject
/**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
- * @var integer
+ * @var int<0,1>
*/
public $restrictiononfksoc = 1;
@@ -140,7 +140,7 @@ class Societe extends CommonObject
/**
* array of supplier categories
- * @var array
+ * @var string[]
*/
public $SupplierCategories = array();
@@ -511,14 +511,26 @@ class Societe extends CommonObject
public $tva_intra;
/**
- * @var int Vat reverse-charge concerned
+ * @var int<0,1> Vat reverse-charge concerned
*/
public $vat_reverse_charge = 0;
// Local taxes
+ /**
+ * @var int
+ */
public $localtax1_assuj;
+ /**
+ * @var string
+ */
public $localtax1_value;
+ /**
+ * @var int
+ */
public $localtax2_assuj;
+ /**
+ * @var string
+ */
public $localtax2_value;
/**
@@ -535,20 +547,60 @@ class Societe extends CommonObject
* @var int Type thirdparty
*/
public $typent_id = 0;
+ /**
+ * @var string
+ */
public $typent_code;
+ /**
+ * @var int
+ */
public $effectif;
+ /**
+ * @var int
+ */
public $effectif_id = 0;
- public $forme_juridique_code;
- public $forme_juridique = 0;
+ /**
+ * @var int
+ */
+ public $forme_juridique_code = 0;
+ /**
+ * @var string Label for Legal Form (of company)
+ * @see CommonDocGenerator::get_substitutionarray_mysoc()
+ */
+ public $forme_juridique;
+ /**
+ * @var string
+ */
public $remise_percent;
+ /**
+ * @var string
+ */
public $remise_supplier_percent;
+ /**
+ * @var int
+ */
public $mode_reglement_id;
+ /**
+ * @var int
+ */
public $cond_reglement_id;
+ /**
+ * @var string|float
+ */
public $deposit_percent;
+ /**
+ * @var int
+ */
public $mode_reglement_supplier_id;
+ /**
+ * @var int
+ */
public $cond_reglement_supplier_id;
+ /**
+ * @var int
+ */
public $transport_mode_supplier_id;
/**
@@ -1084,11 +1136,11 @@ class Societe extends CommonObject
/**
* Create a contact/address from thirdparty
*
- * @param User $user Object user
- * @param int $no_email 1=Do not send mailing, 0=Ok to receive mailing
- * @param array $tags Array of tag to affect to contact
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int Return integer <0 if KO, >0 if OK
+ * @param User $user Object user
+ * @param int<0,1> $no_email 1=Do not send mailing, 0=Ok to receive mailing
+ * @param string[] $tags Array of tag to affect to contact
+ * @param int<0,1> $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int<-1,1> Return integer <0 if KO, >0 if OK
*/
public function create_individual(User $user, $no_email = 0, $tags = array(), $notrigger = 0)
{
@@ -1401,16 +1453,16 @@ class Societe extends CommonObject
}
// Local taxes
- $this->localtax1_assuj = trim($this->localtax1_assuj);
- $this->localtax2_assuj = trim($this->localtax2_assuj);
+ $this->localtax1_assuj = (int) trim((string) $this->localtax1_assuj);
+ $this->localtax2_assuj = (int) trim((string) $this->localtax2_assuj);
$this->localtax1_value = trim($this->localtax1_value);
$this->localtax2_value = trim($this->localtax2_value);
$this->capital = ($this->capital != '') ? (float) price2num(trim((string) $this->capital)) : null;
- $this->effectif_id = trim((string) $this->effectif_id);
- $this->forme_juridique_code = trim((string) $this->forme_juridique_code);
+ $this->effectif_id = (int) trim((string) $this->effectif_id);
+ $this->forme_juridique_code = (int) trim((string) $this->forme_juridique_code);
//Gencod
$this->barcode = trim($this->barcode);
@@ -2151,6 +2203,7 @@ class Societe extends CommonObject
$columnName = $deleteFromObject[2];
if (dol_include_once($filepath)) {
$child_object = new $className($this->db);
+ '@phan-var-force CommonObject $child_object';
$result = $child_object->deleteByParentField($id, $columnName);
if ($result < 0) {
$error++;
@@ -2701,9 +2754,9 @@ class Societe extends CommonObject
/**
* getTooltipContentArray
*
- * @param array $params params to construct tooltip data
+ * @param array $params params to construct tooltip data
+ * @return array Data to show in tooltip
* @since v18
- * @return array
*/
public function getTooltipContentArray($params)
{
@@ -2727,11 +2780,11 @@ class Societe extends CommonObject
$photo .= Form::showphoto('societe', $this, 0, 40, 0, 'photoref', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
$photo .= '';
- $label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
- $label.= '
';*/
- }
+ } //elseif (!empty($this->logo_squarred) && class_exists('Form')) {
+ /*$label.= '';
+ $label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+ $label.= '
';*/
+ // }
$datas['divopen'] = '';
@@ -3049,10 +3102,10 @@ class Societe extends CommonObject
/**
- * Return label of status (activity, closed)
+ * Return label of status (activity, closed)
*
- * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
- * @return string Label of status
+ * @param int<0,6> $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
*/
public function getLibStatut($mode = 0)
{
@@ -3063,8 +3116,8 @@ class Societe extends CommonObject
/**
* Return the label of a given status
*
- * @param int $status Status id
- * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
+ * @param int $status Status id
+ * @param int<0,6> $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
* @return string Status label
*/
public function LibStatut($status, $mode = 0)
@@ -3090,10 +3143,10 @@ class Societe extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Return list of contacts emails existing for third party
+ * Return list of contacts emails existing for third party
*
- * @param int $addthirdparty 1=Add also a record for thirdparty email, 2=Same than 1 but add text ThirdParty in grey
- * @return array Array of contacts emails
+ * @param int<0,2> $addthirdparty 1=Add also a record for thirdparty email, 2=Same than 1 but add text ThirdParty in grey
+ * @return array<'thirdparty'|int,string> Array of contact's emails
*/
public function thirdparty_and_contact_email_array($addthirdparty = 0)
{
@@ -3115,9 +3168,9 @@ class Societe extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Return list of contacts mobile phone existing for third party
+ * Return list of contacts mobile phone existing for third party
*
- * @return array Array of contacts emails
+ * @return array<'thirdparty'|int,string> Array of contacts mobile phone
*/
public function thirdparty_and_contact_phone_array()
{
@@ -3140,9 +3193,9 @@ class Societe extends CommonObject
/**
* Return list of contacts emails or mobile existing for third party
*
- * @param string $mode 'email' or 'mobile'
- * @param int $hidedisabled 1=Hide contact if disabled
- * @return array Array of contacts emails or mobile. Example: array(id=>'Name ')
+ * @param 'email'|'mobile' $mode 'email' or 'mobile'
+ * @param int<0,1> $hidedisabled 1=Hide contact if disabled
+ * @return string[] Array of contacts emails or mobile. Example: array(id=>'Name ')
*/
public function contact_property_array($mode = 'email', $hidedisabled = 0)
{
@@ -3208,9 +3261,9 @@ class Societe extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Returns the contact list of this company
+ * Return the contact list of this company
*
- * @return array array of contacts
+ * @return string[] $contacts array of contacts
*/
public function contact_array()
{
@@ -3237,9 +3290,9 @@ class Societe extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Returns the contact list of this company
+ * Return the contact list of this company
*
- * @return array $contacts array of contacts
+ * @return Contact[] $contacts array of contacts
*/
public function contact_array_objects()
{
@@ -3360,8 +3413,8 @@ class Societe extends CommonObject
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".((int) $this->id);
$result = $this->db->query($sql);
if (!$result) {
- $this->error++;
- $this->errors[] = $this->db->lasterror;
+ $this->error = $this->db->lasterror();
+ $this->errors[] = $this->db->lasterror();
return 0;
} else {
$num_rows = $this->db->num_rows($result);
@@ -3402,6 +3455,7 @@ class Societe extends CommonObject
}
/** @var ModeleThirdPartyCode $mod */
$mod = new $module($this->db);
+ '@phan-var-force ModeleThirdPartyCode $mod';
$this->code_client = $mod->getNextValue($objsoc, $type);
$this->prefixCustomerIsRequired = $mod->prefixIsRequired;
@@ -3435,6 +3489,7 @@ class Societe extends CommonObject
}
/** @var ModeleThirdPartyCode $mod */
$mod = new $module($this->db);
+ '@phan-var-force ModeleThirdPartyCode $mod';
$this->code_fournisseur = $mod->getNextValue($objsoc, $type);
@@ -3465,6 +3520,7 @@ class Societe extends CommonObject
}
$mod = new $module($this->db);
+ '@phan-var-force ModeleThirdPartyCode $mod';
dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
if ($mod->code_modifiable_null && !$this->code_client) {
@@ -3505,6 +3561,7 @@ class Societe extends CommonObject
}
$mod = new $module($this->db);
+ '@phan-var-force ModeleThirdPartyCode $mod';
dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
if ($mod->code_modifiable_null && !$this->code_fournisseur) {
@@ -3551,6 +3608,7 @@ class Societe extends CommonObject
}
$mod = new $module($this->db);
+ '@phan-var-force ModeleThirdPartyCode $mod';
dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
$result = $mod->verif($this->db, $this->code_client, $this, 0);
@@ -3592,6 +3650,7 @@ class Societe extends CommonObject
}
$mod = new $module($this->db);
+ '@phan-var-force ModeleThirdPartyCode $mod';
dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
@@ -3632,6 +3691,7 @@ class Societe extends CommonObject
if ($res) {
$mod = new $module();
+ '@phan-var-force ModeleAccountancyCode $mod';
// Set code count in $mod->code
$result = $mod->get_code($this->db, $this, $type);
@@ -3735,8 +3795,8 @@ class Societe extends CommonObject
* Get parents for company
*
* @param int $company_id ID of company to search parent
- * @param array $parents List of companies ID found
- * @return array
+ * @param int[] $parents List of companies ID found
+ * @return int[]
*/
public function getParentsForCompany($company_id, $parents = array())
{
@@ -4445,7 +4505,7 @@ class Societe extends CommonObject
$this->tva_intra = getDolGlobalString('MAIN_INFO_TVAINTRA'); // VAT number, not necessarily INTRA.
$this->managers = getDolGlobalString('MAIN_INFO_SOCIETE_MANAGERS');
$this->capital = is_numeric(getDolGlobalString('MAIN_INFO_CAPITAL')) ? (float) price2num(getDolGlobalString('MAIN_INFO_CAPITAL')) : 0;
- $this->forme_juridique_code = getDolGlobalString('MAIN_INFO_SOCIETE_FORME_JURIDIQUE');
+ $this->forme_juridique_code = getDolGlobalInt('MAIN_INFO_SOCIETE_FORME_JURIDIQUE');
$this->email = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
$this->default_lang = getDolGlobalString('MAIN_LANG_DEFAULT', 'auto');
$this->logo = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO');
@@ -4716,8 +4776,8 @@ class Societe extends CommonObject
/**
* Return amount of proposal not yet paid and total an dlist of all proposals
*
- * @param string $mode 'customer' or 'supplier'
- * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
+ * @param 'customer'|'supplier' $mode 'customer' or 'supplier'
+ * @return array{opened:float,total_ht:float,total_ttc:float}|array{} array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
*/
public function getOutstandingProposals($mode = 'customer')
{
@@ -4760,8 +4820,8 @@ class Societe extends CommonObject
/**
* Return amount of order not yet paid and total and list of all orders
*
- * @param string $mode 'customer' or 'supplier'
- * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
+ * @param 'customer'|'supplier' $mode 'customer' or 'supplier'
+ * @return array{opened:float,total_ht:float,total_ttc:float}|array{} array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
*/
public function getOutstandingOrders($mode = 'customer')
{
@@ -4803,9 +4863,9 @@ class Societe extends CommonObject
/**
* Return amount of bill not yet paid and total of all invoices
*
- * @param string $mode 'customer' or 'supplier'
- * @param int $late 0 => all invoice, 1=> only late
- * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
+ * @param 'customer'|'supplier' $mode 'customer' or 'supplier'
+ * @param int<0,1> $late 0 => all invoice, 1=> only late
+ * @return array{opened:float,total_ht:float,total_ttc:float}|array{} array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
*/
public function getOutstandingBills($mode = 'customer', $late = 0)
{
@@ -4933,13 +4993,13 @@ class Societe extends CommonObject
/**
* Create a document onto disk according to template module.
*
- * @param string $modele Generator to use. Caller must set it to obj->model_pdf.
- * @param Translate $outputlangs object lang a utiliser pour traduction
- * @param int $hidedetails Hide details of lines
- * @param int $hidedesc Hide description
- * @param int $hideref Hide ref
- * @param null|array $moreparams Array to provide more information
- * @return int Return integer <0 if KO, >0 if OK
+ * @param string $modele Generator to use. Caller must set it to obj->model_pdf.
+ * @param Translate $outputlangs object lang a utiliser pour traduction
+ * @param int<0,1> $hidedetails Hide details of lines
+ * @param int<0,1> $hidedesc Hide description
+ * @param int<0,1> $hideref Hide ref
+ * @param ?array $moreparams Array to provide more information
+ * @return int Return integer <0 if KO, >0 if OK
*/
public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
{
@@ -5017,7 +5077,7 @@ class Societe extends CommonObject
*
* @param int[]|int $salesrep User ID or array of user IDs
* @param bool $onlyAdd Only add (no delete before)
- * @return int Return integer <0 if KO, >0 if OK
+ * @return int<-1,1> Return integer <0 if KO, >0 if OK
*/
public function setSalesRep($salesrep, $onlyAdd = false)
{
@@ -5196,11 +5256,11 @@ class Societe extends CommonObject
}
/**
- * Return clickable link of object (with eventually picto)
+ * Return clickable link of object (with optional picto)
*
- * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
- * @param array $arraydata Array of data
- * @return string HTML Code for Kanban thumb.
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @param array $arraydata Array of data
+ * @return string HTML Code for Kanban thumb.
*/
public function getKanbanView($option = '', $arraydata = array())
{
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index be7bfbc6c87..4992081e976 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -384,6 +384,8 @@ if (empty($reshook)) {
//$creditnote->remise_percent = $invoice->remise_percent;
$creditnote->create($user);
+ $fk_parent_line = 0; // Initialise
+
foreach ($invoice->lines as $line) {
// Extrafields
if (method_exists($line, 'fetch_optionals')) {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 316accdfcd6..7ea228c62c4 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -474,7 +474,7 @@ class Ticket extends CommonObject
* @param string $getRef Reference of object
* @return bool
*/
- public function checkExistingRef(string $action, string $getRef): bool
+ public function checkExistingRef(string $action, string $getRef)
{
$test = new self($this->db);
diff --git a/htdocs/webportal/class/webportalinvoice.class.php b/htdocs/webportal/class/webportalinvoice.class.php
index 94d92ffde54..2a55e8af420 100644
--- a/htdocs/webportal/class/webportalinvoice.class.php
+++ b/htdocs/webportal/class/webportalinvoice.class.php
@@ -93,7 +93,7 @@ class WebPortalInvoice extends Facture
// BEGIN MODULEBUILDER PROPERTIES
/**
- * @var array|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array,comment?:string}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+ * @var array|string,position:int,notnull?:int,visible:int<-2,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,2>,disabled?:int<0,1>,arrayofkeyval?:array,comment?:string,validate?:int<0,1>}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
public $fields = array(
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 1,),