Finnalise categorie contact

Dolibarr · Jul 30, 2013 · 60bb595 · 60bb595
1 parent 44b3ebb
commit 60bb595
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
@@ -334,6 +334,17 @@ function delete($user)
 				$error++;
 			}
 		}
+		if (! $error)
+		{
+			$sql  = "DELETE FROM ".MAIN_DB_PREFIX."categorie_contact";
+			$sql .= " WHERE fk_categorie = ".$this->id;
+			if (!$this->db->query($sql))
+			{
+				$this->error=$this->db->lasterror();
+				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
+				$error++;
+			}
+		}
 
 		// Delete category
 		if (! $error)

diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
@@ -50,6 +50,7 @@
 elseif ($type == 1) $title=$langs->trans("SuppliersCategoriesArea");
 elseif ($type == 2) $title=$langs->trans("CustomersCategoriesArea");
 elseif ($type == 3) $title=$langs->trans("MembersCategoriesArea");
+elseif ($type == 4) $title=$langs->trans("ContactsCategoriesArea");
 else $title=$langs->trans("CategoriesArea");
 
 $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');

diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
@@ -94,6 +94,7 @@
 	elseif ($type == 1) $title=$langs->trans("SuppliersCategoryShort");
 	elseif ($type == 2) $title=$langs->trans("CustomersCategoryShort");
 	elseif ($type == 3) $title=$langs->trans("MembersCategoryShort");
+	elseif ($type == 4) $title=$langs->trans("ContactCategoriesShort");
 
 	$head = categories_prepare_head($object,$type);
 	dol_fiche_head($head, 'photos', $title, 0, 'category');

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
@@ -125,7 +125,7 @@
 elseif ($type == 1) $title=$langs->trans("SuppliersCategoryShort");
 elseif ($type == 2) $title=$langs->trans("CustomersCategoryShort");
 elseif ($type == 3) $title=$langs->trans("MembersCategoryShort");
-elseif ($type == 3) $title=$langs->trans("ContactCategoryShort");
+elseif ($type == 4) $title=$langs->trans("ContactCategoriesShort");
 else $title=$langs->trans("Category");
 
 $head = categories_prepare_head($object,$type);
@@ -445,6 +445,7 @@
 	}
 }
 
+//Categorie contact
 if($object->type == 4)
 {
 	$contacts = $object->get_type("socpeople","Contact",'contact',"socpeople");
@@ -478,7 +479,7 @@
 				if ($typeid == 1) $permission=$user->rights->societe->creer;
 				if ($typeid == 2) $permission=$user->rights->societe->creer;
 				if ($typeid == 3) $permission=$user->rights->adherent->creer;
-				if ($typeid == 4) $permission=$user->rights->contact->creer;
+				if ($typeid == 4) $permission=$user->rights->societe->creer;
 				if ($permission)
 				{
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$contact->id."'>";
@@ -491,7 +492,7 @@
 		}
 		else
 		{
-			print "<tr ".$bc[false]."><td>".$langs->trans("ThisCategoryHasNoCustomer")."</td></tr>";
+			print "<tr ".$bc[false]."><td>".$langs->trans("ThisCategoryHasNoContact")."</td></tr>";
 		}
 		print "</table>\n";
 	}

diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
@@ -17,6 +17,7 @@ SuppliersCategoriesArea=Suppliers categories area
 CustomersCategoriesArea=Customers categories area
 ThirdPartyCategoriesArea=Third parties categories area
 MembersCategoriesArea=Members categories area
+ContactsCategoriesArea=Contacts categories area
 MainCats=Main categories
 SubCats=Subcategories
 CatStatistics=Statistics
@@ -86,6 +87,7 @@ ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
+ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category

diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
@@ -17,6 +17,7 @@ SuppliersCategoriesArea=Espace des catégories de tiers fournisseurs
 CustomersCategoriesArea=Espace des catégories de tiers clients ou prospects
 ThirdPartyCategoriesArea=Espace des catégories de tiers
 MembersCategoriesArea=Espace des catégories d'adhérents
+ContactsCategoriesArea=Espace des catégories des contacts
 MainCats=Catégories principales
 SubCats=Sous-catégories
 CatStatistics=Statistiques
@@ -86,6 +87,7 @@ ThisCategoryHasNoProduct=Cette catégorie ne contient aucun produit.
 ThisCategoryHasNoSupplier=Cette catégorie ne contient aucun fournisseur.
 ThisCategoryHasNoCustomer=Cette catégorie ne contient aucun client.
 ThisCategoryHasNoMember=Cette catégorie ne contient aucun adhérent.
+ThisCategoryHasNoContact=Cette catégorie ne contient aucun contact.
 AssignedToCustomer=Attribuer à un client
 AssignedToTheCustomer=Attribué au client
 InternalCategory=Catégorie interne