lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24493 from BB2A-Anthony/FIX---INVOICE_SHOW_SHIPPING_ADDRESS

Browse Source 
FIX - Shipping address same third party
This commit is contained in:
Laurent Destailleur 2023-04-21 18:48:31 +02:00 committed by GitHub
commit a7f5872975
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -2143,7 +2143,7 @@ class pdf_crabe extends ModelePDFFactures
$carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs); $carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
$carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);; $carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);;
} }
if (!empty($carac_client_shipping) && (isset($object->contact->socid) && $object->contact->socid != $object->socid)) { if (!empty($carac_client_shipping)) {
$posy += $hautcadre; $posy += $hautcadre;
// Show shipping frame // Show shipping frame

2
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -2392,7 +2392,7 @@ class pdf_sponge extends ModelePDFFactures
$carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs); $carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
$carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object); $carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);
} }
if (!empty($carac_client_shipping) && (isset($object->contact->socid) && $object->contact->socid != $object->socid)) { if (!empty($carac_client_shipping)) {
$posy += $hautcadre; $posy += $hautcadre;
// Show shipping frame // Show shipping frame