diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 74adb468190..367b156f196 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -1133,31 +1133,5 @@ class Paiement extends CommonObject }*/ return ''; } - - /** - * Load the third party of object, from id into this->thirdparty - * - * @param int $force_thirdparty_id Force thirdparty id - * @return int <0 if KO, >0 if OK - */ - function fetch_thirdparty($force_thirdparty_id=0) - { - require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; - - if (empty($force_thirdparty_id)) - { - $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first invoice to get him - if (!empty($billsarray)) - { - $supplier_invoice = new FactureFournisseur($this->db); - if ($supplier_invoice->fetch($billsarray[0]) > 0) - { - $force_thirdparty_id = $supplier_invoice->fk_soc; - } - } - } - - return parent::fetch_thirdparty($force_thirdparty_id); - } } diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php index 52374cface8..2b657dbd962 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php @@ -725,12 +725,12 @@ class pdf_standard extends ModelePDFSuppliersPayments if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { $thirdparty = $object->contact; } else { - $thirdparty = $object->thirdparty; + $thirdparty = $mysoc; } $carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs); - $carac_client=pdf_build_address($outputlangs,$this->emetteur,$thirdparty,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object); + $carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object); // Show recipient $widthrecbox=90; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 7a8fbc253c6..8f99c24f7a7 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -738,30 +738,4 @@ class PaiementFourn extends Paiement return $way; } - - /** - * Load the third party of object, from id into this->thirdparty - * - * @param int $force_thirdparty_id Force thirdparty id - * @return int <0 if KO, >0 if OK - */ - function fetch_thirdparty($force_thirdparty_id=0) - { - require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; - - if (empty($force_thirdparty_id)) - { - $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him - if (!empty($billsarray)) - { - $supplier_invoice = new FactureFournisseur($this->db); - if ($supplier_invoice->fetch($billsarray[0]) > 0) - { - $force_thirdparty_id = $supplier_invoice->fk_soc; - } - } - } - - return parent::fetch_thirdparty($force_thirdparty_id); - } }