';
- print ''.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllBills").' '.$num.' '.dol_print_date($db->jdate($objp->df),'day').' ';
+ print ''.dol_print_date($db->jdate($objp->df),'day').' ';
}
else
{
print '!!! '.price($objp->total_ht).' ';
+ print '';
+ print price($objp->total_ht);
+ print ' ';
- print ''.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).' ';
+ if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
+ {
+ print '';
+ print price($objp->total_ttc);
+ print ' ';
+ }
+
+ print ''.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).' ';
print "\n";
$i++;
}
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 38f83c5ac54..2043516564c 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1260,26 +1260,24 @@ class BonPrelevement extends CommonObject
$fileDebiteurSection = '';
$fileEmetteurSection = '';
$i = 0;
- $j = 0;
$this->total = 0;
/*
* section Debiteur (sepa Debiteurs bloc lines)
*/
+ $tmp_invoices = array();
+
$sql = "SELECT f.facnumber as fac FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."prelevement_facture as pf, ".MAIN_DB_PREFIX."societe as soc, ".MAIN_DB_PREFIX."c_country as p, ".MAIN_DB_PREFIX."societe_rib as rib WHERE pl.fk_prelevement_bons = ".$this->id." AND pl.rowid = pf.fk_prelevement_lignes AND pf.fk_facture = f.rowid AND soc.fk_pays = p.rowid AND soc.rowid = f.fk_soc AND rib.fk_soc = f.fk_soc AND rib.default_rib = 1";
$resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- while ($j < $num)
- {
- $objfac = $this->db->fetch_object($resql);
- $ListOfFactures = $ListOfFactures . $objfac->fac . ",";
- $j++;
+ if ($resql) {
+ while ($objfac = $this->db->fetch_object($resql)) {
+ $tmp_invoices[] = $objfac->fac;
}
}
+ $ListOfFactures = implode($tmp_invoices);
+
$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 7823b3534ad..2661919722d 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -593,7 +593,7 @@ function listOfSessions()
//$sessValues = 'newtoken|s:32:"1239f7a0c4b899200fe9ca5ea394f307";dol_loginmesg|s:0:"";newtoken|s:32:"1236457104f7ae0f328c2928973f3cb5";dol_loginmesg|s:0:"";token|s:32:"123615ad8d650c5cc4199b9a1a76783f";dol_login|s:5:"admin";dol_authmode|s:8:"dolibarr";dol_tz|s:1:"1";dol_tz_string|s:13:"Europe/Berlin";dol_dst|i:0;dol_dst_observed|s:1:"1";dol_dst_first|s:0:"";dol_dst_second|s:0:"";dol_screenwidth|s:4:"1920";dol_screenheight|s:3:"971";dol_company|s:12:"MyBigCompany";dol_entity|i:1;mainmenu|s:4:"home";leftmenuopened|s:10:"admintools";idmenu|s:0:"";leftmenu|s:10:"admintools";';
if (preg_match('/dol_login/i',$sessValues) && // limit to dolibarr session
- (preg_match('/dol_entity\|i:'.$conf->entity.';/i',$sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i',$sessValues)) && // limit to current entity
+ (preg_match('/dol_entity\|i:'.$conf->entity.';/i',$sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i',$sessValues)) && // limit to current entity
preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i',$sessValues)) // limit to company name
{
$tmp=explode('_', $file);
@@ -909,27 +909,24 @@ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql
if (! empty($objMod->dictionaries))
{
//var_dump($objMod->dictionaries['tabname']);
- $taborder[] = 0;
- $tabfieldcheck[] = array(); $tabhelp[] = array();
- foreach($objMod->dictionaries['tabname'] as $val)
+ $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp=0;
+ foreach($objMod->dictionaries['tabname'] as $val) { $nbtabname++; $taborder[] = count($tabname)+1; $tabname[] = $val; }
+ foreach($objMod->dictionaries['tablib'] as $val) { $nbtablib++; $tablib[] = $val; }
+ foreach($objMod->dictionaries['tabsql'] as $val) { $nbtabsql++; $tabsql[] = $val; }
+ foreach($objMod->dictionaries['tabsqlsort'] as $val) { $nbtabsqlsort++; $tabsqlsort[] = $val; }
+ foreach($objMod->dictionaries['tabfield'] as $val) { $nbtabfield++; $tabfield[] = $val; }
+ foreach($objMod->dictionaries['tabfieldvalue'] as $val) { $nbtabfieldvalue++; $tabfieldvalue[] = $val; }
+ foreach($objMod->dictionaries['tabfieldinsert'] as $val) { $nbtabfieldinsert++; $tabfieldinsert[] = $val; }
+ foreach($objMod->dictionaries['tabrowid'] as $val) { $nbtabrowid++; $tabrowid[] = $val; }
+ foreach($objMod->dictionaries['tabcond'] as $val) { $nbtabcond++; $tabcond[] = $val; }
+ if (! empty($objMod->dictionaries['tabhelp'])) foreach($objMod->dictionaries['tabhelp'] as $val) { $nbtabhelp++; $tabhelp[] = $val; }
+ if (! empty($objMod->dictionaries['tabfieldcheck'])) foreach($objMod->dictionaries['tabfieldcheck'] as $val) { $nbtabfieldcheck++; $tabfieldcheck[] = $val; }
+
+ if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort)
{
- $taborder[] = count($tabname)+1;
- $tabname[] = $val;
+ print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
+ //print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
}
- foreach($objMod->dictionaries['tablib'] as $val) $tablib[] = $val;
- foreach($objMod->dictionaries['tabsql'] as $val) $tabsql[] = $val;
- foreach($objMod->dictionaries['tabsqlsort'] as $val) $tabsqlsort[] = $val;
- foreach($objMod->dictionaries['tabfield'] as $val) $tabfield[] = $val;
- foreach($objMod->dictionaries['tabfieldvalue'] as $val) $tabfieldvalue[] = $val;
- foreach($objMod->dictionaries['tabfieldinsert'] as $val) $tabfieldinsert[] = $val;
- foreach($objMod->dictionaries['tabrowid'] as $val) $tabrowid[] = $val;
- foreach($objMod->dictionaries['tabcond'] as $val) $tabcond[] = $val;
- if (! empty($objMod->dictionaries['tabfieldcheck'])) foreach($objMod->dictionaries['tabfieldcheck'] as $val) $tabfieldcheck[] = $val;
- if (! empty($objMod->dictionaries['tabhelp'])) foreach($objMod->dictionaries['tabhelp'] as $val) $tabhelp[] = $val;
- //foreach($objMod->dictionaries['tabsqlsort'] as $val) $tablib[] = $val;
- //$tabname = array_merge ($tabname, $objMod->dictionaries['tabname']);
- //var_dump($tabcond);
- //exit;
}
$j++;
@@ -1031,7 +1028,6 @@ function complete_elementList_with_modules(&$elementList)
if (! empty($objMod->module_parts['contactelement']))
{
$elementList[$objMod->name] = $langs->trans($objMod->name);
- //exit;
}
$j++;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index f5ac8c9e74f..aba66991eec 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -339,7 +339,7 @@ if ($resql)
print '';
$liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
- print $form->selectarray('filtre', $liststatus, $search_status, 1);
+ print $form->selectarray('search_status', $liststatus, $search_status, 1);
print ' ';
print '