lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2009-11-11 16:35:58 +00:00
parent a77e9f5c38
commit 266e1de98c
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/cashdesk/facturation.php
View File

@ -53,7 +53,8 @@ if ( $_GET['filtre'] ) {
} else { } else {
// Sans filtre // Sans filtre
$ret=array(); $i=0; $ret=array();
$i=0;
$sql = "SELECT p.rowid, ref, label, tva_tx"; $sql = "SELECT p.rowid, ref, label, tva_tx";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
@ -65,13 +66,20 @@ if ( $_GET['filtre'] ) {
dol_syslog($sql); dol_syslog($sql);
$resql=$db->query ($sql); $resql=$db->query ($sql);
while ( $tab = $db->fetch_array($resql) ) if ($resql)
{ {
foreach ( $tab as $cle => $valeur ) while ( $tab = $db->fetch_array($resql) )
{ {
$ret[$i][$cle] = $valeur; foreach ( $tab as $cle => $valeur )
{
$ret[$i][$cle] = $valeur;
}
$i++;
} }
$i++; }
else
{
dol_print_error($db);
} }
$tab_designations=$ret; $tab_designations=$ret;
} }
@ -104,6 +112,9 @@ if ( $nbr_enreg > 1 ) {
// Recuperation des taux de tva // Recuperation des taux de tva
global $mysoc; global $mysoc;
$ret=array();
$i=0;
$sql = "SELECT t.rowid, t.taux"; $sql = "SELECT t.rowid, t.taux";
$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p"; $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p";
$sql.= " WHERE t.fk_pays = p.rowid"; $sql.= " WHERE t.fk_pays = p.rowid";
@ -111,15 +122,21 @@ $sql.= " AND t.active = 1";
$sql.= " AND p.code = '".$mysoc->pays_code."'"; $sql.= " AND p.code = '".$mysoc->pays_code."'";
//print $request; //print $request;
$ret=array(); $i=0;
$res=$db->query ($sql); $res=$db->query ($sql);
while ( $tab = $db->fetch_array($res) ) if ($res)
{ {
foreach ( $tab as $cle => $valeur ) while ( $tab = $db->fetch_array($res) )
{ {
$ret[$i][$cle] = $valeur; foreach ( $tab as $cle => $valeur )
{
$ret[$i][$cle] = $valeur;
}
$i++;
} }
$i++; }
else
{
dol_print_error($db);
} }
$tab_tva = $ret; $tab_tva = $ret;