From c311bf5f2c67155e1093ff938e8d8896432fd72a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 6 Apr 2011 16:21:46 +0000
Subject: [PATCH] Qual: Fix architecture problem with canvas

---
 htdocs/contact/fiche.php | 22 ++++++++++----
 htdocs/societe/soc.php   | 64 ++++++++++++++++++++++++----------------
 2 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 0804304318c..d0c2e6467ce 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -320,14 +320,24 @@ if (! empty($objcanvas->template_dir))
     }
     else
     {
-        $result=$objcanvas->fetch($id);         // Reload object
-        $objcanvas->assign_values('view');  // Assign values
-        $objcanvas->display_canvas('view'); // Show template
+        // Fetch object
+        $result=$objcanvas->fetch($id);
+        if ($result > 0)
+        {
+            // Assign values
+            $objcanvas->assign_values('view');
 
-        // TODO Move this also into template
-        print show_actions_todo($conf,$langs,$db,$objsoc,$objcanvas->control->object);
+            // Display canvas
+            $objcanvas->display_canvas('view');
 
-        print show_actions_done($conf,$langs,$db,$objsoc,$objcanvas->control->object);
+            print show_actions_todo($conf,$langs,$db,$objsoc,$objcanvas->control->object);
+
+            print show_actions_done($conf,$langs,$db,$objsoc,$objcanvas->control->object);
+        }
+        else
+        {
+            dol_htmloutput_errors($objcanvas->error,$objcanvas->errors);
+        }
     }
 
 }
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index c45a645692c..19d49d5fba4 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -397,42 +397,54 @@ if (! empty($objcanvas->template_dir))
 	}
 	else
 	{
-		$result=$objcanvas->fetch($socid);       // Relaod object
-    	$objcanvas->assign_values('view');   // Assign values
-		$objcanvas->display_canvas('view');  // Show template
+		// Fetch object
+		$result=$objcanvas->fetch($socid);
+		if ($result > 0)
+		{
+			// Assign values
+			$objcanvas->assign_values('view');
 
-		// TODO Move this also into template
-		print '<table width="100%"><tr><td valign="top" width="50%">';
-		print '<a name="builddoc"></a>'; // ancre
+			// Display canvas
+			$objcanvas->display_canvas('view');
 
-		/*
-		 * Documents generes
-		 */
-		$filedir=$conf->societe->dir_output.'/'.$socid;
-		$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
-		$genallowed=$user->rights->societe->creer;
-		$delallowed=$user->rights->societe->supprimer;
 
-		$var=true;
+			print '<table width="100%"><tr><td valign="top" width="50%">';
+			print '<a name="builddoc"></a>'; // ancre
 
-		$somethingshown=$formfile->show_documents('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
+			/*
+			 * Documents generes
+			 */
+			$filedir=$conf->societe->dir_output.'/'.$socid;
+			$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
+			$genallowed=$user->rights->societe->creer;
+			$delallowed=$user->rights->societe->supprimer;
 
-		print '</td>';
-		print '<td></td>';
-		print '</tr>';
-		print '</table>';
+			$var=true;
 
-		print '<br>';
+			$somethingshown=$formfile->show_documents('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
 
-		// Subsidiaries list
-		$result=show_subsidiaries($conf,$langs,$db,$objcanvas->control->object);
+			print '</td>';
+			print '<td></td>';
+			print '</tr>';
+			print '</table>';
 
-		// Contacts list
-		$result=show_contacts($conf,$langs,$db,$objcanvas->control->object);
+			print '<br>';
 
-		// Projects list
-		$result=show_projects($conf,$langs,$db,$objcanvas->control->object);
+			// Subsidiaries list
+			$result=show_subsidiaries($conf,$langs,$db,$objcanvas->control->object);
+
+			// Contacts list
+			$result=show_contacts($conf,$langs,$db,$objcanvas->control->object);
+
+			// Projects list
+			$result=show_projects($conf,$langs,$db,$objcanvas->control->object);
+		}
+		else
+		{
+			dol_htmloutput_errors($objcanvas->error,$objcanvas->errors);
+		}
 	}
+
 }
 else
 {