From 9cd5e7cafae8249a8a30097b0ac639d16ec51e99 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Sep 2015 14:22:03 +0200
Subject: [PATCH] Fix some errors into code generator.

---
 dev/skeletons/build_class_from_table.php | 10 +++++-----
 dev/skeletons/skeleton_class.class.php   |  5 -----
 dev/skeletons/skeleton_page.php          | 10 +++++-----
 htdocs/core/class/commonobject.class.php | 10 +++++-----
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 43f29a17ad3..6dac857ac11 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -69,8 +69,9 @@ if ($db->type != 'mysql' && $db->type != 'mysqli')
 }
 
 // Show parameters
-print 'Tablename='.$argv[1]."\n";
-print "Current dir is ".getcwd()."\n";
+print 'Tablename: '.$argv[1]."\n";
+print "Current dir: ".getcwd()."\n";
+print "Database name: ".$db->database_name."\n";
 
 
 // Define array with list of properties
@@ -304,10 +305,9 @@ foreach($property as $key => $prop)
 		}
 		else
 		{
-			$varprop.=' \'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
+			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
 			$varprop.="\$this->".$prop['field']."";
-			$varprop.='.\').';
-			
+			$varprop.='"\'")';
 		}
 		
 		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index 854e4a4fb47..2f8c78556e1 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -38,11 +38,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
  */
 class Skeleton_Class extends CommonObject
 {
-	/**
-	 * @var DoliDb Database handler
-	 */
-	protected $db;
-
 	/**
 	 * @var string Error code (or message)
 	 * @deprecated
diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php
index 7665ce9986a..a74088b3702 100644
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -43,7 +43,7 @@ if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@includ
 if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
 if (! $res) die("Include of main fails");
 // Change this following line to use the correct relative path from htdocs
-include_once(DOL_DOCUMENT_ROOT.'/core/class/formcompany.class.php');
+include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 dol_include_once('/module/class/skeleton_class.class.php');
 
 // Load traductions files requiredby by page
@@ -62,7 +62,7 @@ if ($user->societe_id > 0)
 	//accessforbidden();
 }
 
-if (empty($action) && empty($id) && empty($ref)) $action='create';
+if (empty($action) && empty($id) && empty($ref)) $action='list';
 
 // Load object if id or ref is provided as parameter
 $object=new Skeleton_Class($db);
@@ -225,7 +225,7 @@ jQuery(document).ready(function() {
 
 
 // Part to show a list
-if ($action == 'list' || empty($id))
+if ($action == 'list' || (empty($id) && $action != 'create'))
 {
     $sql = "SELECT";
     $sql.= " t.rowid,";
@@ -243,7 +243,7 @@ if ($action == 'list' || empty($id))
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 	$sql.=$hookmanager->resPrint;
-    $sql.= " ORDER BY field1 ASC";
+    $sql.=$db->order($sortfield, $sortorder);
 
 	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 
@@ -329,7 +329,7 @@ if ($action == 'list' || empty($id))
 // Part to create
 if ($action == 'create')
 {
-	print_fiche_titre($langs->trans("NewResidence"));
+	print_fiche_titre($langs->trans("NewSkeleton"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="action" value="add">';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a4136d880f0..65ece020ac8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -53,6 +53,11 @@ abstract class CommonObject
      */
     public $error;
 
+	/**
+     * @var string[]	Array of error strings
+     */
+    public $errors=array();
+
     /**
      * @var string		Key value used to track if data is coming from import wizard
      */
@@ -82,11 +87,6 @@ abstract class CommonObject
 
     // Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
 
-	/**
-     * @var string[]	Array of error strings
-     */
-    public $errors=array();
-
     /**
      * @var string[]	Can be used to pass information when only object is provided to method
      */