diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 373c3d0027c..c3d43361c81 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1395,8 +1395,8 @@ if (empty($reshook)) { } // Local Taxes - $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $tva_npr); - $localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $tva_npr); + $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr); + $localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr); // Margin $fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : ''); diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index f10db268366..e001bbf16ff 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -506,6 +506,7 @@ if (!$ret) { $socstatic = fetchObjectByElement($element_id, $element, $element_ref); if (is_object($socstatic)) { '@phan-var-force Societe $socstatic'; + /** @var Societe $socstatic */ $savobject = $object; $object = $socstatic; diff --git a/phpstan.neon.dist b/phpstan.neon.dist index d00dfaa653f..49fc4f0f5a4 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -106,7 +106,6 @@ parameters: - '#(?:ldap_(?:(?:ad|bin)d|delete|err(?:no|or)|first_entry|get_(?:(?:attribut|entri)es|(?:optio|values_le)n)|mod_(?:add|del|replace)|rename|set_option|unbind)) expects LDAP\\Connection#' - '#(?:MultiCurrencies::_cleanObjectDatasRate\(\)) expects MultiCurrency#' - '# (?:pg_(?:affected_rows|f(?:etch_(?:array|object|row)|ree_result)|num_rows)) expects PgSql\\Result#' - - '# (?:Holiday::getNextNumRef\(\)|get_localtax|pdf_pagefoot|societe_prepare_head) expects Societe#' - '# (?:Common(?:DocGenerator::get(?:(?:ExtrafieldsInHtml|_substitutionarray_lines)\(\))|Object::printO(?:(?:bject|rigin)Line\(\)))) expects CommonObjectLine#' - '#Call to function array_key_exists.. with .error. .* will always evaluate to false.#' - '#function dolGetButtonAction expects array\{confirm\?: array.*confirm: true} given.#'