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

FIX : revert wrong code

Browse Source
This commit is contained in:
gauthier 2017-09-27 15:21:36 +02:00
parent 1694737e0b
commit 4084da28d1
1 changed files with 61 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
htdocs/index.php
View File

@ -375,12 +375,8 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
{ {
include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
$board=new ActionComm($db); $board=new ActionComm($db);
$wb_res = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) { $dashboardlines[] = $board->load_board($user);
$board->load_board($user, 1);
$wb_res->nbtotal = (int)$board->nb['actionscomm'];
}
$dashboardlines[] = $wb_res;
} }
// Number of project opened // Number of project opened
@ -388,12 +384,7 @@ if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
{ {
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$board=new Project($db); $board=new Project($db);
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['projects'];
}
$dashboardlines[] = $wb_res;
} }
// Number of tasks to do (late) // Number of tasks to do (late)
@ -401,12 +392,7 @@ if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS)
{ {
include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
$board=new Task($db); $board=new Task($db);
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['tasks'];
}
$dashboardlines[] = $wb_res;
} }
// Number of commercial proposals opened (expired) // Number of commercial proposals opened (expired)
@ -414,17 +400,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
{ {
include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
$board=new Propal($db); $board=new Propal($db);
$wb_res = $board->load_board($user,"opened"); $dashboardlines[] = $board->load_board($user,"opened");
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$nbtotal = (int)$board->nb['proposals'];
$wb_res->nbtotal = $nbtotal;
}
$dashboardlines[] = $wb_res;
// Number of commercial proposals CLOSED signed (billed) // Number of commercial proposals CLOSED signed (billed)
$wb_res = $board->load_board($user,"signed"); $dashboardlines[] = $board->load_board($user,"signed");
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
$dashboardlines[] = $wb_res;
} }
// Number of commercial proposals opened (expired) // Number of commercial proposals opened (expired)
@ -432,17 +410,9 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
{ {
include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
$board=new SupplierProposal($db); $board=new SupplierProposal($db);
$wb_res = $board->load_board($user,"opened"); $dashboardlines[] = $board->load_board($user,"opened");
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$nbtotal = (int)$board->nb['askprice'];
$wb_res->nbtotal = $nbtotal;
}
$dashboardlines[] = $wb_res;
// Number of commercial proposals CLOSED signed (billed) // Number of commercial proposals CLOSED signed (billed)
$wb_res = $board->load_board($user,"signed"); $dashboardlines[] = $board->load_board($user,"signed");
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
$dashboardlines[] = $wb_res;
} }
// Number of customer orders a deal // Number of customer orders a deal
@ -450,12 +420,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
{ {
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
$board=new Commande($db); $board=new Commande($db);
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['orders'];
}
$dashboardlines[] = $wb_res;
} }
// Number of suppliers orders a deal // Number of suppliers orders a deal
@ -463,12 +428,7 @@ if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->comma
{ {
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
$board=new CommandeFournisseur($db); $board=new CommandeFournisseur($db);
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['supplier_orders'];
}
$dashboardlines[] = $wb_res;
} }
// Number of services enabled (delayed) // Number of services enabled (delayed)
@ -476,29 +436,16 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
{ {
include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
$board=new Contrat($db); $board=new Contrat($db);
$wb_res = $board->load_board($user,"inactives"); $dashboardlines[] = $board->load_board($user,"inactives");
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$nbtotal = (int)$board->nb['Contracts'];
$wb_res->nbtotal = $nbtotal;
}
$dashboardlines[] = $wb_res;
// Number of active services (expired) // Number of active services (expired)
$wb_res = $board->load_board($user,"expired"); $dashboardlines[] = $board->load_board($user,"expired");
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
$dashboardlines[] = $wb_res;
} }
// Number of invoices customers (has paid) // Number of invoices customers (has paid)
if (! empty($conf->facture->enabled) && $user->rights->facture->lire) if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
{ {
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$board=new Facture($db); $board=new Facture($db);
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['invoices'];
}
$dashboardlines[] = $wb_res;
} }
// Number of supplier invoices (has paid) // Number of supplier invoices (has paid)
@ -506,12 +453,7 @@ if (! empty($conf->supplier_invoice->enabled) && ! empty($user->rights->fourniss
{ {
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$board=new FactureFournisseur($db); $board=new FactureFournisseur($db);
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['supplier_invoices'];
}
$dashboardlines[] = $wb_res;
} }
// Number of transactions to conciliate // Number of transactions to conciliate
@ -522,12 +464,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
$nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
if ($nb > 0) if ($nb > 0)
{ {
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['banklines'];
}
$dashboardlines[] = $wb_res;
} }
} }
@ -536,12 +473,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
{ {
include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
$board=new RemiseCheque($db); $board=new RemiseCheque($db);
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['cheques'];
}
$dashboardlines[] = $wb_res;
} }
// Number of foundation members // Number of foundation members
@ -549,12 +481,7 @@ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $use
{ {
include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
$board=new Adherent($db); $board=new Adherent($db);
$wb_res = $board->load_board($user); $dashboardlines[] = $board->load_board($user);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['members'];
}
$dashboardlines[] = $wb_res;
} }
// Number of expense reports to approve // Number of expense reports to approve
@ -562,12 +489,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->appr
{ {
include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
$board=new ExpenseReport($db); $board=new ExpenseReport($db);
$wb_res = $board->load_board($user,'toapprove'); $dashboardlines[] = $board->load_board($user,'toapprove');
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['expensereports'];
}
$dashboardlines[] = $wb_res;
} }
// Number of expense reports to pay // Number of expense reports to pay
@ -575,16 +497,11 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_p
{ {
include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
$board=new ExpenseReport($db); $board=new ExpenseReport($db);
$wb_res = $board->load_board($user,'topay'); $dashboardlines[] = $board->load_board($user,'topay');
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$board->load_state_board();
$wb_res->nbtotal = (int)$board->nb['expensereports'];
}
$dashboardlines[] = $wb_res;
} }
// Calculate total nb of late // Calculate total nb of late
$totallate=$totalglobal=0; $totallate=$totaltodo=0;
$var=true; $var=true;
//Remove any invalid response //Remove any invalid response
@ -599,12 +516,12 @@ foreach($dashboardlines as $tmp)
foreach($valid_dashboardlines as $board) foreach($valid_dashboardlines as $board)
{ {
if ($board->nbtodolate > 0) { if ($board->nbtodolate > 0) {
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totalglobal += $board->nbtotal; if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totaltodo += $board->nbtodo;
$totallate += $board->nbtodolate; $totallate += $board->nbtodolate;
} }
} }
//var_dump($totallate, $totalglobal); //var_dump($totallate, $totaltodo);
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totallate = $totallate / $totalglobal * 100; if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totallate = round($totallate / $totaltodo * 100, 2);
//var_dump($totallate); //var_dump($totallate);
$boxwork=''; $boxwork='';
$boxwork.='<div class="box">'; $boxwork.='<div class="box">';
@ -618,7 +535,7 @@ if ($showweather)
$boxwork.='<tr class="nohover">'; $boxwork.='<tr class="nohover">';
$boxwork.='<td class="nohover hideonsmartphone center valignmiddle">'; $boxwork.='<td class="nohover hideonsmartphone center valignmiddle">';
$text=''; $text='';
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')'; if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
$text.='. '.$langs->trans("LateDesc"); $text.='. '.$langs->trans("LateDesc");
//$text.=$form->textwithpicto('',$langs->trans("LateDesc")); //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
$options='height="64px"'; $options='height="64px"';