From 7b500565752781738d1ef6a6d224deffb00bd444 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 11 Nov 2009 17:39:29 +0000
Subject: [PATCH] Fix: uniformize code

---
 htdocs/cashdesk/classes/Facturation.class.php | 20 +++++++++----------
 htdocs/cashdesk/facturation_dhtml.php         |  6 +++---
 htdocs/cashdesk/facturation_verif.php         |  8 ++++----
 .../cashdesk/templates/liste_articles.tpl.php |  6 +++---
 htdocs/cashdesk/templates/ticket.tpl.php      |  6 +++---
 htdocs/cashdesk/validation_verif.php          | 18 ++++++++---------
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/htdocs/cashdesk/classes/Facturation.class.php b/htdocs/cashdesk/classes/Facturation.class.php
index 16ed288b08b..7d9313aaf5d 100644
--- a/htdocs/cashdesk/classes/Facturation.class.php
+++ b/htdocs/cashdesk/classes/Facturation.class.php
@@ -86,12 +86,12 @@ class Facturation {
 //		global $conf_db_host, $conf_db_user, $conf_db_pass, $conf_db_base;
 //		$sql = new Sql ($conf_db_host, $conf_db_user, $conf_db_pass, $conf_db_base);
 
-		global $sql;
+		global $db;
 		$req='SELECT taux FROM '.MAIN_DB_PREFIX.'c_tva WHERE rowid = '.$this->tva();
 		dol_syslog("ajoutArticle sql=".$req);
-		$resql=$sql->query($req);
+		$resql=$db->query($req);
 
-		$obj = $sql->fetch_object($resql);
+		$obj = $db->fetch_object($resql);
 		$vat_rate=$obj->taux;
 		//var_dump($vat_rate);exit;
 
@@ -130,7 +130,7 @@ class Facturation {
 					'.price2num($total_ht,'MT').',
 					'.price2num($total_ttc,'MT').')';
 		dol_syslog("ajoutArticle sql=".$req);
-		$sql->query($req);
+		$db->query($req);
 
 		$this->raz();
 
@@ -143,8 +143,8 @@ class Facturation {
 //		global $conf_db_host, $conf_db_user, $conf_db_pass, $conf_db_base;
 //		$sql = new Sql ($conf_db_host, $conf_db_user, $conf_db_pass, $conf_db_base);
 
-		global $sql;
-		$sql->query('DELETE FROM '.MAIN_DB_PREFIX.'tmp_caisse WHERE id = '.$aArticle.' LIMIT 1');
+		global $db;
+		$db->query('DELETE FROM '.MAIN_DB_PREFIX.'tmp_caisse WHERE id = '.$aArticle.' LIMIT 1');
 
 	}
 
@@ -155,18 +155,18 @@ class Facturation {
 //		global $conf_db_host, $conf_db_user, $conf_db_pass, $conf_db_base;
 //		$sql = new Sql ($conf_db_host, $conf_db_user, $conf_db_pass, $conf_db_base);
 
-		global $sql;
-		$res = $sql->query ('SELECT remise, total_ht, total_ttc, taux FROM '.MAIN_DB_PREFIX.'tmp_caisse as c
+		global $db;
+		$res = $db->query ('SELECT remise, total_ht, total_ttc, taux FROM '.MAIN_DB_PREFIX.'tmp_caisse as c
 				LEFT JOIN '.MAIN_DB_PREFIX.'c_tva as t ON c.fk_tva = t.rowid
 				ORDER BY id');
 
 		$total_ht=0;
 		$total_ttc=0;
 
-		if ( $sql->num_rows($res) ) {
+		if ( $db->num_rows($res) ) {
 
 			$ret=array(); $i=0;
-			while ( $tab = $sql->fetch_array($res) )
+			while ( $tab = $db->fetch_array($res) )
 			{
 				foreach ( $tab as $cle => $valeur )
 				{
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 7c63b79fdd8..bc566052f86 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -39,14 +39,14 @@ if ( strlen ($_GET["code"]) >= 0 )	// If at least one key
 				OR p.label LIKE '%".$_GET['code']."%')
 			ORDER BY label";
 	dol_syslog($request);
-	$res = $sql->query ($request);
+	$res = $db->query ($request);
 
-	if ( $nbr = $sql->num_rows($res) ) {
+	if ( $nbr = $db->num_rows($res) ) {
 
 		$resultat = '<ul class="dhtml_bloc">';
 
 		$ret=array(); $i=0;
-		while ( $tab = $sql->fetch_array($res) )
+		while ( $tab = $db->fetch_array($res) )
 		{
 			foreach ( $tab as $cle => $valeur )
 			{
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 3dc23e8a2ac..6de317a0091 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -33,7 +33,7 @@ switch ( $_GET['action'] ) {
 			// Recuperation des donnees en fonction de la source (liste d�roulante ou champ texte) ...
 			if ( $_POST['hdnSource'] == 'LISTE' ) {
 
-				$res = $sql->query('SELECT fk_product, ref, price, reel, tva_tx
+				$res = $db->query('SELECT fk_product, ref, price, reel, tva_tx
 								FROM '.MAIN_DB_PREFIX.'product
 								LEFT JOIN '.MAIN_DB_PREFIX.'product_stock ON '.MAIN_DB_PREFIX.'product.rowid = '.MAIN_DB_PREFIX.'product_stock.fk_product
 								WHERE fk_product = '.$_POST['selProduit'].'
@@ -41,7 +41,7 @@ switch ( $_GET['action'] ) {
 
 			} else if ( $_POST['hdnSource'] == 'REF' ) {
 
-				$res = $sql->query('SELECT fk_product, ref, price, reel, tva_tx
+				$res = $db->query('SELECT fk_product, ref, price, reel, tva_tx
 								FROM '.MAIN_DB_PREFIX.'product
 								LEFT JOIN '.MAIN_DB_PREFIX.'product_stock ON '.MAIN_DB_PREFIX.'product.rowid = '.MAIN_DB_PREFIX.'product_stock.fk_product
 								WHERE ref = \''.$_POST['txtRef'].'\'
@@ -52,10 +52,10 @@ switch ( $_GET['action'] ) {
 
 
 			// ... et enregistrement dans l'objet
-			if ( $sql->num_rows ($res) ) {
+			if ( $db->num_rows ($res) ) {
 
 				$ret=array();
-				$tab = $sql->fetch_array($res);
+				$tab = $db->fetch_array($res);
 				foreach ( $tab as $cle => $valeur )
 				{
 					$ret[$cle] = $valeur;
diff --git a/htdocs/cashdesk/templates/liste_articles.tpl.php b/htdocs/cashdesk/templates/liste_articles.tpl.php
index d0f8bba8f3f..70b146c466e 100644
--- a/htdocs/cashdesk/templates/liste_articles.tpl.php
+++ b/htdocs/cashdesk/templates/liste_articles.tpl.php
@@ -30,11 +30,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 			LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON c.fk_article = p.rowid
 			ORDER BY id';
 	dol_syslog($request);
-	$res = $sql->query ($request);
-	if ( $sql->num_rows($res) ) {
+	$res = $db->query ($request);
+	if ( $db->num_rows($res) ) {
 
 		$ret=array(); $i=0;
-		while ( $tab = $sql->fetch_array($res) )
+		while ( $tab = $db->fetch_array($res) )
 		{
 			foreach ( $tab as $cle => $valeur )
 			{
diff --git a/htdocs/cashdesk/templates/ticket.tpl.php b/htdocs/cashdesk/templates/ticket.tpl.php
index 647e75d0e34..5c9c0741282 100644
--- a/htdocs/cashdesk/templates/ticket.tpl.php
+++ b/htdocs/cashdesk/templates/ticket.tpl.php
@@ -113,15 +113,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 	<?php
 
 		// Variables
-		$res = $sql->query (
+		$res = $db->query (
 		'SELECT id, ref, label, qte, price, remise_percent, remise, total_ht, total_ttc, tva_tx FROM '.MAIN_DB_PREFIX.'tmp_caisse as c
 			LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON c.fk_article = p.rowid
 			ORDER BY id');
 
-		if ( $sql->num_rows($res) ) {
+		if ( $db->num_rows($res) ) {
 
 			$ret=array(); $i=0;
-			while ( $tab = $sql->fetch_array($res) )
+			while ( $tab = $db->fetch_array($res) )
 			{
 				foreach ( $tab as $cle => $valeur )
 				{
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 9759f1fd408..1e0d5fac9a5 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -128,7 +128,7 @@ switch ( $_GET['action'] )
 		$now=dol_now('tzserver');
 
 
-		$sql->begin();
+		$db->begin();
 
 		$user->id=$_SESSION['uid'];
 		$user->fetch();
@@ -138,12 +138,12 @@ switch ( $_GET['action'] )
 
 
 		// Recuperation de la liste des articles du panier
-		$res=$sql->query ('
+		$res=$db->query ('
 				SELECT fk_article, qte, fk_tva, remise_percent, remise, total_ht, total_ttc
 				FROM '.MAIN_DB_PREFIX.'tmp_caisse
 				WHERE 1');
 		$ret=array(); $i=0;
-		while ( $tab = $sql->fetch_array($res) )
+		while ( $tab = $db->fetch_array($res) )
 		{
 			foreach ( $tab as $cle => $valeur )
 			{
@@ -156,24 +156,24 @@ switch ( $_GET['action'] )
 		for ($i = 0; $i < count ($tab_liste); $i++)
 		{
 			// Recuperation de l'article
-			$res = $sql->query (
+			$res = $db->query (
 			'SELECT label, tva_tx, price
 					FROM '.MAIN_DB_PREFIX.'product
 					WHERE rowid = '.$tab_liste[$i]['fk_article']);
 			$ret=array();
-			$tab = $sql->fetch_array($res);
+			$tab = $db->fetch_array($res);
 			foreach ( $tab as $cle => $valeur )
 			{
 				$ret[$cle] = $valeur;
 			}
 			$tab_article = $ret;
 
-			$res = $sql->query (
+			$res = $db->query (
 			'SELECT taux
 					FROM '.MAIN_DB_PREFIX.'c_tva
 					WHERE rowid = '.$tab_liste[$i]['fk_tva']);
 			$ret=array();
-			$tab = $sql->fetch_array($res);
+			$tab = $db->fetch_array($res);
 			foreach ( $tab as $cle => $valeur )
 			{
 				$ret[$cle] = $valeur;
@@ -305,12 +305,12 @@ switch ( $_GET['action'] )
 
 		if (! $error)
 		{
-			$sql->commit();
+			$db->commit();
 			$redirection = 'affIndex.php?menu=validation_ok&facid='.$id;	// Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
 		else
 		{
-			$sql->rollback();
+			$db->rollback();
 			$redirection = 'affIndex.php?facid='.$id;	// Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
 		break;