diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index bf775508338..f5b3083f5e7 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -154,34 +154,36 @@ if ($conf->use_javascript_ajax)
$SommeD=0;
$dataval=array();
$datalabels=array();
+ $i=0;
foreach ($AdherentType as $key => $adhtype)
{
- $datalabels[]=$adhtype->getNomUrl(0,dol_size(16));
- $dataval['draft'][]=isset($MemberToValidate[$key])?$MemberToValidate[$key]:0;
- $dataval['notuptodate'][]=isset($MembersValidated[$key])?$MembersValidated[$key]-$MemberUpToDate[$key]:0;
- $dataval['uptodate'][]=isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0;
- $dataval['resiliated'][]=isset($MembersResiliated[$key])?$MembersResiliated[$key]:0;
+ $datalabels[]=array($i,$adhtype->getNomUrl(0,dol_size(16)));
+ $dataval['draft'][]=array($i,isset($MemberToValidate[$key])?$MemberToValidate[$key]:0);
+ $dataval['notuptodate'][]=array($i,isset($MembersValidated[$key])?$MembersValidated[$key]-$MemberUpToDate[$key]:0);
+ $dataval['uptodate'][]=array($i,isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0);
+ $dataval['resiliated'][]=array($i,isset($MembersResiliated[$key])?$MembersResiliated[$key]:0);
$SommeA+=isset($MemberToValidate[$key])?$MemberToValidate[$key]:0;
$SommeB+=isset($MembersValidated[$key])?$MembersValidated[$key]-$MemberUpToDate[$key]:0;
$SommeC+=isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0;
$SommeD+=isset($MembersResiliated[$key])?$MembersResiliated[$key]:0;
+ $i++;
}
/*
$dataseries=array();
- $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'values'=> $dataval['draft']);
- $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'values'=> $dataval['notuptodate']);
- $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'values'=> $dataval['uptodate']);
- $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'values'=> $dataval['resiliated']);
+ $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'data'=> $dataval['draft']);
+ $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'data'=> $dataval['notuptodate']);
+ $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'data'=> $dataval['uptodate']);
+ $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'data'=> $dataval['resiliated']);
$data=array('series'=>$dataseries,'seriestype'=>array('bar','bar','bar','bar'),'xlabel'=>$datalabels);
dol_print_graph('stats2',300,180,$data,1,'barline');
*/
$dataseries=array();
- $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'values'=>array(round($SommeB)));
- $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'values'=>array(round($SommeC)));
- $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'values'=>array(round($SommeD)));
- $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'values'=>array(round($SommeA)));
+ $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'data'=>round($SommeB));
+ $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'data'=>round($SommeC));
+ $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'data'=>round($SommeD));
+ $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'data'=>round($SommeA));
$data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie',1);
print '';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 0e12ed41b22..a481969c7a4 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -41,7 +41,7 @@ $formfile = new FormFile($db);
llxHeader('','','EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad');
?>
-'."\n";
+ if (count($listofpaths))
+ {
+ foreach($listofpaths as $key => $val)
{
- foreach($listofpaths as $key => $val)
- {
- print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
- print ' ';
- print '';
- print '
';
- }
+ $out.= '
';
+ $out.= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
+ $out.= ' ';
+ $out.= '
';
}
- else
- {
- print $langs->trans("NoAttachedFiles").'
';
- }
- // Add link to add file
- print '';
- print ' ';
- print '';
- //print $mil->$property?'
'.$mil->$property:'';
-
-
- print '';
- //}
+ }
+ else
+ {
+ $out.= $langs->trans("NoAttachedFiles").'
';
+ }
+ // Add link to add file
+ $out.= '';
+ $out.= ' ';
+ $out.= '';
+ print $out;
+ print '';
// Background color
print '| '.$langs->trans("BackgroundColorByDefault").' | ';
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index ae58515b3a4..6e5c667466c 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -121,7 +121,7 @@ if ($resql)
$listofstatus=array(0,1,2,3,4);
foreach ($listofstatus as $status)
{
- $dataseries[]=array('label'=>$propalstatic->LibStatut($status,1),'values'=>array(0=>(isset($vals[$status])?$vals[$status]:0)));
+ $dataseries[]=array('label'=>$propalstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?$vals[$status]:0));
if (! $conf->use_javascript_ajax)
{
$var=!$var;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index c83edcea45e..1c8214cd583 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3090,7 +3090,6 @@ class OrderLine
$sql.= " , remise_percent=".price2num($this->remise_percent)."";
$sql.= " , price=".price2num($this->price).""; // TODO A virer
$sql.= " , remise=".price2num($this->remise).""; // TODO A virer
- $sql.= " , info_bits='".$this->info_bits."'";
if (empty($this->skip_update_total))
{
$sql.= " , total_ht=".price2num($this->total_ht)."";
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 2a3c6d91175..ee8c7db198b 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -121,7 +121,7 @@ if ($resql)
$bool=false;
foreach ($listofstatus as $status)
{
- $dataseries[]=array('label'=>$commandestatic->LibStatut($status,$bool,1),'values'=>array(0=>(isset($vals[$status.$bool])?$vals[$status.$bool]:0)));
+ $dataseries[]=array('label'=>$commandestatic->LibStatut($status,$bool,1),'data'=>(isset($vals[$status.$bool])?$vals[$status.$bool]:0));
if ($status==3 && $bool==false) $bool=true;
else $bool=false;
}
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index abd0e3d226e..2cb32b122e1 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -105,7 +105,7 @@ print " |
\n";
$listoftype=$tripandexpense_static->listOfTypes();
foreach ($listoftype as $code => $label)
{
- $dataseries[]=array('label'=>$label,'values'=>array(0=>(isset($nb[$code])?$nb[$code]:0)));
+ $dataseries[]=array('label'=>$label,'data'=>(isset($nb[$code])?$nb[$code]:0));
}
if ($conf->use_javascript_ajax)
diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php
index 9f9dab362e1..b849975e147 100644
--- a/htdocs/compta/dons/index.php
+++ b/htdocs/compta/dons/index.php
@@ -87,7 +87,7 @@ print "\n";
$listofstatus=array(0,1,-1,2);
foreach ($listofstatus as $status)
{
- $dataseries[]=array('label'=>$donstatic->LibStatut($status,1),'values'=>array(0=>(isset($nb[$status])?$nb[$status]:0)));
+ $dataseries[]=array('label'=>$donstatic->LibStatut($status,1),'data'=>(isset($nb[$status])?$nb[$status]:0));
}
if ($conf->use_javascript_ajax)
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index e5b8043ec6d..9b4b206bd55 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -894,6 +894,12 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact
{
$result=0;
+ if ($_POST['np_price'] < 0 && $_POST["qty"] < 0)
+ {
+ $langs->load("errors");
+ $mesg=''.$langs->trans("ErrorBothFieldCantBeNegative",$langs->transnoentitiesnoconv("UnitPriceHT"),$langs->transnoentitiesnoconv("Qty")).'
';
+ $result = -1 ;
+ }
if (empty($_POST['idprod']) && $_POST["type"] < 0)
{
$mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
';
@@ -3052,20 +3058,21 @@ else
$facturestatic=new Facture($db);
- $sql = 'SELECT ';
+ if (! $sall) $sql = 'SELECT';
+ else $sql = 'SELECT DISTINCT';
$sql.= ' f.rowid as facid, f.facnumber, f.type, f.increment, f.total, f.total_ttc,';
$sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
$sql.= ' f.paye as paye, f.fk_statut,';
$sql.= ' s.nom, s.rowid as socid';
- if (! $sall) $sql.= ' ,SUM(pf.amount) as am'; // To be able to sort on status
+ if (! $sall) $sql.= ', SUM(pf.amount) as am'; // To be able to sort on status
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
- if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ', '.MAIN_DB_PREFIX.'facture as f';
- if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as fd ON fd.fk_facture = f.rowid';
if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
+ else $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as fd ON fd.fk_facture = f.rowid';
$sql.= ' WHERE f.fk_soc = s.rowid';
$sql.= " AND f.entity = ".$conf->entity;
- if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ 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;
if ($userid)
{
@@ -3112,10 +3119,6 @@ else
{
$sql.= ' AND f.facnumber LIKE \'%'.$db->escape(trim($search_ref)) . '%\'';
}
- if ($sall)
- {
- $sql.= ' AND (s.nom LIKE \'%'.$db->escape($sall).'%\' OR f.facnumber LIKE \'%'.$db->escape($sall).'%\' OR f.note LIKE \'%'.$db->escape($sall).'%\' OR fd.description LIKE \'%'.$db->escape($sall).'%\')';
- }
if (! $sall)
{
$sql.= ' GROUP BY f.rowid, f.facnumber, f.type, f.increment, f.total, f.total_ttc,';
@@ -3123,6 +3126,10 @@ else
$sql.= ' f.paye, f.fk_statut,';
$sql.= ' s.nom, s.rowid';
}
+ else
+ {
+ $sql.= ' AND (s.nom LIKE \'%'.$db->escape($sall).'%\' OR f.facnumber LIKE \'%'.$db->escape($sall).'%\' OR f.note LIKE \'%'.$db->escape($sall).'%\' OR fd.description LIKE \'%'.$db->escape($sall).'%\')';
+ }
$sql.= ' ORDER BY ';
$listfield=explode(',',$sortfield);
foreach ($listfield as $key => $value) $sql.= $listfield[$key].' '.$sortorder.',';
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 472c1afcee2..0ae8128b4bf 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -195,10 +195,7 @@ $sql.= " WHERE f.fk_soc = s.rowid";
$sql.= " AND s.entity = ".$conf->entity;
$sql.= " AND f.type IN (0,1) AND f.fk_statut = 1";
$sql.= " AND f.paye = 0";
-if ($option == 'late')
-{
- $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
-}
+if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
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;
if ($_GET["filtre"])
@@ -210,33 +207,13 @@ if ($_GET["filtre"])
$sql .= " AND " . $filt[0] . " = " . $filt[1];
}
}
-
-if ($search_ref)
-{
- $sql .= " AND f.facnumber LIKE '%".$search_ref."%'";
-}
-
-if ($search_societe)
-{
- $sql .= " AND s.nom LIKE '%".$search_societe."%'";
-}
-
-if ($search_montant_ht)
-{
- $sql .= " AND f.total = '".$search_montant_ht."'";
-}
-
-if ($search_montant_ttc)
-{
- $sql .= " AND f.total_ttc = '".$search_montant_ttc."'";
-}
-
-if (dol_strlen($_POST["sf_ref"]) > 0)
-{
- $sql .= " AND f.facnumber LIKE '%".$_POST["sf_ref"] . "%'";
-}
-$sql.= " GROUP BY f.facnumber";
-
+if ($search_ref) $sql .= " AND f.facnumber LIKE '%".$search_ref."%'";
+if ($search_societe) $sql .= " AND s.nom LIKE '%".$search_societe."%'";
+if ($search_montant_ht) $sql .= " AND f.total = '".$search_montant_ht."'";
+if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$search_montant_ttc."'";
+if (dol_strlen($_POST["sf_ref"]) > 0) $sql .= " AND f.facnumber LIKE '%".$_POST["sf_ref"] . "%'";
+$sql.= " GROUP BY f.facnumber,f.increment,f.total,f.total_ttc,f.datef, f.date_lim_reglement,f.paye, f.rowid, f.fk_statut, f.type,s.nom, s.rowid";
+if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " ORDER BY ";
$listfield=explode(',',$sortfield);
foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.",";
@@ -244,11 +221,10 @@ $sql.= " f.facnumber DESC";
//$sql .= $db->plimit($limit+1,$offset);
-$result = $db->query($sql);
-
-if ($result)
+$resql = $db->query($sql);
+if ($resql)
{
- $num = $db->num_rows($result);
+ $num = $db->num_rows($resql);
if ($socid)
{
@@ -332,7 +308,7 @@ if ($result)
while ($i < $num)
{
- $objp = $db->fetch_object($result);
+ $objp = $db->fetch_object($resql);
$var=!$var;
@@ -425,10 +401,11 @@ if ($result)
$formfile->show_documents('unpaid','',$filedir,$urlsource,$genallowed,$delallowed,'',1,0,0,48,1,$param,'',$langs->trans("PDFMerge"));
print '';
- $db->free();
+ $db->free($resql);
}
-
-$db->close();
+else dol_print_error($db,'');
llxFooter();
+
+if (is_object($db)) $db->close();
?>
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 5c3ae69c4a6..31bcbeb9127 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -180,7 +180,7 @@ $var=true;
$listofstatus=array(0,4,4,5); $bool=false;
foreach($listofstatus as $status)
{
- $dataseries[]=array('label'=>$staticcontratligne->LibStatut($status,1,($bool?1:0)),'values'=>array(0=>($nb[$status.$bool]?$nb[$status.$bool]:0)));
+ $dataseries[]=array('label'=>$staticcontratligne->LibStatut($status,1,($bool?1:0)),'data'=>($nb[$status.$bool]?$nb[$status.$bool]:0));
if (! $conf->use_javascript_ajax)
{
$var=!$var;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1ea874b70a9..27289b06b2b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1209,7 +1209,7 @@ class Form
{
$num = $this->db->num_rows($result);
- $outselect.='