New: A customer can also be a prospect.

2010-01-05 20:03:37 +00:00
parent 818394b154
commit c20be36714
26 changed files with 124 additions and 114 deletions
--- a/1
+++ b/1
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 ***** ChangeLog for 2.8 compared to 2.7 *****

 For users:
+- New: A customer can also be a prospect.
 - New: task #9802 : Can link an action to a project.
 - New: Initial sold can be conciliated.
 - New: task #9935: Can edit accountancy code.
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -152,7 +152,7 @@ print '</td></tr>';
 if ($_GET['type'] == 0 && $conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER && !$categorie->id_mere)
 {
 	print '<tr><td>'.$langs->trans ("AssignedToCustomer").'</td><td>';
-	print $html->select_societes($categorie->socid,'socid','s.client = 1 AND s.fournisseur = 0',1);
+	print $html->select_societes($categorie->socid,'socid','s.client IN (1, 3) AND s.fournisseur = 0',1);
 	print '</td></tr>';
 	print '<input type="hidden" name="catMere" value="-1">';
 	print '<input type="hidden" name="visible" value="1">';
--- a/htdocs/categories/fiche.php
+++ b/htdocs/categories/fiche.php
@@ -247,7 +247,7 @@ if ($user->rights->categorie->creer)
 			else
 			{
 				print '<tr><td>'.$langs->trans ("AssignedToCustomer").'</td><td>';
-				print $html->select_societes($_REQUEST['socid_id'],'socid','s.client = 1 AND s.fournisseur = 0',1);
+				print $html->select_societes($_REQUEST['socid_id'],'socid','s.client IN (1, 3) AND s.fournisseur = 0',1);
 				print '</td></tr>';
 				print '<input type="hidden" name="catMere" value="-1">';
 				print '<input type="hidden" name="visible" value="1">';
--- a/htdocs/client.class.php
+++ b/htdocs/client.class.php
@@ -97,7 +97,7 @@ class Client extends Societe
        	$sql.= " WHERE sc.fk_user = " .$user->id;
        	$clause = "AND";
        }
-        $sql.= " ".$clause." s.client in (1,2)";
+        $sql.= " ".$clause." s.client in (1,2,3)";
        $sql.= " AND s.entity = ".$conf->entity;
        $sql.= " GROUP BY s.client";

@@ -106,8 +106,8 @@ class Client extends Societe
        {
            while ($obj=$this->db->fetch_object($resql))
            {
-                if ($obj->client == 1) $this->nb["customers"]=$obj->nb;
-                if ($obj->client == 2) $this->nb["prospects"]=$obj->nb;
+                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"]+=$obj->nb;
+                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"]+=$obj->nb;
            }
            return 1;
        }
--- a/htdocs/comm/clients.php
+++ b/htdocs/comm/clients.php
@@ -19,10 +19,10 @@
 */

 /**
- \file       htdocs/comm/clients.php
- \ingroup    commercial, societe
- \brief      Liste des clients
- \version    $Id$
+ *	\file       htdocs/comm/clients.php
+ *	\ingroup    commercial, societe
+ *	\brief      List of customers
+ *	\version    $Id$
 */

 require("./pre.inc.php");
@@ -60,7 +60,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 if (!$user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.client=1";
+$sql.= " AND s.client IN (1, 3)";
 $sql.= " AND s.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -82,8 +82,8 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND p.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($type == "c") $sql.= " AND s.client = 1";
-if ($type == "p") $sql.= " AND s.client = 2";
+if ($type == "c") $sql.= " AND s.client IN (1, 3)";
+if ($type == "p") $sql.= " AND s.client IN (2, 3)";
 if ($type == "f") $sql.= " AND s.fournisseur = 1";
 if ($socid) $sql.= " AND s.rowid = ".$socid;

--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -350,7 +350,7 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
 	$sql = "SELECT s.rowid,s.nom,s.client,s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.client IN (1,2)";
+	$sql.= " WHERE s.client IN (1, 2, 3)";
 	$sql.= " AND s.entity = ".$conf->entity;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid)	$sql.= " AND s.rowid = $socid";
@@ -366,7 +366,9 @@ if ($conf->societe->enabled && $user->rights->societe->lire)

 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("BoxTitleLastCustomersOrProspects",$max).'</td></tr>';
+		print '<td colspan="2">'.$langs->trans("BoxTitleLastCustomersOrProspects",$max).'</td>';
+		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
+		print '</tr>';
 		if ($num)
 		{
 			$company=new Societe($db);
@@ -379,8 +381,9 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
 				print '<tr '.$bc[$var].'>';
 				print '<td nowrap="nowrap">'.$company->getNomUrl(1,'customer',48).'</td>';
 				print '<td align="right" nowrap>';
-				if ($objp->client == 1) print $langs->trans("Customer");
-				if ($objp->client == 2) print $langs->trans("Prospect");
+				if ($objp->client == 2 || $objp->client == 3) print $langs->trans("Prospect");
+				if ($objp->client == 3) print ' / ';
+				if ($objp->client == 1 || $objp->client == 3) print $langs->trans("Customer");
 				print "</td>";
 				print '<td align="right" nowrap>'.dol_print_date($db->jdate($objp->tms),'day')."</td>";
 				print '</tr>';
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -19,11 +19,11 @@
 */

 /**
-	    \file       htdocs/comm/prospect/index.php
-        \ingroup    commercial
-		\brief      Page accueil de la zone prospection
-		\version    $Id$
-*/
+ *	    \file       htdocs/comm/prospect/index.php
+ *      \ingroup    commercial
+ *		\brief      Page accueil de la zone prospection
+ *		\version    $Id$
+ */

 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
@@ -39,7 +39,7 @@ if ($user->societe_id > 0)


 /*
- *	Affichage zone prospect
+ *	View
 */

 llxHeader();
@@ -74,7 +74,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st ";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.client = 2";
+$sql.= " AND s.client IN (2, 3)";
 $sql.= " AND s.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY st.id";
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -153,7 +153,7 @@ if ($_GET["action"] == 'cstc')


 /*
- * Affichage liste
+ * View
 */

 $sql = "SELECT s.rowid, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea,";
@@ -172,7 +172,7 @@ if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)";
 $sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.client = 2";
+$sql.= " AND s.client in (2, 3)";
 $sql.= " AND s.entity = ".$conf->entity;
 if ($user->societe_id) $sql.= " AND s.rowid = " .$user->societe_id;
 // Join for the needed table to filter by sale
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -2178,7 +2178,7 @@ class Commande extends CommonObject

 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE client = 1";
+		$sql.= " WHERE client IN (1, 3)";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " LIMIT 10";

--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -471,7 +471,7 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
 	$sql = "SELECT s.nom, s.rowid, ".$db->pdate("s.datec")." as dc";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.client = 1";
+	$sql.= " WHERE s.client IN (1, 3)";
 	$sql.= " AND s.entity = ".$conf->entity;
 	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid)	$sql.= " AND s.rowid = ".$socid;
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -78,7 +78,7 @@ if ($type == "o") {
 	$titre=$langs->trans("ListOfContacts").' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
 	$urlfiche="";
 }
-if ($view == 'phone')  { $text="( Vue Telephones)"; }
+if ($view == 'phone')  { $text=" (Vue Telephones)"; }
 if ($view == 'mail')   { $text=" (Vue EMail)"; }
 if ($view == 'recent') { $text=" (Recents)"; }
 $titre = $titre." $text";
@@ -160,11 +160,11 @@ if ($type == "f")        // filtre sur type
 }
 if ($type == "c")        // filtre sur type
 {
-    $sql .= " AND client = 1";
+    $sql .= " AND client IN (1, 3)";
 }
 if ($type == "p")        // filtre sur type
 {
-    $sql .= " AND client = 2";
+    $sql .= " AND client IN (2, 3)";
 }
 if ($sall)
 {
--- a/htdocs/don.class.php
+++ b/htdocs/don.class.php
@@ -150,7 +150,7 @@ class Don extends CommonObject

 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE client = 1";
+		$sql.= " WHERE client IN (1, 3)";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " LIMIT 10";

--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -733,7 +733,7 @@ class Expedition extends CommonObject

 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE client = 1";
+		$sql.= " WHERE client IN (1, 3)";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " LIMIT 10";

--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -2676,7 +2676,7 @@ class Facture extends CommonObject

 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE client = 1";
+		$sql.= " WHERE client IN (1, 3)";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " LIMIT 10";

--- a/htdocs/fichinter/fichinter.class.php
+++ b/htdocs/fichinter/fichinter.class.php
@@ -675,7 +675,7 @@ class Fichinter extends CommonObject
 		$socids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE client = 1";
+		$sql.= " WHERE client IN (1, 3)";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " LIMIT 10";
 		$resql = $this->db->query($sql);
--- a/htdocs/includes/boxes/box_clients.php
+++ b/htdocs/includes/boxes/box_clients.php
@@ -70,7 +70,7 @@ class box_clients extends ModeleBoxes {
 			$sql = "SELECT s.nom, s.rowid as socid, s.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE s.client = 1";
+			$sql.= " WHERE s.client IN (1, 3)";
 			$sql.= " AND s.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
--- a/htdocs/includes/boxes/box_prospect.php
+++ b/htdocs/includes/boxes/box_prospect.php
@@ -74,7 +74,7 @@ class box_prospect extends ModeleBoxes {
 			$sql = "SELECT s.nom, s.rowid as socid, s.fk_stcomm, s.tms";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE s.client = 2";
+			$sql.= " WHERE s.client IN (2, 3)";
 			$sql.= " AND s.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
--- a/htdocs/includes/modules/mailings/poire.modules.php
+++ b/htdocs/includes/modules/mailings/poire.modules.php
@@ -65,7 +65,7 @@ class mailing_poire extends MailingTargets
 		$statssql[0].= " WHERE s.rowid = c.fk_soc";
 		$statssql[0].= " AND s.entity = ".$conf->entity;
 		$statssql[0].= " AND c.entity = ".$conf->entity;
-		$statssql[0].= " AND s.client = 1";
+		$statssql[0].= " AND s.client IN (1, 3)";
 		$statssql[0].= " AND c.email != ''";

 		return $statssql;
--- a/htdocs/livraison/livraison.class.php
+++ b/htdocs/livraison/livraison.class.php
@@ -720,7 +720,7 @@ class Livraison extends CommonObject

 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE client = 1";
+		$sql.= " WHERE client IN (1, 3)";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " LIMIT 10";

--- a/htdocs/oscommerce_ws/clients/fiche.php
+++ b/htdocs/oscommerce_ws/clients/fiche.php
@@ -113,7 +113,7 @@ if (($_GET["action"] == 'import' ) && ( $_GET["custid"] != '' ) && ($user->right
 		$societe->siren = '';
 		$societe->siret = '';
 		$societe->ape = '';
-		$societe->client = 1; // mettre 0 si prospect
+		$societe->client = 1; // put 0 if prospect
 	}

 	/* utilisation de la table de transco*/
--- a/htdocs/oscommerce_ws/commandes/fiche.php
+++ b/htdocs/oscommerce_ws/commandes/fiche.php
@@ -130,29 +130,30 @@ if ($action == '' && !$cancel) {
 		    	$societe->tel = $osc_cust->osc_custtel;
 		    	$societe->fax = $osc_cust->osc_custfax;
 		    	$societe->email = $osc_cust->osc_custmail;
-		/* on force */
+				/* on force */
 				$societe->url = '';
 				$societe->siren = '';
 				$societe->siret = '';
 				$societe->ape = '';
-				$societe->client = 1; // mettre 0 si prospect
+				$societe->client = 1; // put 0 if prospect

 				$cl = $societe->create($user);
 			   if ($cl == 0)
 			    {
 					$commande->socid = $societe->id;
-		    	  	print '<p>cr<63>ation r<>ussie nouveau client/prospect : '.$societe->nom;
+		    	  	print $langs->trans("CustomerCreated",$societe->nom);
 			    	$res = $osc_cust->transcode($osc_cust->osc_custid,$societe->id);
 					print ' : Id Dolibarr '.$societe->id.' , Id osc : '.$osc_cust->osc_custid.'</p>';
 			    }
 			    else
 			    {
-			    	print '<p>cr<EFBFBD>ation impossible client : '. $osc_cust->osc_custid .'</p>';
+			    	print 'Failed to create customer : '. $osc_cust->osc_custid ;
 			    	exit;
 			    }
 				}
 			}
-// v<>rifier l'existence des produits command<6E>s
+
+			// verifier l'existence des produits commandes
 			$osc_product = new Osc_Product($db);
 			$err = 0;

--- a/htdocs/propal.class.php
+++ b/htdocs/propal.class.php
@@ -1874,7 +1874,7 @@ class Propal extends CommonObject
 		$socids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE client = 1";
+		$sql.= " WHERE client IN (1, 3)";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " LIMIT 10";
 		$resql = $this->db->query($sql);
--- a/htdocs/prospect.class.php
+++ b/htdocs/prospect.class.php
@@ -19,21 +19,19 @@
 */

 /**
-    	\file       htdocs/prospect.class.php
-		\ingroup    societe
-		\brief      Fichier de la classe des prospects
-		\version    $Id$
-*/
-
-
-/** 
-        \class      Prospect
-		\brief      Classe permettant la gestion des prospects
+ *   	\file       htdocs/prospect.class.php
+ *		\ingroup    societe
+ *		\brief      Fichier de la classe des prospects
+ *		\version    $Id$
 */

 include_once(DOL_DOCUMENT_ROOT."/societe.class.php");


+/**
+ *      \class      Prospect
+ *		\brief      Classe permettant la gestion des prospects
+ */
 class Prospect extends Societe
 {
    var $db;
@@ -57,7 +55,7 @@ class Prospect extends Societe

    /**
     *      \brief      Charge indicateurs this->nb de tableau de bord
-     *      \return     int         <0 si ko, >0 si ok
+     *      \return     int         <0 if KO, >0 if OK
     */
    function load_state_board()
    {
@@ -74,16 +72,17 @@ class Prospect extends Societe
        	$sql.= " WHERE sc.fk_user = " .$user->id;
        	$clause = "AND";
        }
-        $sql.= " ".$clause." s.client in (1,2)";
+        $sql.= " ".$clause." s.client in (1,2,3)";
        $sql.= " AND s.entity = ".$conf->entity;
        $sql.= " GROUP BY s.client";
+
        $resql=$this->db->query($sql);
        if ($resql)
        {
            while ($obj=$this->db->fetch_object($resql))
            {
-                if ($obj->client == 1) $this->nb["customers"]=$obj->nb;
-                if ($obj->client == 2) $this->nb["prospects"]=$obj->nb;
+                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"]+=$obj->nb;
+                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"]+=$obj->nb;
            }
            return 1;
        }
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -420,7 +420,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
 		// Prospect/Customer
 		print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
 		print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
-		if ($conf->global->SOCIETE_PROSPECTANDCUSTOMER) print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+		print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
 		print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
 		print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
 		print '</select></td>';
@@ -751,7 +751,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
 		// Prospect/Customer
 		print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
 		print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
-		if ($conf->global->SOCIETE_PROSPECTANDCUSTOMER) print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+		print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
 		print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
 		print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
 		print '</select></td>';
--- a/htdocs/societe.class.php
+++ b/htdocs/societe.class.php
@@ -998,12 +998,18 @@ class Societe extends CommonObject
 	{
 		if ($this->id)
 		{
+			$newclient=1;
+			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET client = 1";
+			$sql.= " SET client = ".$newclient;
 			$sql.= " WHERE rowid = " . $this->id;

 			$resql=$this->db->query($sql);
-			if ($resql) return 1;
+			if ($resql)
+			{
+				$this->client = $newclient;
+				return 1;
+			}
 			else return -1;
 		}
 		return 0;