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

replace html align by class in boxes

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-02-09 15:24:21 +01:00
parent f333fb3b7d
commit 529354718b
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
35 changed files with 380 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ class box_actions extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -141,7 +141,7 @@ class box_actions extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left" class="nowrap"',
'td' => 'class="nowrap left"',
'text' => dol_print_date($datelimite, "dayhour"),
);
@ -151,7 +151,7 @@ class box_actions extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $actionstatic->LibStatut($objp->percentage, 3),
);
@ -160,7 +160,7 @@ class box_actions extends ModeleBoxes
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoActionsToDo"),
);
@ -174,7 +174,7 @@ class box_actions extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
@ -183,7 +183,7 @@ class box_actions extends ModeleBoxes
/**
* Method to show box
*
* @param array $head Array with properties of box title
* @param array $head Array with properties of box title
* @param array $contents Array with properties of box lines
* @param int $nooutput No print, only return string
* @return string
@ -220,13 +220,13 @@ class box_actions extends ModeleBoxes
$dateligne=$contents[$line][4]['text'];
$percentage=$contents[$line][5]['text'];
$out.= '<tr class="oddeven">';
$out.= '<td align=center>';
$out.= '<td class="center">';
$out.= img_object("", $logo);
$out.= '</td>';
$out.= '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
$out.= '<td align=center><a href="'.$urlsoc.'">'.img_object("", $logosoc)." ".$nomsoc.'</a></td>';
$out.= '<td align=center>'.$dateligne.'</td>';
$out.= '<td align=center>'.$percentage.'</td>';
$out.= '<td class="center"><a href="'.$urlevent.'">'.$label.'</a></td>';
$out.= '<td class="center"><a href="'.$urlsoc.'">'.img_object("", $logosoc)." ".$nomsoc.'</a></td>';
$out.= '<td class="center">'.$dateligne.'</td>';
$out.= '<td class="center">'.$percentage.'</td>';
$out.= '</tr>';
}
}

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

@ -39,7 +39,7 @@ class box_activity extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $enabled = 1;
@ -153,32 +153,32 @@ class box_activity extends ModeleBoxes
while ($j < count($data))
{
$this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"',
'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),
'logo' => 'object_propal'
'td' => 'class="left" width="16"',
'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),
'logo' => 'object_propal'
);
$this->info_box_contents[$line][1] = array(
'td' => '',
'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
'td' => '',
'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
);
$this->info_box_contents[$line][2] = array(
'td' => 'class="right"',
'text' => $data[$j]->nb,
'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
'td' => 'class="right"',
'text' => $data[$j]->nb,
'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
);
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array(
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
);
$this->info_box_contents[$line][4] = array(
'td' => 'align="right" width="18"',
'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
'td' => 'class="right" width="18"',
'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
);
$line++;
@ -236,7 +236,7 @@ class box_activity extends ModeleBoxes
$j=0;
while ($j < count($data)) {
$this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"',
'td' => 'class="left" width="16"',
'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),
'logo' => 'object_order',
@ -260,7 +260,7 @@ class box_activity extends ModeleBoxes
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
);
$this->info_box_contents[$line][4] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
);
@ -321,43 +321,43 @@ class box_activity extends ModeleBoxes
while ($j < count($data)) {
$billurl="search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
$this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"',
'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",
'logo' => 'bill',
'td' => 'class="left" width="16"',
'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",
'logo' => 'bill',
);
$this->info_box_contents[$line][1] = array(
'td' => '',
'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
'td' => '',
'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
);
$this->info_box_contents[$line][2] = array(
'td' => 'class="right"',
'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
'text' => $data[$j]->nb,
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
'td' => 'class="right"',
'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
'text' => $data[$j]->nb,
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
);
$this->info_box_contents[$line][3] = array(
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
);
// We add only for the current year
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][4] = array(
'td' => 'align="right" width="18"',
'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
'td' => 'class="right" width="18"',
'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
);
$line++;
$j++;
}
if (count($data)==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'text'=>$langs->trans("NoRecordedInvoices"),
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedInvoices"),
);
}
@ -403,49 +403,50 @@ class box_activity extends ModeleBoxes
while ($j < count($data)) {
$billurl="search_status=".$data[$j]->fk_statut."&amp;paye=0";
$this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"',
'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",
'logo' => 'bill',
'td' => 'class="left" width="16"',
'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",
'logo' => 'bill',
);
$this->info_box_contents[$line][1] = array(
'td' => '',
'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
'td' => '',
'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
);
$this->info_box_contents[$line][2] = array(
'td' => 'class="right"',
'text' => $data[$j]->nb,
'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",
'td' => 'class="right"',
'text' => $data[$j]->nb,
'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",
);
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array(
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
);
$this->info_box_contents[$line][4] = array(
'td' => 'align="right" width="18"',
'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
'td' => 'class="right" width="18"',
'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
);
$line++;
$j++;
}
if ($num==0)
if ($num==0) {
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'text'=>$langs->trans("NoRecordedInvoices"),
);
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedInvoices"),
);
}
}
}
// Add the sum in the bottom of the boxes
$this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
$this->info_box_contents[$line][1] = array('td' => 'align="left" class="liste_total" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
$this->info_box_contents[$line][2] = array('td' => 'align="right" class="liste_total" ', 'text' => $totalnb);
$this->info_box_contents[$line][3] = array('td' => 'align="right" class="liste_total" ', 'text' => '');
$this->info_box_contents[$line][4] = array('td' => 'align="right" class="liste_total" ', 'text' => "");
$this->info_box_contents[$line][1] = array('td' => 'class="liste_total left" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
$this->info_box_contents[$line][2] = array('td' => 'class="liste_total right" ', 'text' => $totalnb);
$this->info_box_contents[$line][3] = array('td' => 'class="liste_total right" ', 'text' => '');
$this->info_box_contents[$line][4] = array('td' => 'class="liste_total right" ', 'text' => "");
}

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

@ -37,7 +37,7 @@ class box_bookmarks extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -106,7 +106,7 @@ class box_bookmarks extends ModeleBoxes
$objp = $db->fetch_object($result);
$this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"',
'td' => 'class="left" width="16"',
'logo' => $this->boximg,
'url' => $objp->url,
'tooltip' => $objp->title,
@ -127,7 +127,7 @@ class box_bookmarks extends ModeleBoxes
$mytxt=$langs->trans("NoRecordedBookmarks");
if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
$this->info_box_contents[$line][0] = array(
'td' => 'align="center" colspan="2"',
'td' => 'class="center" colspan="2"',
'tooltip' => $mytxt,
'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
);
@ -143,7 +143,7 @@ class box_bookmarks extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

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

@ -41,7 +41,7 @@ class box_clients extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $enabled = 1;
var $info_box_head = array();
@ -140,26 +140,28 @@ class box_clients extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $thirdpartystatic->LibStatut($objp->status, 3)
);
$line++;
}
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedCustomers"));
$db->free($result);
}
else {
$this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
$this->info_box_contents[0][0] = array(
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql)
);
}
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

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

@ -41,7 +41,7 @@ class box_commandes extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -165,14 +165,14 @@ class box_commandes extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
);
$line++;
}
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedOrders"));
$db->free($result);
} else {
@ -184,7 +184,7 @@ class box_commandes extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

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

@ -42,7 +42,7 @@ class box_comptes extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $enabled = 1;
@ -145,16 +145,16 @@ class box_comptes extends ModeleBoxes
foreach ($solde_total as $key=>$solde) {
$this->info_box_contents[$line][] = array(
'tr' => 'class="liste_total"',
'td' => 'align="left" class="liste_total"',
'td' => 'class="liste_total left"',
'text' => $langs->trans('Total').' '.$key,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" class="liste_total"',
'td' => 'class="liste_total right"',
'text' => '&nbsp;'
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" class="liste_total"',
'td' => 'class="liste_total right"',
'text' => price($solde, 0, $langs, 0, -1, -1, $key)
);
$line++;
@ -170,7 +170,7 @@ class box_comptes extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

8
htdocs/core/boxes/box_contacts.php
View File

@ -43,7 +43,7 @@ class box_contacts extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -147,7 +147,7 @@ class box_contacts extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" class="nowrap" width="18"',
'td' => 'class="nowrap right" width="18"',
'text' => $contactstatic->getLibStatut(3),
'asis'=>1,
);
@ -157,7 +157,7 @@ class box_contacts extends ModeleBoxes
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedContacts"),
);
@ -171,7 +171,7 @@ class box_contacts extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

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

@ -161,7 +161,7 @@ class box_contracts extends ModeleBoxes
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center opacitymedium"',
'td' => 'class="center opacitymedium"',
'text'=>$langs->trans("NoRecordedContracts"),
);
@ -175,7 +175,7 @@ class box_contracts extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

8
htdocs/core/boxes/box_external_rss.php
View File

@ -43,7 +43,7 @@ class box_external_rss extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $paramdef; // Params of box definition (not user params)
var $info_box_head = array();
@ -111,7 +111,7 @@ class box_external_rss extends ModeleBoxes
'sublink' => $link,
'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate()?dol_print_date($rssparser->getLastFetchDate(), "dayhourtext"):$langs->trans("Unknown")),
'subpicto'=>'help',
'target'=>'_blank',
'target'=>'_blank',
);
}
@ -163,7 +163,7 @@ class box_external_rss extends ModeleBoxes
$tooltip.= '<br>'.$description;
$this->info_box_contents[$line][0] = array(
'td' => 'align="left" width="16"',
'td' => 'class="left" width="16"',
'logo' => $this->boximg,
'url' => $href,
'tooltip' => $tooltip,
@ -180,7 +180,7 @@ class box_external_rss extends ModeleBoxes
);
$this->info_box_contents[$line][2] = array(
'td' => 'align="right" nowrap="1"',
'td' => 'class="right nowrap"',
'text' => $date,
);
}

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

@ -39,7 +39,7 @@ class box_factures extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -83,8 +83,8 @@ class box_factures extends ModeleBoxes
$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills", $max);
$this->info_box_head = array(
'text' => $text,
'limit'=> dol_strlen($text)
'text' => $text,
'limit'=> dol_strlen($text)
);
if ($user->rights->facture->lire) {
@ -172,7 +172,7 @@ class box_factures extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
);
@ -181,7 +181,7 @@ class box_factures extends ModeleBoxes
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedInvoices"),
);
@ -195,7 +195,7 @@ class box_factures extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

10
htdocs/core/boxes/box_factures_fourn.php
View File

@ -40,7 +40,7 @@ class box_factures_fourn extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -81,7 +81,7 @@ class box_factures_fourn extends ModeleBoxes
$thirdpartytmp = new Fournisseur($db);
$this->info_box_head = array(
'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills", $max)
'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills", $max)
);
if ($user->rights->fournisseur->facture->lire)
@ -177,7 +177,7 @@ class box_factures_fourn extends ModeleBoxes
$fac->fetch($objp->facid);
$alreadypaid=$fac->getSommePaiement();
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
);
@ -186,7 +186,7 @@ class box_factures_fourn extends ModeleBoxes
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoModifiedSupplierBills"),
);
@ -200,7 +200,7 @@ class box_factures_fourn extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->transnoentities("ReadPermissionNotAllowed")
);
}

10
htdocs/core/boxes/box_factures_fourn_imp.php
View File

@ -39,7 +39,7 @@ class box_factures_fourn_imp extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -164,7 +164,7 @@ class box_factures_fourn_imp extends ModeleBoxes
$fac->fetch($objp->facid);
$alreadypaid=$fac->getSommePaiement();
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
);
@ -173,7 +173,7 @@ class box_factures_fourn_imp extends ModeleBoxes
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoUnpaidSupplierBills"),
);
@ -187,7 +187,7 @@ class box_factures_fourn_imp extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
@ -196,7 +196,7 @@ class box_factures_fourn_imp extends ModeleBoxes
/**
* Method to show box
*
* @param array $head Array with properties of box title
* @param array $head Array with properties of box title
* @param array $contents Array with properties of box lines
* @param int $nooutput No print, only return string
* @return string

8
htdocs/core/boxes/box_factures_imp.php
View File

@ -42,7 +42,7 @@ class box_factures_imp extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -171,14 +171,14 @@ class box_factures_imp extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
);
$line++;
}
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
$db->free($result);
}
@ -193,7 +193,7 @@ class box_factures_imp extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

50
htdocs/core/boxes/box_ficheinter.php
View File

@ -40,7 +40,7 @@ class box_ficheinter extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -114,45 +114,55 @@ class box_ficheinter extends ModeleBoxes
$ficheinterstatic->id=$objp->rowid;
$ficheinterstatic->ref=$objp->ref;
$this->info_box_contents[$i][] = array('td' => '',
'text' => $ficheinterstatic->getNomUrl(1),
'asis' => 1
$this->info_box_contents[$i][] = array(
'td' => '',
'text' => $ficheinterstatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$i][] = array('td' => 'align="left" width="16"',
'logo' => 'company',
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][] = array(
'td' => 'class="left" width="16"',
'logo' => 'company',
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid,
);
$this->info_box_contents[$i][] = array('td' => '',
'text' => dol_trunc($objp->name, 40),
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][] = array(
'td' => '',
'text' => dol_trunc($objp->name, 40),
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid,
);
$this->info_box_contents[$i][] = array('td' => 'class="right"',
'text' => dol_print_date($datec, 'day'));
$this->info_box_contents[$i][] = array(
'td' => 'class="right"',
'text' => dol_print_date($datec, 'day'),
);
$this->info_box_contents[$i][] = array('td' => 'align="right" class="nowrap"',
'text' => $ficheinterstatic->getLibStatut(6),
'asis'=>1
$this->info_box_contents[$i][] = array(
'td' => 'class="nowrap right"',
'text' => $ficheinterstatic->getLibStatut(6),
'asis' => 1,
);
$i++;
}
if ($num==0) $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
if ($num==0) $this->info_box_contents[$i][] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedInterventions"));
$db->free($resql);
}
else
{
$this->info_box_contents[0][] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
$this->info_box_contents[0][] = array(
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
}
else
{
$this->info_box_contents[0][] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

8
htdocs/core/boxes/box_fournisseurs.php
View File

@ -40,7 +40,7 @@ class box_fournisseurs extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -124,7 +124,7 @@ class box_fournisseurs extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $thirdpartystatic->LibStatut($objp->status, 3),
);
@ -132,7 +132,7 @@ class box_fournisseurs extends ModeleBoxes
}
if ($num==0) $this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedSuppliers"),
);
@ -146,7 +146,7 @@ class box_fournisseurs extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

16
htdocs/core/boxes/box_goodcustomers.php
View File

@ -42,7 +42,7 @@ class box_goodcustomers extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $enabled = 1;
var $info_box_head = array();
@ -136,26 +136,28 @@ class box_goodcustomers extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $thirdpartystatic->LibStatut($objp->status, 3)
);
$line++;
}
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedCustomers"));
$db->free($result);
}
else {
$this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
$this->info_box_contents[0][0] = array(
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

6
htdocs/core/boxes/box_graph_invoices_permonth.php
View File

@ -252,16 +252,16 @@ class box_graph_invoices_permonth extends ModeleBoxes
$stringtoshow.='</div>';
$stringtoshow.='</div>';
}
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"','textnoformat'=>$stringtoshow);
}
else
{
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"', 'maxlength'=>500, 'text' => $mesg);
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover left"', 'maxlength'=>500, 'text' => $mesg);
}
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

13
htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
View File

@ -249,18 +249,21 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$stringtoshow.='</div>';
$stringtoshow.='</div>';
}
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"','td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"','td' => 'class="nohover center"','textnoformat'=>$stringtoshow);
}
else
{
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
'maxlength'=>500,
'text' => $mesg);
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
'td' => 'class="nohover left"',
'maxlength'=>500,
'text' => $mesg,
);
}
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

17
htdocs/core/boxes/box_graph_orders_permonth.php
View File

@ -248,18 +248,25 @@ class box_graph_orders_permonth extends ModeleBoxes
$stringtoshow.='</div>';
$stringtoshow.='</div>';
}
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
'td' => 'class="nohover center"',
'textnoformat'=>$stringtoshow,
);
}
else
{
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
'maxlength'=>500,
'text' => $mesg);
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
'td' => 'class="nohover left"',
'maxlength'=>500,
'text' => $mesg,
);
}
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

17
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
View File

@ -247,18 +247,25 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$stringtoshow.='</div>';
$stringtoshow.='</div>';
}
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
'td' => 'class="nohover center"',
'textnoformat'=>$stringtoshow,
);
}
else
{
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
'maxlength'=>500,
'text' => $mesg);
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
'td' => 'class="nohover left"',
'maxlength'=>500,
'text' => $mesg,
);
}
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

10
htdocs/core/boxes/box_graph_product_distribution.php
View File

@ -38,7 +38,7 @@ class box_graph_product_distribution extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -392,12 +392,16 @@ class box_graph_product_distribution extends ModeleBoxes
$stringtoshow.=$px3->show();
$stringtoshow.='</div></div>';
}
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
'td' => 'class="nohover center"',
'textnoformat'=>$stringtoshow,
);
}
else
{
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'maxlength'=>500,
'text' => $mesg
);

17
htdocs/core/boxes/box_graph_propales_permonth.php
View File

@ -251,18 +251,25 @@ class box_graph_propales_permonth extends ModeleBoxes
$stringtoshow.='</div>';
$stringtoshow.='</div>';
}
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
'td' => 'class="nohover center"',
'textnoformat'=>$stringtoshow,
);
}
else
{
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
'maxlength'=>500,
'text' => $mesg);
$this->info_box_contents[0][0] = array(
'tr'=>'class="oddeven nohover"',
'td' => 'class="nohover left"',
'maxlength' => 500,
'text' => $mesg,
);
}
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

60
htdocs/core/boxes/box_last_modified_ticket.php
View File

@ -1,7 +1,8 @@
<?php
/* Module descriptor for ticket system
* Copyright (C) - 2013-2016 Jean-François FERRY <hello@librethic.io>
* 2016 Christophe Battarel <christophe@altairis.fr>
* Copyright (C) 2013-2016 Jean-François FERRY <hello@librethic.io>
* 2016 Christophe Battarel <christophe@altairis.fr>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -34,12 +35,12 @@ class box_last_modified_ticket extends ModeleBoxes
public $boximg = "ticket";
public $boxlabel;
public $depends = array("ticket");
/**
* @var DoliDB Database handler.
*/
public $db;
public $param;
public $info_box_head = array();
public $info_box_contents = array();
@ -75,8 +76,10 @@ class box_last_modified_ticket extends ModeleBoxes
'limit' => dol_strlen($text)
);
$this->info_box_contents[0][0] = array('td' => 'align="left"',
'text' => $langs->trans("BoxLastModifiedTicketContent"));
$this->info_box_contents[0][0] = array(
'td' => 'class="left"',
'text' => $langs->trans("BoxLastModifiedTicketContent"),
);
if ($user->rights->ticket->read) {
$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
@ -119,39 +122,42 @@ class box_last_modified_ticket extends ModeleBoxes
// Picto
$this->info_box_contents[$i][0] = array(
'td' => 'align="left" width="16"',
'logo' => $this->boximg,
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
'td' => 'class="left" width="16"',
'logo' => $this->boximg,
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1),
);
$r++;
// Id
$this->info_box_contents[$i][$r] = array(
'td' => 'align="left"',
'text' => $objp->ref,
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
'td' => 'class="left"',
'text' => $objp->ref,
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1),
);
$r++;
// Subject
$this->info_box_contents[$i][$r] = array(
'td' => 'align="left"',
'text' => $objp->subject, // Some event have no ref
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
'td' => 'class="left"',
'text' => $objp->subject, // Some event have no ref
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1),
);
$r++;
// Customer
$this->info_box_contents[$i][$r] = array(
'td' => 'align="left"',
'logo' => ($objp->fk_soc>0?'company':''),
'text' => ($objp->company_name?$objp->company_name:$objp->origin_email),
'url' => ($objp->fk_soc>0?DOL_URL_ROOT."/comm/card.php?socid=".$objp->fk_soc:'')
'td' => 'class="left"',
'logo' => ($objp->fk_soc>0?'company':''),
'text' => ($objp->company_name?$objp->company_name:$objp->origin_email),
'url' => ($objp->fk_soc>0?DOL_URL_ROOT."/comm/card.php?socid=".$objp->fk_soc:'')
);
$r++;
// Date creation
$this->info_box_contents[$i][$r] = array(
'td' => 'align="right"',
'text' => dol_print_date($db->idate($objp->datec), 'dayhour')
'td' => 'class="right"',
'text' => dol_print_date($db->idate($objp->datec), 'dayhour')
);
$r++;
@ -159,8 +165,8 @@ class box_last_modified_ticket extends ModeleBoxes
$ticketstat = new Ticket($this->db);
$ticketstat->fk_statut = $objp->fk_statut;
$this->info_box_contents[$i][$r] = array(
'td' => 'align="right"',
'text' => $ticketstat->getLibStatut(3)
'td' => 'class="right"',
'text' => $ticketstat->getLibStatut(3)
);
$r++;
@ -168,14 +174,16 @@ class box_last_modified_ticket extends ModeleBoxes
}
if ($num==0) {
$this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
$this->info_box_contents[$i][0] = array('td' => 'class="center"','text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
}
} else {
dol_print_error($db);
}
} else {
$this->info_box_contents[0][0] = array('td' => 'align="left"',
'text' => $langs->trans("ReadPermissionNotAllowed"));
$this->info_box_contents[0][0] = array(
'td' => 'class="left"',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}
}

35
htdocs/core/boxes/box_last_ticket.php
View File

@ -34,12 +34,12 @@ class box_last_ticket extends ModeleBoxes
public $boximg = "ticket";
public $boxlabel;
public $depends = array("ticket");
/**
* @var DoliDB Database handler.
*/
public $db;
public $param;
public $info_box_head = array();
public $info_box_contents = array();
@ -75,8 +75,10 @@ class box_last_ticket extends ModeleBoxes
'limit' => dol_strlen($text),
);
$this->info_box_contents[0][0] = array('td' => 'align="left"',
'text' => $langs->trans("BoxLastTicketContent"));
$this->info_box_contents[0][0] = array(
'td' => 'class="left"',
'text' => $langs->trans("BoxLastTicketContent"),
);
if ($user->rights->ticket->read) {
$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
@ -120,28 +122,31 @@ class box_last_ticket extends ModeleBoxes
// Picto
$this->info_box_contents[$i][0] = array(
'td' => 'align="left" width="16"',
'td' => 'class="left" width="16"',
'logo' => $this->boximg,
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1),
);
$r++;
// Id
$this->info_box_contents[$i][$r] = array(
'td' => 'align="left"',
'td' => 'class="left"',
'text' => $objp->ref,
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1),
);
$r++;
// Subject
$this->info_box_contents[$i][$r] = array(
'td' => 'align="left"',
'td' => 'class="left"',
'text' => $objp->subject, // Some event have no ref
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1),
);
$r++;
// Customer
$this->info_box_contents[$i][$r] = array(
'td' => 'align="left"',
'td' => 'class="left"',
'logo' => ($objp->fk_soc > 0 ? 'company' : ''),
'text' => ($objp->company_name ? $objp->company_name : $objp->origin_email),
'url' => ($objp->fk_soc > 0 ? DOL_URL_ROOT . "/comm/card.php?socid=" . $objp->fk_soc : ''),
@ -150,7 +155,7 @@ class box_last_ticket extends ModeleBoxes
// Date creation
$this->info_box_contents[$i][$r] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($db->idate($objp->datec), 'dayhour'),
);
$r++;
@ -159,7 +164,7 @@ class box_last_ticket extends ModeleBoxes
$ticketstat = new Ticket($this->db);
$ticketstat->fk_statut = $objp->fk_statut;
$this->info_box_contents[$i][$r] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => $ticketstat->getLibStatut(3),
);
$r++;
@ -168,13 +173,13 @@ class box_last_ticket extends ModeleBoxes
}
if ($num == 0) {
$this->info_box_contents[$i][0] = array('td' => 'align="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
}
} else {
dol_print_error($db);
}
} else {
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => 'class="left"',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}

8
htdocs/core/boxes/box_members.php
View File

@ -41,7 +41,7 @@ class box_members extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $enabled = 1;
@ -141,7 +141,7 @@ class box_members extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $db->jdate($objp->date_end_subscription), 3),
);
@ -150,7 +150,7 @@ class box_members extends ModeleBoxes
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedCustomers"),
);
@ -164,7 +164,7 @@ class box_members extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

8
htdocs/core/boxes/box_produits.php
View File

@ -183,13 +183,13 @@ class box_produits extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
'asis' => 1
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
'asis' => 1
);
@ -198,7 +198,7 @@ class box_produits extends ModeleBoxes
}
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedProducts"),
);
@ -212,7 +212,7 @@ class box_produits extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

17
htdocs/core/boxes/box_produits_alerte_stock.php
View File

@ -44,7 +44,7 @@ class box_produits_alerte_stock extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -187,18 +187,19 @@ class box_produits_alerte_stock extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="center"',
'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
'td' => 'class="center"',
'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
'asis' => 1
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
'asis' => 1
);
@ -207,7 +208,7 @@ class box_produits_alerte_stock extends ModeleBoxes
}
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoTooLowStockProducts"),
);
@ -224,7 +225,7 @@ class box_produits_alerte_stock extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

4
htdocs/core/boxes/box_project.php
View File

@ -174,11 +174,11 @@ class box_project extends ModeleBoxes
'text' => "&nbsp;",
);
$this->info_box_contents[$i][] = array(
'td' => 'align="right" ',
'td' => 'class="right" ',
'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
);
$this->info_box_contents[$i][] = array(
'td' => 'align="right" ',
'td' => 'class="right" ',
'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
);
$this->info_box_contents[$i][] = array(

8
htdocs/core/boxes/box_propales.php
View File

@ -41,7 +41,7 @@ class box_propales extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -151,7 +151,7 @@ class box_propales extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
);
@ -160,7 +160,7 @@ class box_propales extends ModeleBoxes
if ($num==0)
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedProposals"),
);
@ -174,7 +174,7 @@ class box_propales extends ModeleBoxes
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

17
htdocs/core/boxes/box_prospect.php
View File

@ -43,7 +43,7 @@ class box_prospect extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $enabled = 1;
var $info_box_head = array();
@ -134,35 +134,36 @@ class box_prospect extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $thirdpartystatic->LibStatut($objp->status, 3),
);
$line++;
}
if ($num==0)
if ($num==0) {
$this->info_box_contents[$line][0] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedProspects"),
);
);
}
$db->free($resql);
} else {
$this->info_box_contents[0][0] = array(
'td' => '',
'maxlength'=>500,
'maxlength' => 500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

44
htdocs/core/boxes/box_services_contracts.php
View File

@ -190,44 +190,52 @@ class box_services_contracts extends ModeleBoxes
}
$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
'text' => $s,
'asis' => 1
$this->info_box_contents[$i][] = array(
'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
'text' => $s,
'asis' => 1
);
$this->info_box_contents[$i][] = array('td' => '',
'text' => $contractstatic->getNomUrl(1),
'asis' => 1
$this->info_box_contents[$i][] = array(
'td' => '',
'text' => $contractstatic->getNomUrl(1),
'asis' => 1
);
$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
'text' => $thirdpartytmp->getNomUrl(1),
'asis' => 1
$this->info_box_contents[$i][] = array(
'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
'text' => $thirdpartytmp->getNomUrl(1),
'asis' => 1
);
$this->info_box_contents[$i][] = array('td' => '',
'text' => dol_print_date($datem, 'day'));
$this->info_box_contents[$i][] = array(
'td' => '',
'text' => dol_print_date($datem, 'day'),
);
$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"',
'text' => $contratlignestatic->LibStatut($objp->statut, 3)
$this->info_box_contents[$i][] = array(
'td' => 'class="right" width="18"',
'text' => $contratlignestatic->LibStatut($objp->statut, 3)
);
$i++;
}
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoContractedProducts"));
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'class="center"','text'=>$langs->trans("NoContractedProducts"));
$db->free($result);
}
else
{
$this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
$this->info_box_contents[0][0] = array(
'td' => '',
'maxlength' => 500,
'text' => ($db->error().' sql='.$sql),
);
}
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

43
htdocs/core/boxes/box_services_expired.php
View File

@ -132,22 +132,28 @@ class box_services_expired extends ModeleBoxes
$dateline=$db->jdate($objp->date_line);
if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late=img_warning($langs->trans("Late"));
$this->info_box_contents[$i][] = array('td' => '',
'text' => $contract->getNomUrl(1),
'asis' => 1
$this->info_box_contents[$i][] = array(
'td' => '',
'text' => $contract->getNomUrl(1),
'asis' => 1
);
$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax150 maxwidth150onsmartphone" align="left"',
'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
'asis' => 1
$this->info_box_contents[$i][] = array(
'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone left"',
'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
'asis' => 1
);
$this->info_box_contents[$i][] = array('td' => 'align="center"',
'text' => dol_print_date($dateline, 'day'),
'text2'=> $late);
$this->info_box_contents[$i][] = array(
'td' => 'class="center"',
'text' => dol_print_date($dateline, 'day'),
'text2'=> $late,
);
$this->info_box_contents[$i][] = array('td' => 'class="right"',
'text' => $objp->nb_services);
$this->info_box_contents[$i][] = array(
'td' => 'class="right"',
'text' => $objp->nb_services,
);
$i++;
@ -156,22 +162,27 @@ class box_services_expired extends ModeleBoxes
if ($num==0)
{
$langs->load("contracts");
$this->info_box_contents[$i][] = array('td' => 'align="center" class="nohover opacitymedium"','text'=>$langs->trans("NoExpiredServices"));
$this->info_box_contents[$i][] = array(
'td' => 'class="nohover opacitymedium center"',
'text' => $langs->trans("NoExpiredServices"),
);
}
$db->free($resql);
}
else
{
$this->info_box_contents[0][] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
$this->info_box_contents[0][] = array(
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
}
else
{
$this->info_box_contents[0][0] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

8
htdocs/core/boxes/box_supplier_orders.php
View File

@ -40,7 +40,7 @@ class box_supplier_orders extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
var $info_box_contents = array();
@ -145,7 +145,7 @@ class box_supplier_orders extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" width="18"',
'td' => 'class="right" width="18"',
'text' => $supplierorderstatic->LibStatut($objp->fk_statut, 3),
);
@ -154,7 +154,7 @@ class box_supplier_orders extends ModeleBoxes
if ($num == 0)
$this->info_box_contents[$line][] = array(
'td' => 'align="center"',
'td' => 'class="center"',
'text' => $langs->trans("NoSupplierOrder"),
);
@ -170,7 +170,7 @@ class box_supplier_orders extends ModeleBoxes
else
{
$this->info_box_contents[0][] = array(
'td' => 'align="left" class="nohover opacitymedium"',
'td' => 'class="nohover opacitymedium left"',
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}

10
htdocs/core/boxes/box_task.php
View File

@ -84,7 +84,7 @@ class box_task extends ModeleBoxes
$totalDuree=0;
$totalplannedtot=0;
$totaldurationtot=0;
include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
$taskstatic=new Task($db);
@ -125,7 +125,7 @@ class box_task extends ModeleBoxes
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot, 'all', 25200, 5));
$totaldurationtot += $objp->durationtot;
$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
$this->info_box_contents[$i][] = array('td' => 'class="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
$i++;
}
@ -136,9 +136,9 @@ class box_task extends ModeleBoxes
// Add the sum at the bottom of the boxes
$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
}

32
htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) ---Put here your own copyright and developer email---
*
* This program is free software: you can redistribute it and/or modify
@ -140,54 +140,54 @@ class mymodulewidget1 extends ModeleBoxes
0 => array( // First line
0 => array( // First Column
// HTML properties of the TR element. Only available on the first column.
'tr' => 'align="left"',
'tr' => 'class="left"',
// HTML properties of the TD element
'td' => '',
'td' => '',
// Main text for content of cell
'text' => 'First cell of first line',
'text' => 'First cell of first line',
// Link on 'text' and 'logo' elements
'url' => 'http://example.com',
'url' => 'http://example.com',
// Link's target HTML property
'target' => '_blank',
'target' => '_blank',
// Fist line logo (deprecated. Include instead logo html code into text or text2, and set asis property to true to avoid HTML cleaning)
//'logo' => 'monmodule@monmodule',
//'logo' => 'monmodule@monmodule',
// Unformatted text, added after text. Usefull to add/load javascript code
'textnoformat' => '',
// Main text for content of cell (other method)
//'text2' => '<p><strong>Another text</strong></p>',
//'text2' => '<p><strong>Another text</strong></p>',
// Truncates 'text' element to the specified character length, 0 = disabled
'maxlength' => 0,
'maxlength' => 0,
// Prevents HTML cleaning (and truncation)
'asis' => false,
'asis' => false,
// Same for 'text2'
'asis2' => true
'asis2' => true
),
1 => array( // Another column
// No TR for n≠0
'td' => '',
'td' => '',
'text' => 'Second cell',
)
),
1 => array( // Another line
0 => array( // TR
'tr' => 'align="left"',
'tr' => 'class="left"',
'text' => 'Another line'
),
1 => array( // TR
'tr' => 'align="left"',
'tr' => 'class="left"',
'text' => ''
)
),
2 => array( // Another line
0 => array( // TR
'tr' => 'align="left"',
'tr' => 'class="left"',
'text' => ''
),
0 => array( // TR
'tr' => 'align="left"',
'tr' => 'class="left"',
'text' => ''
)
),