Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Dolibarr · Jul 22, 2019 · b4e0c5e · b4e0c5e
2 parents a03a8da + 4c4a0b7
commit b4e0c5e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -396,7 +396,11 @@ function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidede
 					}
 				}
 				// Make substitutions into odt of thirdparty
-				$tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+                if ($socobject->element == 'contact') {
+                    $tmparray = $this->get_substitutionarray_contact($socobject, $outputlangs);
+                } else {
+                    $tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+                }
 				foreach($tmparray as $key=>$value)
 				{
 					try {