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

Tooltip

Browse Source
This commit is contained in:
frederic34 2015-02-02 21:09:30 +01:00
parent 482eec1cce
commit f69e58cccb
7 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/core/boxes/box_actions.php
View File

@ -90,8 +90,8 @@ class box_actions extends ModeleBoxes
$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60; $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $line = 0;
while ($i < $num) { while ($line < $num) {
$late = ''; $late = '';
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$datelimite = $db->jdate($objp->dp); $datelimite = $db->jdate($objp->dp);
@ -109,39 +109,39 @@ class box_actions extends ModeleBoxes
$label = empty($objp->label)?$objp->type_label:$objp->label; $label = empty($objp->label)?$objp->type_label:$objp->label;
$tooltip = $langs->trans('Action'.$objp->code).': '.$label; $tooltip = $langs->trans('Action'.$objp->code).': '.$label;
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $actionstatic->getNomUrl(1), 'text' => $actionstatic->getNomUrl(1),
'text2'=> $late, 'text2'=> $late,
'asis' => 1, 'asis' => 1,
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $societestatic->getNomUrl(1), 'text' => $societestatic->getNomUrl(1),
'asis' => 1, 'asis' => 1,
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left" class="nowrap"', 'td' => 'align="left" class="nowrap"',
'text' => dol_print_date($datelimite, "dayhour"), 'text' => dol_print_date($datelimite, "dayhour"),
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => ($objp->percentage>= 0?$objp->percentage.'%':''), 'text' => ($objp->percentage>= 0?$objp->percentage.'%':''),
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"', 'td' => 'align="right" width="18"',
'text' => $actionstatic->LibStatut($objp->percentage,3), 'text' => $actionstatic->LibStatut($objp->percentage,3),
); );
$i++; $line++;
} }
if ($num==0) if ($num==0)
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="center"', 'td' => 'align="center"',
'text'=>$langs->trans("NoActionsToDo"), 'text'=>$langs->trans("NoActionsToDo"),
); );
@ -184,23 +184,23 @@ class box_actions extends ModeleBoxes
{ {
print '<div id="dialog" title="'.$nblines." ".$langs->trans("ActionsToDo").'">'; print '<div id="dialog" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
print '<table width=100%>'; print '<table width=100%>';
for ($i=0, $n=$nblines; $i < $n; $i++) for ($line=0, $n=$nblines; $line < $n; $line++)
{ {
if (isset($contents[$i])) if (isset($contents[$line]))
{ {
// on affiche que les évènement du jours ou passé // on affiche que les évènement du jours ou passé
// qui ne sont pas à 100% // qui ne sont pas à 100%
$actioncejour=true; $actioncejour=true;
$var=!$var; $var=!$var;
// TR // TR
$logo=$contents[$i][0]['logo']; $logo=$contents[$line][0]['logo'];
$label=$contents[$i][1]['text']; $label=$contents[$line][1]['text'];
$urlevent=$contents[$i][1]['url']; $urlevent=$contents[$line][1]['url'];
$logosoc=$contents[$i][2]['logo']; $logosoc=$contents[$line][2]['logo'];
$nomsoc=$contents[$i][3]['text']; $nomsoc=$contents[$line][3]['text'];
$urlsoc=$contents[$i][3]['url']; $urlsoc=$contents[$line][3]['url'];
$dateligne=$contents[$i][4]['text']; $dateligne=$contents[$line][4]['text'];
$percentage=$contents[$i][5]['text']; $percentage=$contents[$line][5]['text'];
print '<tr '.$bcx[$var].'>'; print '<tr '.$bcx[$var].'>';
print '<td align=center>'; print '<td align=center>';
print img_object("",$logo); print img_object("",$logo);

78
htdocs/core/boxes/box_activity.php
View File

@ -73,7 +73,7 @@ class box_activity extends ModeleBoxes
$totalMnt = 0; $totalMnt = 0;
$totalnb = 0; $totalnb = 0;
$i = 0; $line = 0;
$cachetime = 3600; $cachetime = 3600;
$fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->societe_id.'-r'.($user->rights->societe->client->voir?'1':'0').'.cache'; $fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->societe_id.'-r'.($user->rights->societe->client->voir?'1':'0').'.cache';
$now = dol_now(); $now = dol_now();
@ -132,28 +132,28 @@ class box_activity extends ModeleBoxes
} }
if (! empty($data)) { if (! empty($data)) {
$j=0; $j=0;
while ($i < count($data)) { while ($line < count($data)) {
$billurl="viewstatut=2&amp;paye=1&amp;year=".$data[$j]->annee; $billurl="viewstatut=2&amp;paye=1&amp;year=".$data[$j]->annee;
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"', 'td' => 'align="left" width="16"',
'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0), 'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills", 'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
'logo' => 'bill', 'logo' => 'bill',
); );
$this->info_box_contents[$i][1] = array( $this->info_box_contents[$line][1] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee, 'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
); );
$this->info_box_contents[$i][2] = array( $this->info_box_contents[$line][2] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0), 'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
'text' => $data[$j]->nb, 'text' => $data[$j]->nb,
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills", 'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
); );
$this->info_box_contents[$i][3] = array( $this->info_box_contents[$line][3] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency) 'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
); );
@ -163,15 +163,15 @@ class box_activity extends ModeleBoxes
$totalnb += $data[$j]->nb; $totalnb += $data[$j]->nb;
$totalMnt += $data[$j]->Mnttot; $totalMnt += $data[$j]->Mnttot;
} }
$this->info_box_contents[$i][4] = array( $this->info_box_contents[$line][4] = array(
'td' => 'align="right" width="18"', 'td' => 'align="right" width="18"',
'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3), 'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3),
); );
$i++; $line++;
$j++; $j++;
} }
if (count($data)==0) if (count($data)==0)
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="center"', 'td' => 'align="center"',
'text'=>$langs->trans("NoRecordedInvoices"), 'text'=>$langs->trans("NoRecordedInvoices"),
); );
@ -193,7 +193,7 @@ class box_activity extends ModeleBoxes
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows($result) + $i; $num = $db->num_rows($result) + $line;
$j=0; $j=0;
while ($j < $num) { while ($j < $num) {
$data[$j]=$db->fetch_object($result); $data[$j]=$db->fetch_object($result);
@ -212,41 +212,41 @@ class box_activity extends ModeleBoxes
if (! empty($data)) { if (! empty($data)) {
$j=0; $j=0;
while ($i < count($data)) { while ($line < count($data)) {
$billurl="viewstatut=".$data[$j]->fk_statut."&amp;paye=0"; $billurl="viewstatut=".$data[$j]->fk_statut."&amp;paye=0";
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"', 'td' => 'align="left" width="16"',
'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0), 'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills", 'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
'logo' => 'bill', 'logo' => 'bill',
); );
$this->info_box_contents[$i][1] = array( $this->info_box_contents[$line][1] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0), 'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
); );
$this->info_box_contents[$i][2] = array( $this->info_box_contents[$line][2] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => $data[$j]->nb, 'text' => $data[$j]->nb,
'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0), 'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills", 'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
); );
$totalnb += $data[$j]->nb; $totalnb += $data[$j]->nb;
$this->info_box_contents[$i][3] = array( $this->info_box_contents[$line][3] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency), 'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
); );
$totalMnt += $objp->Mnttot; $totalMnt += $objp->Mnttot;
$this->info_box_contents[$i][4] = array( $this->info_box_contents[$line][4] = array(
'td' => 'align="right" width="18"', 'td' => 'align="right" width="18"',
'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3), 'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3),
); );
$i++; $line++;
$j++; $j++;
} }
if ($num==0) if ($num==0)
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="center"', 'td' => 'align="center"',
'text'=>$langs->trans("NoRecordedInvoices"), 'text'=>$langs->trans("NoRecordedInvoices"),
); );
@ -286,7 +286,7 @@ class box_activity extends ModeleBoxes
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows($result) + $i; $num = $db->num_rows($result) + $line;
$j=0; $j=0;
while ($j < $num) { while ($j < $num) {
$data[$j]=$db->fetch_object($result); $data[$j]=$db->fetch_object($result);
@ -304,20 +304,20 @@ class box_activity extends ModeleBoxes
} }
if (! empty($data)) { if (! empty($data)) {
$j=0; $j=0;
while ($i < count($data)) { while ($line < count($data)) {
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"', 'td' => 'align="left" width="16"',
'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=".$data[$j]->fk_statut, 'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=".$data[$j]->fk_statut,
'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0), 'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
'logo' => 'object_order', 'logo' => 'object_order',
); );
$this->info_box_contents[$i][1] = array( $this->info_box_contents[$line][1] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0), 'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
); );
$this->info_box_contents[$i][2] = array( $this->info_box_contents[$line][2] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => $data[$j]->nb, 'text' => $data[$j]->nb,
'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0), 'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
@ -325,17 +325,17 @@ class box_activity extends ModeleBoxes
); );
$totalnb += $data[$j]->nb; $totalnb += $data[$j]->nb;
$this->info_box_contents[$i][3] = array( $this->info_box_contents[$line][3] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency), 'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
); );
$totalMnt += $data[$j]->Mnttot; $totalMnt += $data[$j]->Mnttot;
$this->info_box_contents[$i][4] = array( $this->info_box_contents[$line][4] = array(
'td' => 'align="right" width="18"', 'td' => 'align="right" width="18"',
'text' => $commandestatic->LibStatut($data[$j]->fk_statut,0,3), 'text' => $commandestatic->LibStatut($data[$j]->fk_statut,0,3),
); );
$i++; $line++;
$j++; $j++;
} }
} }
@ -367,7 +367,7 @@ class box_activity extends ModeleBoxes
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows($result) + $i; $num = $db->num_rows($result) + $line;
$j=0; $j=0;
while ($j < $num) { while ($j < $num) {
$data[$j]=$db->fetch_object($result); $data[$j]=$db->fetch_object($result);
@ -385,8 +385,8 @@ class box_activity extends ModeleBoxes
} }
if (! empty($data)) { if (! empty($data)) {
$j=0; $j=0;
while ($i < count($data)) { while ($line < count($data)) {
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left" width="16"', 'td' => 'align="left" width="16"',
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut, 'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0), 'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
@ -394,12 +394,12 @@ class box_activity extends ModeleBoxes
); );
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0), 'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => $data[$j]->nb, 'text' => $data[$j]->nb,
'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0), 'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
@ -407,40 +407,40 @@ class box_activity extends ModeleBoxes
); );
$totalnb += $data[$j]->nb; $totalnb += $data[$j]->nb;
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency), 'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
); );
$totalMnt += $data[$j]->Mnttot; $totalMnt += $data[$j]->Mnttot;
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"', 'td' => 'align="right" width="18"',
'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3), 'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3),
); );
$i++; $line++;
$j++; $j++;
} }
} }
} }
// Add the sum in the bottom of the boxes // Add the sum in the bottom of the boxes
$this->info_box_contents[$i][1] = array( $this->info_box_contents[$line][1] = array(
'td' => 'align="left" ', 'td' => 'align="left" ',
'text' => $langs->trans("Total")."&nbsp;".$textHead, 'text' => $langs->trans("Total")."&nbsp;".$textHead,
); );
$this->info_box_contents[$i][2] = array( $this->info_box_contents[$line][2] = array(
'td' => 'align="right" ', 'td' => 'align="right" ',
'text' => $totalnb, 'text' => $totalnb,
); );
$this->info_box_contents[$i][3] = array( $this->info_box_contents[$line][3] = array(
'td' => 'align="right" ', 'td' => 'align="right" ',
'text' => price($totalMnt,1,$langs,0,0,-1,$conf->currency) 'text' => price($totalMnt,1,$langs,0,0,-1,$conf->currency)
); );
$this->info_box_contents[$i][4] = array( $this->info_box_contents[$line][4] = array(
'td' => 'align="right" ', 'td' => 'align="right" ',
'text' => "", 'text' => "",
); );
$this->info_box_contents[$i][5] = array( $this->info_box_contents[$line][5] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => "", 'text' => "",
); );

12
htdocs/core/boxes/box_bookmarks.php
View File

@ -81,19 +81,19 @@ class box_bookmarks extends ModeleBoxes
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $line = 0;
while ($i < $num) { while ($line < $num) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"', 'td' => 'align="left" width="16"',
'logo' => $this->boximg, 'logo' => $this->boximg,
'url' => $objp->url, 'url' => $objp->url,
'tooltip' => $objp->title, 'tooltip' => $objp->title,
'target' => $objp->target?'newtab':'', 'target' => $objp->target?'newtab':'',
); );
$this->info_box_contents[$i][1] = array( $this->info_box_contents[$line][1] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $objp->title, 'text' => $objp->title,
'url' => $objp->url, 'url' => $objp->url,
@ -101,13 +101,13 @@ class box_bookmarks extends ModeleBoxes
'target' => $objp->target?'newtab':'', 'target' => $objp->target?'newtab':'',
); );
$i++; $line++;
} }
if ($num==0) { if ($num==0) {
$mytxt=$langs->trans("NoRecordedBookmarks"); $mytxt=$langs->trans("NoRecordedBookmarks");
if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd"); if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="center" colspan="2"', 'td' => 'align="center" colspan="2"',
'tooltip' => $mytxt, 'tooltip' => $mytxt,
'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt, 'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,

14
htdocs/core/boxes/box_clients.php
View File

@ -104,8 +104,8 @@ class box_clients extends ModeleBoxes
if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url= DOL_URL_ROOT."/comm/card.php?socid="; if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url= DOL_URL_ROOT."/comm/card.php?socid=";
else $url= DOL_URL_ROOT."/societe/soc.php?socid="; else $url= DOL_URL_ROOT."/societe/soc.php?socid=";
$i = 0; $line = 0;
while ($i < $num) while ($line < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$datec=$db->jdate($objp->datec); $datec=$db->jdate($objp->datec);
@ -118,26 +118,26 @@ class box_clients extends ModeleBoxes
$thirdpartystatic->fournisseur = $objp->fournisseur; $thirdpartystatic->fournisseur = $objp->fournisseur;
$thirdpartystatic->logo = $objp->logo; $thirdpartystatic->logo = $objp->logo;
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $thirdpartystatic->getNomUrl(1), 'text' => $thirdpartystatic->getNomUrl(1),
'asis' => 1, 'asis' => 1,
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => dol_print_date($datem, "day") 'text' => dol_print_date($datem, "day")
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"', 'td' => 'align="right" width="18"',
'text' => $thirdpartystatic->LibStatut($objp->status,3) 'text' => $thirdpartystatic->LibStatut($objp->status,3)
); );
$i++; $line++;
} }
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers")); if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
$db->free($result); $db->free($result);
} }

20
htdocs/core/boxes/box_commandes.php
View File

@ -97,9 +97,9 @@ class box_commandes extends ModeleBoxes
if ($result) { if ($result) {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $line = 0;
while ($i < $num) { while ($line < $num) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$date=$db->jdate($objp->date_commande); $date=$db->jdate($objp->date_commande);
$datem=$db->jdate($objp->tms); $datem=$db->jdate($objp->tms);
@ -114,46 +114,46 @@ class box_commandes extends ModeleBoxes
$societestatic->code_client = $objp->code_client; $societestatic->code_client = $objp->code_client;
$societestatic->logo = $objp->logo; $societestatic->logo = $objp->logo;
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $commandestatic->getNomUrl(1), 'text' => $commandestatic->getNomUrl(1),
'asis' => 1, 'asis' => 1,
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $societestatic->getNomUrl(1), 'text' => $societestatic->getNomUrl(1),
'asis' => 1, 'asis' => 1,
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => price($objp->total_ht), 'text' => price($objp->total_ht),
); );
if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) { if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid); if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''), 'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
'asis' => 1, 'asis' => 1,
); );
} }
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => dol_print_date($date,'day'), 'text' => dol_print_date($date,'day'),
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"', 'td' => 'align="right" width="18"',
'text' => $commandestatic->LibStatut($objp->fk_statut,$objp->facture,3), 'text' => $commandestatic->LibStatut($objp->fk_statut,$objp->facture,3),
); );
$i++; $line++;
} }
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders")); if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
$db->free($result); $db->free($result);
} else { } else {

20
htdocs/core/boxes/box_comptes.php
View File

@ -95,11 +95,11 @@ class box_comptes extends ModeleBoxes
if ($result) { if ($result) {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $line = 0;
$solde_total = array(); $solde_total = array();
$account_static = new Account($db); $account_static = new Account($db);
while ($i < $num) { while ($line < $num) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$account_static->id = $objp->rowid; $account_static->id = $objp->rowid;
@ -109,42 +109,42 @@ class box_comptes extends ModeleBoxes
$solde_total[$objp->currency_code] += $solde; $solde_total[$objp->currency_code] += $solde;
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $account_static->getNomUrl(1), 'text' => $account_static->getNomUrl(1),
'asis' => 1, 'asis' => 1,
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $objp->number, 'text' => $objp->number,
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code) 'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
); );
$i++; $line++;
} }
// Total // Total
foreach ($solde_total as $key=>$solde) { foreach ($solde_total as $key=>$solde) {
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'tr' => 'class="liste_total"', 'tr' => 'class="liste_total"',
'td' => 'align="left" class="liste_total"', 'td' => 'align="left" class="liste_total"',
'text' => $langs->trans('Total').' '.$key, 'text' => $langs->trans('Total').' '.$key,
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right" class="liste_total"', 'td' => 'align="right" class="liste_total"',
'text' => '&nbsp;' 'text' => '&nbsp;'
); );
$this->info_box_contents[$i][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right" class="liste_total"', 'td' => 'align="right" class="liste_total"',
'text' => price($solde, 0, $langs, 0, -1, -1, $key) 'text' => price($solde, 0, $langs, 0, -1, -1, $key)
); );
$i++; $line++;
} }
$db->free($result); $db->free($result);

20
htdocs/core/boxes/box_contracts.php
View File

@ -78,9 +78,9 @@ class box_contracts extends ModeleBoxes
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$now=dol_now(); $now=dol_now();
$i = 0; $line = 0;
while ($i < $num) { while ($line < $num) {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$datec=$db->jdate($objp->datec); $datec=$db->jdate($objp->datec);
$dateterm=$db->jdate($objp->fin_validite); $dateterm=$db->jdate($objp->fin_validite);
@ -94,14 +94,14 @@ class box_contracts extends ModeleBoxes
// fin_validite is no more on contract but on services // fin_validite is no more on contract but on services
// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); } // if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left" width="16"', 'td' => 'align="left" width="16"',
'logo' => $this->boximg, 'logo' => $this->boximg,
'tooltip' => $langs->trans('Contract').': '.($objp->ref?$objp->ref:$objp->rowid), 'tooltip' => $langs->trans('Contract').': '.($objp->ref?$objp->ref:$objp->rowid),
'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid, 'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid,
); );
$this->info_box_contents[$i][1] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref
'tooltip' => $langs->trans('Contract').': '.($objp->ref?$objp->ref:$objp->rowid), 'tooltip' => $langs->trans('Contract').': '.($objp->ref?$objp->ref:$objp->rowid),
@ -109,36 +109,36 @@ class box_contracts extends ModeleBoxes
'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid, 'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid,
); );
$this->info_box_contents[$i][2] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left" width="16"', 'td' => 'align="left" width="16"',
'logo' => 'company', 'logo' => 'company',
'tooltip' => $langs->trans('Customer').': '.$objp->name, 'tooltip' => $langs->trans('Customer').': '.$objp->name,
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid,
); );
$this->info_box_contents[$i][3] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => dol_trunc($objp->name,40), 'text' => dol_trunc($objp->name,40),
'tooltip' => $langs->trans('Customer').': '.$objp->name, 'tooltip' => $langs->trans('Customer').': '.$objp->name,
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid,
); );
$this->info_box_contents[$i][4] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right"', 'td' => 'align="right"',
'text' => dol_print_date($datec,'day'), 'text' => dol_print_date($datec,'day'),
); );
$this->info_box_contents[$i][5] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="right" class="nowrap"', 'td' => 'align="right" class="nowrap"',
'text' => $contractstatic->getLibStatut(6), 'text' => $contractstatic->getLibStatut(6),
'asis'=>1, 'asis'=>1,
); );
$i++; $line++;
} }
if ($num==0) if ($num==0)
$this->info_box_contents[$i][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'align="center"', 'td' => 'align="center"',
'text'=>$langs->trans("NoRecordedContracts"), 'text'=>$langs->trans("NoRecordedContracts"),
); );