From 73de8d169f5fbb333df96058121be69f4b924360 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 Mar 2013 18:04:46 +0100
Subject: [PATCH] Fix: Avoid call method on non object error

---
 .../core/class/commondocgenerator.class.php   | 28 +++++++++----------
 .../doc/doc_generic_invoice_odt.modules.php   | 10 +++----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index faccaa31545..9561aa288fb 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -185,11 +185,11 @@ abstract class CommonDocGenerator
         		}
         		$array_thirdparty=array_merge($array_thirdparty,array('company_options_'.$key => $object->array_options['options_'.$key]));
         	}
-        }        
+        }
         return $array_thirdparty;
     }
 
-    
+
     /**
      * Define array with couple substitution key => substitution value
      *
@@ -201,7 +201,7 @@ abstract class CommonDocGenerator
     function get_substitutionarray_propal($object,$outputlangs,$array_key='object')
     {
     	global $conf;
-    
+
     	$array_propal=array(
 	    	$array_key.'_id'=>$object->id,
 	    	$array_key.'_ref'=>$object->ref,
@@ -224,14 +224,14 @@ abstract class CommonDocGenerator
 	    	$array_key.'_note_private'=>$object->note,
 	    	$array_key.'_note'=>$object->note_public,
     	);
-    
+
     	// Add vat by rates
     	foreach ($object->lines as $line)
     	{
     		if (empty($array_propal[$array_key.'_total_vat_'.$line->tva_tx])) $array_propal[$array_key.'_total_vat_'.$line->tva_tx]=0;
     		$array_propal[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
     	}
-    	
+
     	// Retrieve extrafields
     	if(is_array($object->array_options) && count($object->array_options))
     	{
@@ -240,12 +240,12 @@ abstract class CommonDocGenerator
     		$extrafields = new ExtraFields($this->db);
     		$extralabels = $extrafields->fetch_name_optionals_label('propal',true);
     		$object->fetch_optionals($object->id,$extralabels);
-    	
+
     		$array_propal = $this->fill_substitutionarray_with_extrafields($object,$array_propal,$extrafields,$array_key,$outputlangs);
     	}
     	return $array_propal;
     }
-    
+
 
     /**
      *	Define array with couple substitution key => substitution value
@@ -257,7 +257,7 @@ abstract class CommonDocGenerator
     function get_substitutionarray_propal_lines($line,$outputlangs)
     {
     	global $conf;
-    
+
     	return array(
     	'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
     	'line_product_ref'=>$line->product_ref,
@@ -274,7 +274,7 @@ abstract class CommonDocGenerator
     	'line_date_end'=>$line->date_end
     	);
     }
-    
+
     /**
      *	Fill array with couple extrafield key => extrafield value
      *
@@ -309,14 +309,14 @@ abstract class CommonDocGenerator
 			{
 				$object->array_options['options_'.$key] = ($object->array_options['options_'.$key]!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');
 			}
-			$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));    			
+			$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
 		}
-		
+
 		return $array_to_fill;
-	    	
+
 	}
-    
-    
+
+
 	/**
 	 * Rect pdf
 	 *
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
index 957b5d85428..977de72d164 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -139,7 +139,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 			if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0;
 			$resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva;
 		}
-		
+
 		// Retrieve extrafields
 		if(is_array($object->array_options) && count($object->array_options))
 		{
@@ -148,7 +148,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 			$extrafields = new ExtraFields($this->db);
 			$extralabels = $extrafields->fetch_name_optionals_label('facture',true);
 			$object->fetch_optionals($object->id,$extralabels);
-		
+
 			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key='object',$outputlangs);
 		}
         return $resarray;
@@ -358,14 +358,14 @@ class doc_generic_invoice_odt extends ModelePDFFactures
                 {
                     $socobject=$object->client;
                 }
-                
+
                 // Fetch info for linked propal
                 $linked_propal = $object->fetchObjectLinked('','','','');
                 print '<pre>';
                 //print_r($object->linkedObjects['propal']); exit;
 
                 $propal_object = $object->linkedObjects['propal'][0];
-                
+
                 // Make substitution
                 $substitutionarray=array(
                     '__FROM_NAME__' => $this->emetteur->nom,
@@ -415,7 +415,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
 				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
-				$array_propal=$this->get_substitutionarray_propal($propal_object,$outputlangs,'propal');
+				$array_propal=is_object($propal_object)?$this->get_substitutionarray_propal($propal_object,$outputlangs,'propal'):array();
 
 				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal);
 				complete_substitutions_array($tmparray, $outputlangs, $object);