Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8…

….0_fix9964
Dolibarr · Dec 1, 2018 · 6236f72 · 6236f72
2 parents c422904 + e4bc9f8
commit 6236f72
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 28 deletions.
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
@@ -275,34 +275,37 @@ function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidede
 				dol_mkdir($conf->expedition->dir_temp);
 
 
-				// If BILLING contact defined on invoice, we use it
+				// If SHIPMENT contact defined on invoice, we use it
 				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','BILLING');
+				$arrayidcontact=$object->getIdContact('external','SHIPPING');
 				if (count($arrayidcontact) > 0)
 				{
 					$usecontact=true;
 					$result=$object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				if (! empty($usecontact))
-				{
+				$contactobject = null;
+				if (! empty($usecontact)) {
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else $socobject = $object->thirdparty;
-				}
-				else
-				{
-					$socobject=$object->thirdparty;
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
+						$socobject = $object->contact;
+					else {
+						$socobject = $object->thirdparty;
+						// if we have a SHIIPPING contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
+				} else {
+					$socobject = $object->thirdparty;
 				}
 
 				// Make substitution
 				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				'__TOTAL_TTC__' => $object->total_ttc,
-				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+					'__FROM_NAME__' => $this->emetteur->name,
+					'__FROM_EMAIL__' => $this->emetteur->email,
+					'__TOTAL_TTC__' => $object->total_ttc,
+					'__TOTAL_HT__' => $object->total_ht,
+					'__TOTAL_VAT__' => $object->total_vat
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -411,6 +414,28 @@ function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidede
 					{
 					}
 				}
+
+				if ($usecontact && is_object($contactobject)) {
+					$tmparray=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+					foreach($tmparray as $key=>$value)
+					{
+						try {
+							if (preg_match('/logo$/',$key))	// Image
+							{
+								if (file_exists($value)) $odfHandler->setImage($key, $value);
+								else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+							else	// Text
+							{
+								$odfHandler->setVars($key, $value, true, 'UTF-8');
+							}
+						}
+						catch(OdfException $e)
+						{
+						}
+					}
+				}
+
 				// Replace tags of object + external modules
 				$tmparray=$this->get_substitutionarray_shipment($object,$outputlangs);
 				complete_substitutions_array($tmparray, $outputlangs, $object);

diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -286,20 +286,18 @@ function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidede
 				}
 
 				// Recipient name
-				$contactobject=null;
-				if (! empty($usecontact))
-				{
+				$contactobject = null;
+				if (! empty($usecontact)) {
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
+						$socobject = $object->contact;
 					else {
-			                        $socobject = $object->thirdparty;
-                        			// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
-                        			$contactobject = $object->contact;
-                    			}
-				}
-				else
-				{
-					$socobject=$object->thirdparty;
+						$socobject = $object->thirdparty;
+						// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
+				} else {
+					$socobject = $object->thirdparty;
 				}
 
 				// Fetch info for linked propal

diff --git a/htdocs/install/doctemplates/shipment/template_shipment.odt b/htdocs/install/doctemplates/shipment/template_shipment.odt
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
@@ -23,7 +23,7 @@
  *    \brief      File Class ticket
  */
 
-require_once "ticket.class.php";
+require_once DOL_DOCUMENT_ROOT . '/ticket/class/ticket.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';