Fix regression after renaming field fk_soc

Dolibarr · May 4, 2015 · 90f7842 · 90f7842
1 parent 4f4ebfa
commit 90f7842
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Matthieu Valleton	<mv@seeschloss.org>
- * Copyright (C) 2006-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2007		Patrick Raguin		<patrick.raguin@gmail.com>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
@@ -229,11 +229,13 @@
 
 		print_fiche_titre($langs->trans("CreateCat"));
 
+		dol_fiche_head('');
+
 		print '<table width="100%" class="border">';
 
 		// Ref
 		print '<tr>';
-		print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="flat" name="label" size="25" value="'.$label.'">';
+		print '<td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="flat" name="label" size="25" value="'.$label.'">';
 		print'</td></tr>';
 
 		// Description
@@ -257,9 +259,11 @@
 
 		print '</table>';
 
-		print '<br><div class="center">';
+		dol_fiche_end('');
+
+		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '&nbsp; &nbsp; &nbsp;';
 		print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel" />';
 		print '</div>';
 

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
@@ -643,8 +643,8 @@ function getObjectsInCateg($type)
 	{
 		$field=''; $classname=''; $category_table=''; $object_table='';
 		if ($type=='product')  { $field='product'; $classname='Product'; }
-		if ($type=='customer') { $field='societe'; $classname='Societe'; }
-		if ($type=='supplier') { $field='societe'; $classname='Fournisseur'; $category_table='fournisseur'; }
+		if ($type=='customer') { $field='soc'; $classname='Societe'; $category_table='societe'; $object_table='societe'; }
+		if ($type=='supplier') { $field='soc'; $classname='Fournisseur'; $category_table='fournisseur'; $object_table='societe'; }
 		if ($type=='member')   { $field='member'; $classname='Adherent'; $category_table=''; $object_table='adherent'; }
 		if ($type=='contact')  { $field='socpeople'; $classname='Contact'; $category_table='contact'; $object_table='socpeople'; }
 

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
@@ -127,7 +127,7 @@
 	$newobject = new Product($db);
 	$result = $newobject->fetch($elemid);
 	$elementtype = 'product';
-	
+
 	// TODO Add into categ
 	$result=$object->add_type($newobject,$elementtype);
 	if ($result >= 0)
@@ -145,7 +145,7 @@
 			setEventMessages($object->error,$object->errors,'errors');
 		}
 	}
-	
+
 }
 
 
@@ -232,7 +232,7 @@
 $cats = $object->get_filles();
 if ($cats < 0)
 {
-	dol_print_error();
+	dol_print_error($db, $cats->error, $cats->errors);
 }
 else
 {
@@ -286,12 +286,12 @@
 	$prods = $object->getObjectsInCateg("product");
 	if ($prods < 0)
 	{
-		dol_print_error();
+		dol_print_error($db, $prods->error, $prods->errors);
 	}
 	else
 	{
 		$showclassifyform=1; $typeid=0;
-		
+
 		// Form to add record into a category
 		if ($showclassifyform)
 		{
@@ -312,7 +312,7 @@
 			print '</table>';
 			print '</form>';
 		}
-		
+
 		print "<br>";
 		print "<table class='noborder' width='100%'>\n";
 		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("ProductsAndServices")."</td></tr>\n";
@@ -359,7 +359,7 @@
 	$socs = $object->getObjectsInCateg("supplier");
 	if ($socs < 0)
 	{
-		dol_print_error();
+		dol_print_error($db, $socs->error, $socs->errors);
 	}
 	else
 	{
@@ -410,7 +410,7 @@
 	$socs = $object->getObjectsInCateg("customer");
 	if ($socs < 0)
 	{
-		dol_print_error();
+		dol_print_error($db, $socs->error, $socs->errors);
 	}
 	else
 	{
@@ -466,7 +466,7 @@
 	$prods = $object->getObjectsInCateg("member");
 	if ($prods < 0)
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $prods->error, $prods->errors);
 	}
 	else
 	{
@@ -518,7 +518,7 @@
 	$contacts = $object->getObjectsInCateg("contact");
 	if ($contacts < 0)
 	{
-		dol_print_error();
+		dol_print_error($db, $contacts->error, $contacts->errors);
 	}
 	else
 	{