From fad38c753ae76be50bb24526cd8ecafe0094ad2f Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 29 Jul 2011 10:49:58 +0000
Subject: [PATCH] task #10501: Can use point of sale with different bank
 accounts

---
 htdocs/cashdesk/tpl/menu.tpl.php       |   2 +-
 htdocs/langs/ca_ES/admin.lang          |   6 +-
 htdocs/langs/ca_ES/cashdesk.lang       |   4 +-
 htdocs/langs/en_US/cashdesk.lang       |   4 +-
 htdocs/langs/es_ES/admin.lang          |   6 +-
 htdocs/langs/es_ES/cashdesk.lang       |   4 +-
 htdocs/langs/fr_FR/cashdesk.lang       |   4 +-
 htdocs/product/class/product.class.php | 247 ++++++++++++++-----------
 8 files changed, 146 insertions(+), 131 deletions(-)

diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index 83dac68a99e..2ab0515e6ab 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -65,7 +65,7 @@ print '<div class="menu_bloc">';
 print '<ul class="menu">';
 print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
 
-print '<li class="menu_choix2"><a href="deconnexion.php"><span>'.$langs->trans("BackOffice").'</span></a></li>';
+print '<li class="menu_choix2"><a href=".."><span>'.$langs->trans("BackOffice").'</span></a></li>';
 
 print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' <a href="deconnexion.php">'.$logout.'</a><br>';
 print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 87a8cd1edcc..24252ef481f 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -1246,9 +1246,9 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te
 CashDesk=TPV
 CashDeskSetup=Mòdul de configuració Terminal Punt de Venda
 CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes
-CashDeskBankAccountForSell=Compte a utilitzar per als cobraments en efectiu (caixa)
-CashDeskBankAccountForCheque=Compte a utilitzar per als cobraments amb xecs
-CashDeskBankAccountForCB=Compte a utilitzar per als cobraments amb targeta de crèdit
+CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
+CashDeskBankAccountForCheque=Compte per defecte a utilitzar per als cobraments amb xecs
+CashDeskBankAccountForCB=Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
 CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes
 ##### Bookmark #####
 BookmarkSetup=Configuració del mòdul Bookmark
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 961d8193949..362ac317408 100755
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -32,6 +32,4 @@ NoVAT=Sense IVA per aquesta venda
 Change=Canvi
 CalTip=Feu clic per veure el calendari
 CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.<br>Canvieu la configuració del mòdul estoc, o esculli un magatzem
-BankToPay=Compte de cobrament
-ShowCompany=Veure empresa
-ShowStock=Veure magatzem
\ No newline at end of file
+BankToPay=Compte de cobrament
\ No newline at end of file
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index e335b0f7941..1b764a3aeda 100755
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -32,6 +32,4 @@ NoVAT=No VAT for this sale
 Change=Excess received
 CalTip=Click to view the calendar
 CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
-BankToPay=Charge Account
-ShowCompany=Show company
-ShowStock=Show warehouse
\ No newline at end of file
+BankToPay=Charge Account
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index eb268695a5c..c4ea6eac339 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1246,9 +1246,9 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
 CashDesk=TPV
 CashDeskSetup=Configuración del módulo Terminal Punto de Venta
 CashDeskThirdPartyForSell=Tercero genérico a usar para la venta
-CashDeskBankAccountForSell=Cuenta a utilizar para los cobros en efectivo (caja)
-CashDeskBankAccountForCheque=Cuenta a utilizar para los cobros con cheques
-CashDeskBankAccountForCB=Cuenta a utilizar para los cobros con tarjeta de crédito
+CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
+CashDeskBankAccountForCheque=Cuenta por defecto a utilizar para los cobros con cheques
+CashDeskBankAccountForCB=Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
 CashDeskIdWareHouse=Almacén a utilizar para las ventas
 ##### Bookmark #####
 BookmarkSetup=Configuración del módulo Marcadores
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 0e2d2bcf390..e1ade767e8f 100755
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -32,6 +32,4 @@ NoVAT=Sin IVA en esta venta
 Change=Cambio
 CalTip=Haga clic para ver el calendario
 CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stock, o escoja un almacén
-BankToPay=Cuenta de cobro
-ShowCompany=Ver empresa
-ShowStock=Ver almacén
\ No newline at end of file
+BankToPay=Cuenta de cobro
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 6e03cc886eb..692fb7ad834 100755
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -32,6 +32,4 @@ NoVAT=Pas de TVA pour cette vente
 Change=Rendu
 CalTip=Cliquez pour afficher le calendrier
 CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt.
-BankToPay=Compte à créditer
-ShowCompany=Voir société
-ShowStock=Voir entrepôt
\ No newline at end of file
+BankToPay=Compte à créditer
\ No newline at end of file
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8bccf934120..d6f7baf831e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -17,14 +17,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/product/class/product.class.php
  *	\ingroup    produit
  *	\brief      Fichier de la classe des produits predefinis
- *	\version    $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $
+ *	\version    $Id: product.class.php,v 1.46 2011/07/29 06:59:36 tiaris Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
 
@@ -190,15 +191,14 @@ class Product extends CommonObject
 
 	/**
 	 *	Insert product into database
-	 *	@param    user     		User making insert
-	 *  @param	  notrigger		Disable triggers
-	 *	@return   int     		Id of product/service if OK or number of error < 0
+	 *	@param    user     	User making insert
+	 *	@return   int     	id of product/service if OK or number of error < 0
 	 */
-	function create($user,$notrigger=0)
+	function create($user)
 	{
-		global $conf, $langs;
+		global $conf ;
 
-        $error=0;
+		$this->errno = 0;
 
 		// Clean parameters
 		$this->ref = dol_string_nospecial(trim($this->ref));
@@ -250,149 +250,172 @@ class Product extends CommonObject
 			$this->error='ErrorWrongParameters';
 			return -1;
 		}
-		if (empty($this->ref))
-		{
-			$this->error='ErrorWrongParameters';
-		    return -2;
-		}
 
 		dol_syslog("Product::Create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type." Category : ".$this->catid, LOG_DEBUG);
 
-
-		$this->db->begin();
-
-		$sql = "SELECT count(*) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE ref = '" .$this->ref."'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$result = $this->db->query($sql);
-		if ($result)
+		if ($this->ref)
 		{
-			$obj = $this->db->fetch_object($result);
-			if ($obj->nb == 0)
+			$this->db->begin();
+
+			$sql = "SELECT count(*)";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product";
+			$sql.= " WHERE ref = '" .$this->ref."'";
+			$sql.= " AND entity = ".$conf->entity;
+
+			$result = $this->db->query($sql) ;
+			if ($result)
 			{
-				// Produit non deja existant
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
-				$sql.= "datec";
-				$sql.= ", entity";
-				$sql.= ", ref";
-				$sql.= ", price_min";
-				$sql.= ", price_min_ttc";
-				$sql.= ", label";
-				$sql.= ", fk_user_author";
-				$sql.= ", fk_product_type";
-				$sql.= ", price";
-				$sql.= ", price_ttc";
-				$sql.= ", price_base_type";
-				$sql.= ", tobuy";
-				$sql.= ", tosell";
-				$sql.= ", canvas";
-				$sql.= ", finished";
-				$sql.= ", hidden";
-				$sql.= ") VALUES (";
-				$sql.= $this->db->idate(mktime());
-				$sql.= ", ".$conf->entity;
-				$sql.= ", '".$this->ref."'";
-				$sql.= ", ".price2num($price_min_ht);
-				$sql.= ", ".price2num($price_min_ttc);
-				$sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null");
-				$sql.= ", ".$user->id;
-				$sql.= ", ".$this->type;
-				$sql.= ", ".price2num($price_ht);
-				$sql.= ", ".price2num($price_ttc);
-				$sql.= ", '".$this->price_base_type."'";
-				$sql.= ", ".$this->status;
-				$sql.= ", ".$this->status_buy;
-				$sql.= ", '".$this->canvas."'";
-				$sql.= ", ".$this->finished;
-				$sql.= ", ".$this->hidden;
-				$sql.= ")";
-
-				dol_syslog("Product::Create sql=".$sql);
-				$result = $this->db->query($sql);
-				if ( $result )
+				$row = $this->db->fetch_array($result);
+				if ($row[0] == 0)
 				{
-					$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
+					// Produit non deja existant
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
+					$sql.= "datec";
+					$sql.= ", entity";
+					$sql.= ", ref";
+					$sql.= ", price_min";
+					$sql.= ", price_min_ttc";
+					$sql.= ", label";
+					$sql.= ", fk_user_author";
+					$sql.= ", fk_product_type";
+					$sql.= ", price";
+					$sql.= ", price_ttc";
+					$sql.= ", price_base_type";
+					$sql.= ", canvas";
+					$sql.= ", finished";
+					$sql.= ", hidden";
+					$sql.= ") VALUES (";
+					$sql.= $this->db->idate(mktime());
+					$sql.= ", ".$conf->entity;
+					$sql.= ", '".$this->ref."'";
+					$sql.= ", ".price2num($price_min_ht);
+					$sql.= ", ".price2num($price_min_ttc);
+					$sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null");
+					$sql.= ", ".$user->id;
+					$sql.= ", ".$this->type;
+					$sql.= ", ".price2num($price_ht);
+					$sql.= ", ".price2num($price_ttc);
+					$sql.= ", '".$this->price_base_type."'";
+					$sql.= ", '".$this->canvas."'";
+					$sql.= ", ".$this->finished;
+					$sql.= ", ".$this->hidden;
+					$sql.= ")";
 
-					if ($id > 0)
+					dol_syslog("Product::Create sql=".$sql);
+					$result = $this->db->query($sql);
+					if ( $result )
 					{
-						$this->id				= $id;
-						$this->price			= $price_ht;
-						$this->price_ttc		= $price_ttc;
-						$this->price_min		= $price_min_ht;
-						$this->price_min_ttc	= $price_min_ttc;
+						$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
 
-						$result = $this->_log_price($user);
-						if ($result > 0)
+						if ($id > 0)
 						{
-							if ( $this->update($id, $user) > 0)
+							$this->id				= $id;
+							$this->price			= $price_ht;
+							$this->price_ttc		= $price_ttc;
+							$this->price_min		= $price_min_ht;
+							$this->price_min_ttc	= $price_min_ttc;
+
+							$result = $this->_log_price($user);
+							if ($result > 0)
 							{
-								if ($this->catid > 0)
+								if ( $this->update($id, $user) > 0)
 								{
-									require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php");
-									$cat = new Categorie($this->db, $this->catid);
-									$cat->add_type($this,"product");
+									if ($this->catid > 0)
+									{
+										require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php");
+										$cat = new Categorie($this->db, $this->catid);
+										$cat->add_type($this,"product");
+									}
+								}
+								else
+								{
+									$this->_setErrNo("Create",260,$this->error);
 								}
 							}
 							else
 							{
-							    $error++;
-					            $this->error='ErrorFailedToUpdateRecord';
+								$this->error=$this->db->error();
+								$this->_setErrNo("Create",264,$this->error);
 							}
 						}
 						else
 						{
-							$error++;
-						    $this->error=$this->db->lasterror();
+							$this->_setErrNo("Create",259);
 						}
 					}
 					else
 					{
-						$error++;
-					    $this->error='ErrorFailedToGetInsertedId';
+						$this->error=$this->db->error();
+						$this->_setErrNo("Create",258,$this->error);
 					}
 				}
 				else
 				{
-					$error++;
-				    $this->error=$this->db->lasterror();
+					// Le produit existe deja
+					$this->error='ErrorProductAlreadyExists';
 				}
 			}
 			else
 			{
-				// Product already exists with this ref
-				$langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref);
+				$this->_setErrNo("Create",263);
+			}
+
+			/*
+			 * END COMMIT
+			 */
+
+			if ($this->errno === 0)
+			{
+				// Appel des triggers
+				include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+				$interface=new Interfaces($this->db);
+				$result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf);
+				if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				// Fin appel triggers
+
+				$this->db->commit();
+				return $id;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
 			}
 		}
 		else
 		{
-			$error++;
-		    $this->error=$this->db->lasterror();
+			$this->_setErrNo("Create",262);
+
+			return -2;
 		}
 
-		if (! $error && ! $notrigger)
-		{
-			// Appel des triggers
-			include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return $this->id;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -$error;
-		}
+		return -1;
 	}
 
+	/**
+	 *  Positionne le numero d'erreur
+	 *  @param      func Nom de la fonction
+	 *  @param      num  Numero de l'erreur
+	 *  @param		error string
+	 */
+	function _setErrNo($func, $num, $error='')
+	{
+		$this->errno = $num;
+		dol_syslog(get_class($this)."::".$func." - ERRNO(".$this->errno.")".($error?' - '.$error:''), LOG_ERR);
+	}
+
+	/**
+	 *	Retourne le texte de l'erreur
+	 */
+	function error()
+	{
+		$errs[257] = "ErrorProductAlreadyExists";
+		$errs[262] = "ErrorProductBadRefOrLabel";
+
+		return $errs[$this->errno];
+	}
+
+
 	/**
 	 *	Update a record into database
 	 *	@param      id          Id of product
@@ -2138,7 +2161,7 @@ class Product extends CommonObject
 					$prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild;
 				}
 			}
-
+			
 			return $prods;
 		}
 		else