فهرست منبع

MMIDocuments : fix display of thirdparty info if project management defined in document

Mathieu Moulin 1 سال پیش
والد
کامیت
81eaf020c4

+ 2 - 1
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php

@@ -1742,8 +1742,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 
 				// Recipient name
-				if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+				if ($usecontact && empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
 					$thirdparty = $object->contact;
+					$thirdparty->fetch_thirdparty();
 				} else {
 					$thirdparty = $object->thirdparty;
 				}

+ 4 - 3
htdocs/core/modules/facture/doc/pdf_sponge.modules.php

@@ -2337,16 +2337,17 @@ class pdf_sponge extends ModelePDFFactures
 				}
 
 				// Recipient name
-				if ($usecontact && ($object->contact->socid == $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+				if ($usecontact && empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
 					$thirdparty = $object->contact;
+					$thirdparty->fetch_thirdparty();
 				} else {
 					$thirdparty = $object->thirdparty;
 				}
 
-				$carac_client_name = $recipient_type != 'MGMT' ?pdfBuildThirdpartyName($thirdparty, $outputlangs) :'';
+				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
 				$mode =  'target';
-				$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
+				$carac_client = pdf_build_address($outputlangs, $this->emetteur, $usecontact && empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) ?$object->contact->thirdparty :$object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
 				// Show recipient
 				$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;

+ 4 - 3
htdocs/core/modules/propale/doc/pdf_cyan.modules.php

@@ -1834,16 +1834,17 @@ class pdf_cyan extends ModelePDFPropales
 				}
 
 				// Recipient name
-				if ($usecontact && ($object->contact->socid == $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+				if ($usecontact && empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {	
 					$thirdparty = $object->contact;
+					$thirdparty->fetch_thirdparty();
 				} else {
 					$thirdparty = $object->thirdparty;
 				}
 
-				$carac_client_name = $recipient_type != 'MGMT' ?pdfBuildThirdpartyName($thirdparty, $outputlangs) :'';
+				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
 				$mode =  'target';
-				$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
+				$carac_client = pdf_build_address($outputlangs, $this->emetteur, $usecontact && empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) ?$object->contact->thirdparty :$object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
 				// Show recipient
 				$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;