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

New: Add suppliers orders to process in dashboard

Browse Source
This commit is contained in:
Laurent Destailleur 2010-11-13 17:37:22 +00:00
parent 31f442b145
commit 8bc3bae49e
20 changed files with 185 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/adherents/class/adherent.class.php
View File

@ -1862,9 +1862,9 @@ class Adherent extends CommonObject
}
/**
* Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* @param user Objet user
* @return int <0 si ko, >0 si ok
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @return int <0 if KO, >0 if OK
*/
function load_board($user)
{

92
htdocs/admin/delais.php
View File

@ -35,23 +35,23 @@ $langs->load("contracts");
$langs->load("bills");
$langs->load("banks");
if (!$user->admin)
accessforbidden();
if (!$user->admin) accessforbidden();
if ( (isset($_POST["action"]) && $_POST["action"] == 'update'))
{
//Conversion des jours en secondes
if ($_POST["ActionsToDo"]) dolibarr_set_const($db, "MAIN_DELAY_ACTIONS_TODO",$_POST["ActionsToDo"],'chaine',0,'',$conf->entity);
if ($_POST["OrdersToProcess"]) dolibarr_set_const($db, "MAIN_DELAY_ORDERS_TO_PROCESS",$_POST["OrdersToProcess"],'chaine',0,'',$conf->entity);
if ($_POST["PropalsToClose"]) dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_CLOSE",$_POST["PropalsToClose"],'chaine',0,'',$conf->entity);
if ($_POST["PropalsToBill"]) dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_BILL",$_POST["PropalsToBill"],'chaine',0,'',$conf->entity);
if ($_POST["BoardNotActivatedServices"]) dolibarr_set_const($db, "MAIN_DELAY_NOT_ACTIVATED_SERVICES",$_POST["BoardNotActivatedServices"],'chaine',0,'',$conf->entity);
if ($_POST["BoardRunningServices"]) dolibarr_set_const($db, "MAIN_DELAY_RUNNING_SERVICES",$_POST["BoardRunningServices"],'chaine',0,'',$conf->entity);
if ($_POST["SupplierBillsToPay"]) dolibarr_set_const($db, "MAIN_DELAY_SUPPLIER_BILLS_TO_PAY",$_POST["SupplierBillsToPay"],'chaine',0,'',$conf->entity);
if ($_POST["CustomerBillsUnpaid"]) dolibarr_set_const($db, "MAIN_DELAY_CUSTOMER_BILLS_UNPAYED",$_POST["CustomerBillsUnpaid"],'chaine',0,'',$conf->entity);
if ($_POST["TransactionsToConciliate"]) dolibarr_set_const($db, "MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE",$_POST["TransactionsToConciliate"],'chaine',0,'',$conf->entity);
if ($_POST["ChequesToDeposit"]) dolibarr_set_const($db, "MAIN_DELAY_CHEQUES_TO_DEPOSIT",$_POST["ChequesToDeposit"],'chaine',0,'',$conf->entity);
if ($_POST["Members"]) dolibarr_set_const($db, "MAIN_DELAY_MEMBERS",$_POST["Members"],'chaine',0,'',$conf->entity);
//Conversion des jours en secondes
if ($_POST["ActionsToDo"]) dolibarr_set_const($db, "MAIN_DELAY_ACTIONS_TODO",$_POST["ActionsToDo"],'chaine',0,'',$conf->entity);
if ($_POST["OrdersToProcess"]) dolibarr_set_const($db, "MAIN_DELAY_ORDERS_TO_PROCESS",$_POST["OrdersToProcess"],'chaine',0,'',$conf->entity);
if ($_POST["SuppliersOrdersToProcess"]) dolibarr_set_const($db, "MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS",$_POST["SuppliersOrdersToProcess"],'chaine',0,'',$conf->entity);
if ($_POST["PropalsToClose"]) dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_CLOSE",$_POST["PropalsToClose"],'chaine',0,'',$conf->entity);
if ($_POST["PropalsToBill"]) dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_BILL",$_POST["PropalsToBill"],'chaine',0,'',$conf->entity);
if ($_POST["BoardNotActivatedServices"]) dolibarr_set_const($db, "MAIN_DELAY_NOT_ACTIVATED_SERVICES",$_POST["BoardNotActivatedServices"],'chaine',0,'',$conf->entity);
if ($_POST["BoardRunningServices"]) dolibarr_set_const($db, "MAIN_DELAY_RUNNING_SERVICES",$_POST["BoardRunningServices"],'chaine',0,'',$conf->entity);
if ($_POST["CustomerBillsUnpaid"]) dolibarr_set_const($db, "MAIN_DELAY_CUSTOMER_BILLS_UNPAYED",$_POST["CustomerBillsUnpaid"],'chaine',0,'',$conf->entity);
if ($_POST["SupplierBillsToPay"]) dolibarr_set_const($db, "MAIN_DELAY_SUPPLIER_BILLS_TO_PAY",$_POST["SupplierBillsToPay"],'chaine',0,'',$conf->entity);
if ($_POST["TransactionsToConciliate"]) dolibarr_set_const($db, "MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE",$_POST["TransactionsToConciliate"],'chaine',0,'',$conf->entity);
if ($_POST["ChequesToDeposit"]) dolibarr_set_const($db, "MAIN_DELAY_CHEQUES_TO_DEPOSIT",$_POST["ChequesToDeposit"],'chaine',0,'',$conf->entity);
if ($_POST["Members"]) dolibarr_set_const($db, "MAIN_DELAY_MEMBERS",$_POST["Members"],'chaine',0,'',$conf->entity);
}
@ -81,7 +81,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit'))
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td>'.$langs->trans("Value").'</td></tr>';
//
//
if ($conf->agenda->enabled)
{
$var=!$var;
@ -98,6 +98,14 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit'))
print '<td>'.$langs->trans("DelaysOfToleranceOrdersToProcess").'</td><td>';
print '<input size="5" name="OrdersToProcess" value="'. ($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->fournisseur->enabled)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','order').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSuppliersOrdersToProcess").'</td><td>';
print '<input size="5" name="SuppliersOrdersToProcess" value="'. ($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->propal->enabled)
{
$var=!$var;
@ -130,14 +138,6 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit'))
print '<td>'.$langs->trans("DelaysOfToleranceRunningServices").'</td><td>';
print '<input size="5" name="BoardRunningServices" value="'. ($conf->global->MAIN_DELAY_RUNNING_SERVICES +0). '"> ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->fournisseur->enabled)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','bill').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>';
print '<input size="5" name="SupplierBillsToPay" value="'. ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->facture->enabled)
{
$var=!$var;
@ -146,6 +146,14 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit'))
print '<td>'.$langs->trans("DelaysOfToleranceCustomerBillsUnpaid").'</td><td>';
print '<input size="5" name="CustomerBillsUnpaid" value="'. ($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->fournisseur->enabled)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','bill').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>';
print '<input size="5" name="SupplierBillsToPay" value="'. ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . '"> ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->banque->enabled)
{
$var=!$var;
@ -197,15 +205,23 @@ else
if ($conf->commande->enabled)
{
$var=!$var;
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','order').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceOrdersToProcess").'</td><td>' . ($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->fournisseur->enabled)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','order').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSuppliersOrdersToProcess").'</td><td>' . ($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->propal->enabled)
{
$var=!$var;
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','propal').'</td>';
print '<td>'.$langs->trans("DelaysOfTolerancePropalsToClose").'</td><td>' . ($conf->global->MAIN_DELAY_PROPALS_TO_CLOSE+0). ' ' . $langs->trans("days") . '</td></tr>';
@ -213,7 +229,7 @@ else
if ($conf->propal->enabled)
{
$var=!$var;
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','propal').'</td>';
print '<td>'.$langs->trans("DelaysOfTolerancePropalsToBill").'</td><td>' . ($conf->global->MAIN_DELAY_PROPALS_TO_BILL+0) . ' ' . $langs->trans("days") . '</td></tr>';
@ -221,7 +237,7 @@ else
if ($conf->service->enabled)
{
$var=!$var;
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','service').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceNotActivatedServices").'</td><td>' . ($conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES+0) . ' ' . $langs->trans("days") . '</td></tr>';
@ -229,20 +245,12 @@ else
if ($conf->service->enabled)
{
$var=!$var;
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','service').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceRunningServices").'</td><td>' . ($conf->global->MAIN_DELAY_RUNNING_SERVICES+0). ' ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->fournisseur->enabled)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','bill').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>' . ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->facture->enabled)
{
$var=!$var;
@ -251,13 +259,21 @@ else
print '<td>'.$langs->trans("DelaysOfToleranceCustomerBillsUnpaid").'</td><td>' . ($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->fournisseur->enabled)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','bill').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>' . ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . ' ' . $langs->trans("days") . '</td></tr>';
}
if ($conf->banque->enabled)
{
$var=!$var;
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','account').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceTransactionsToConciliate").'</td><td>' . ($conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE+0) . ' ' . $langs->trans("days") . '</td></tr>';
$var=!$var;
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20px">'.img_object('','account').'</td>';
print '<td>'.$langs->trans("DelaysOfToleranceChequesToDeposit").'</td><td>' . ($conf->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT+0) . ' ' . $langs->trans("days") . '</td></tr>';

6
htdocs/comm/action/class/actioncomm.class.php
View File

@ -409,9 +409,9 @@ class ActionComm extends CommonObject
/**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \param user Objet user
* \return int <0 si ko, >0 si ok
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @return int <0 if KO, >0 if OK
*/
function load_board($user)
{

8
htdocs/comm/propal/class/propal.class.php
View File

@ -1851,10 +1851,10 @@ class Propal extends CommonObject
/**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \param user Objet user
* \param mode "opened" pour propal a fermer, "signed" pour propale a facturer
* \return int <0 si ko, >0 si ok
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @param mode "opened" pour propal a fermer, "signed" pour propale a facturer
* @return int <0 if KO, >0 if OK
*/
function load_board($user,$mode)
{

8
htdocs/commande/class/commande.class.php
View File

@ -2035,9 +2035,9 @@ class Commande extends CommonObject
/**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \param user Objet user
* \return int <0 si ko, >0 si ok
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @return int <0 if KO, >0 if OK
*/
function load_board($user)
{
@ -2066,7 +2066,7 @@ class Commande extends CommonObject
while ($obj=$this->db->fetch_object($resql))
{
$this->nbtodo++;
if ($obj->fk_statut != 3 && $this->db->jdate($obj->datec) < ($now - $conf->commande->traitement->warning_delay)) $this->nbtodolate++;
if ($obj->fk_statut != 3 && $this->db->jdate($obj->datec) < ($now - $conf->commande->client->warning_delay)) $this->nbtodolate++;
}
return 1;
}

10
htdocs/commande/liste.php
View File

@ -212,7 +212,7 @@ if ($resql)
print '</td>';
print '<td width="20" class="nobordernopadding" nowrap="nowrap">';
if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_commande) < ($now - $conf->commande->traitement->warning_delay)) print img_picto($langs->trans("Late"),"warning");
if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_commande) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning");
print '</td>';
print '<td width="16" align="right" class="nobordernopadding">';
@ -244,7 +244,7 @@ if ($resql)
print ' <a href="'.$_SERVER['PHP_SELF'].'?orderyear='.$y.'&amp;ordermonth='.$m.'">'.$ml.'</a>';
print ' <a href="'.$_SERVER['PHP_SELF'].'?orderyear='.$y.'">'.$y.'</a>';
print '</td>';
// Delivery date
$y = dol_print_date($db->jdate($objp->date_livraison),'%Y');
$m = dol_print_date($db->jdate($objp->date_livraison),'%m');
@ -255,12 +255,12 @@ if ($resql)
print ' <a href="'.$_SERVER['PHP_SELF'].'?deliveryyear='.$y.'&amp;deliverymonth='.$m.'">'.$ml.'</a>';
print ' <a href="'.$_SERVER['PHP_SELF'].'?deliveryyear='.$y.'">'.$y.'</a>';
print '</td>';
// Statut
print '<td align="right" nowrap="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).'</td>';
print '</tr>';
$total = $total + $objp->price;
$subtotal = $subtotal + $objp->price;
$i++;

5
htdocs/compta/bank/class/account.class.php
View File

@ -792,12 +792,11 @@ class Account extends CommonObject
}
}
/**
* Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @param filteraccountid To get info for a particular account id
* @return int <0 si ko, >0 si ok
* @return int <0 if KO, >0 if OK
*/
function load_board($user,$filteraccountid=0)
{

2
htdocs/compta/commande/liste.php
View File

@ -152,7 +152,7 @@ if ($resql)
print '</td>';
print '<td width="20" class="nobordernopadding" nowrap="nowrap">';
if (($db->jdate($objp->date_commande) < ($now - $conf->commande->traitement->warning_delay)) && $objp->statutid == 1 ) print img_picto($langs->trans("Late"),"warning");
if (($db->jdate($objp->date_commande) < ($now - $conf->commande->client->warning_delay)) && $objp->statutid == 1 ) print img_picto($langs->trans("Late"),"warning");
print '</td>';
print '<td width="16" align="right" class="nobordernopadding">';

6
htdocs/compta/facture/class/facture.class.php
View File

@ -2788,9 +2788,9 @@ class Facture extends CommonObject
/**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \param user Objet user
* \return int <0 si ko, >0 si ok
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @return int <0 if KO, >0 if OK
*/
function load_board($user)
{

7
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -401,9 +401,10 @@ class RemiseCheque extends CommonObject
}
/**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \param user Objet user
* \return int <0 si ko, >0 si ok
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @param filteraccountid To get info for a particular account id
* @return int <0 if KO, >0 if OK
*/
function load_board($user)
{

8
htdocs/contrat/class/contrat.class.php
View File

@ -1252,10 +1252,10 @@ class Contrat extends CommonObject
/**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \param user Objet user
* \param mode "inactive" pour services a activer, "expired" pour services expires
* \return int <0 si ko, >0 si ok
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @param mode "inactive" pour services a activer, "expired" pour services expires
* @return int <0 if KO, >0 if OK
*/
function load_board($user,$mode)
{

5
htdocs/core/class/conf.class.php
View File

@ -437,11 +437,12 @@ class Conf
// Delais de tolerance des alertes
$this->actions->warning_delay=$this->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
$this->commande->traitement->warning_delay=$this->global->MAIN_DELAY_ORDERS_TO_PROCESS*24*60*60;
$this->commande->client->warning_delay=$this->global->MAIN_DELAY_ORDERS_TO_PROCESS*24*60*60;
$this->commande->fournisseur->warning_delay=$this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS*24*60*60;
$this->propal->cloture->warning_delay=$this->global->MAIN_DELAY_PROPALS_TO_CLOSE*24*60*60;
$this->propal->facturation->warning_delay=$this->global->MAIN_DELAY_PROPALS_TO_BILL*24*60*60;
$this->facture->fournisseur->warning_delay=$this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY*24*60*60;
$this->facture->client->warning_delay=$this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED*24*60*60;
$this->facture->fournisseur->warning_delay=$this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY*24*60*60;
$this->contrat->services->inactifs->warning_delay=$this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES*24*60*60;
$this->contrat->services->expires->warning_delay=$this->global->MAIN_DELAY_RUNNING_SERVICES*24*60*60;
$this->adherent->cotisation->warning_delay=$this->global->MAIN_DELAY_MEMBERS*24*60*60;

44
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1497,9 +1497,53 @@ class CommandeFournisseur extends Commande
$this->total_tva = $xnbp*19.6;
$this->total_ttc = $xnbp*119.6;
}
/**
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @return int <0 if KO, >0 if OK
*/
function load_board($user)
{
global $conf, $user;
$now=gmmktime();
$this->nbtodo=$this->nbtodolate=0;
$clause = " WHERE";
$sql = "SELECT c.rowid, c.date_creation as datec, c.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
$clause = " AND";
}
$sql.= $clause." c.entity = ".$conf->entity;
$sql.= " AND (c.fk_statut BETWEEN 1 AND 2)";
if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
$resql=$this->db->query($sql);
if ($resql)
{
while ($obj=$this->db->fetch_object($resql))
{
$this->nbtodo++;
if ($obj->fk_statut != 3 && $this->db->jdate($obj->datec) < ($now - $conf->commande->fournisseur->warning_delay)) $this->nbtodolate++;
}
return 1;
}
else
{
$this->error=$this->db->error();
return -1;
}
}
}
/**
* \class CommandeFournisseurLigne
* \brief Classe de gestion des lignes de commande

6
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -915,9 +915,9 @@ class FactureFournisseur extends Facture
/**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \param user Objet user
* \return int <0 si ko, >0 si ok
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* @param user Objet user
* @return int <0 if KO, >0 if OK
*/
function load_board($user)
{

3
htdocs/fourn/commande/index.php
View File

@ -34,6 +34,9 @@ $orderid = isset($_GET["orderid"])?$_GET["orderid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'commande_fournisseur', $orderid,'');
$langs->load("suppliers");
$langs->load("orders");
/*
* View

49
htdocs/index.php
View File

@ -299,7 +299,7 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
$board=new Commande($db);
$board->load_board($user);
$board->warning_delay=$conf->commande->traitement->warning_delay/60/60/24;
$board->warning_delay=$conf->commande->client->warning_delay/60/60/24;
$board->label=$langs->trans("OrdersToProcess");
$board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2';
$board->img=img_object($langs->trans("Orders"),"order");
@ -307,6 +307,20 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
$dashboardlines[]=$board;
}
// Number of suppliers orders a deal
if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire)
{
include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
$board=new CommandeFournisseur($db);
$board->load_board($user);
$board->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
$board->label=$langs->trans("SuppliersOrdersToProcess");
$board->url=DOL_URL_ROOT.'/fourn/commande/index.php';
$board->img=img_object($langs->trans("Orders"),"order");
$rowspan++;
$dashboardlines[]=$board;
}
// Number of commercial proposals opened (expired)
if ($conf->propal->enabled && $user->rights->propale->lire)
{
@ -370,23 +384,6 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire)
$rowspan++;
$dashboardlines[]=$board;
}
// Number of supplier invoices (has paid)
if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire)
{
$langs->load("bills");
include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
$board=new FactureFournisseur($db);
$board->load_board($user);
$board->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
$board->label=$langs->trans("SupplierBillsToPay");
$board->url=DOL_URL_ROOT.'/fourn/facture/index.php?filtre=paye:0';
$board->img=img_object($langs->trans("Bills"),"bill");
$rowspan++;
$dashboardlines[]=$board;
}
// Number of invoices customers (has paid)
if ($conf->facture->enabled && $user->rights->facture->lire)
{
@ -403,6 +400,22 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
$dashboardlines[]=$board;
}
// Number of supplier invoices (has paid)
if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire)
{
$langs->load("bills");
include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
$board=new FactureFournisseur($db);
$board->load_board($user);
$board->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
$board->label=$langs->trans("SupplierBillsToPay");
$board->url=DOL_URL_ROOT.'/fourn/facture/index.php?filtre=paye:0';
$board->img=img_object($langs->trans("Bills"),"bill");
$rowspan++;
$dashboardlines[]=$board;
}
// Number of transactions to conciliate
if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id)
{

3
htdocs/langs/en_US/admin.lang
View File

@ -725,7 +725,8 @@ DelaysBeforeWarning=Delays before warning
DelaysOfToleranceBeforeWarning=Tolerance delays before warning
DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
DelaysOfToleranceActionsToDo=Delay tolerance (in days) before alert on planned actions not yet realised
DelaysOfToleranceOrdersToProcess=Delay tolerance (in days) before alert on orders not yet done
DelaysOfToleranceOrdersToProcess=Delay tolerance (in days) before alert on orders not yet processed
DelaysOfToleranceSuppliersOrdersToProcess=Delay tolerance (in days) before alert on suppliers orders not yet processed
DelaysOfTolerancePropalsToClose=Delay tolerance (in days) before alert on proposals to close
DelaysOfTolerancePropalsToBill=Delay tolerance (in days) before alert on proposals not billed
DelaysOfToleranceNotActivatedServices=Tolerance delay (in days) before alert on services to activate

9
htdocs/langs/en_US/orders.lang
View File

@ -20,10 +20,11 @@ CustomerOrder=Customer order
CustomersOrders=Customer's orders
CustomersOrdersRunning=Current customer's orders
CustomersOrdersAndOrdersLines=Customer orders and order's lines
OrdersToValid=Orders to validate
OrdersToBill=Orders to bill
OrdersInProcess=Orders in process
OrdersToProcess=Orders to process
OrdersToValid=Customer's orders to validate
OrdersToBill=Customer's orders to bill
OrdersInProcess=Customer's orders in process
OrdersToProcess=Customer's orders to process
SuppliersOrdersToProcess=Supplier's orders to process
StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Draft
StatusOrderValidatedShort=Validated

3
htdocs/langs/fr_FR/admin.lang
View File

@ -737,7 +737,8 @@ DelaysBeforeWarning= Délais avant alerte
DelaysOfToleranceBeforeWarning= Délais de tolérance avant alerte
DelaysOfToleranceDesc= Cet écran permet de définir les délais de tolérance après lesquels une alerte sera signalée à l'écran par le picto %s, sur chaque élément en retard.
DelaysOfToleranceActionsToDo= Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées
DelaysOfToleranceOrdersToProcess= Tolérance de retard avant alerte (en jours) sur commandes non traitées
DelaysOfToleranceOrdersToProcess= Tolérance de retard avant alerte (en jours) sur commandes clients non traitées
DelaysOfToleranceSuppliersOrdersToProcess= Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées
DelaysOfTolerancePropalsToClose= Tolérance de retard avant alerte (en jours) sur propales à cloturer
DelaysOfTolerancePropalsToBill= Tolérance de retard avant alerte (en jours) sur propales non facturées
DelaysOfToleranceNotActivatedServices= Tolérance de retard avant alerte (en jours) sur services à activer

9
htdocs/langs/fr_FR/orders.lang
View File

@ -20,10 +20,11 @@ CustomerOrder=Commande client
CustomersOrders=Commandes clients
CustomersOrdersRunning=Commandes clients en cours
CustomersOrdersAndOrdersLines=Commandes clients et lignes de commandes
OrdersToValid=Commandes à valider
OrdersToBill=Commandes à facturer
OrdersInProcess=Commandes en traitement
OrdersToProcess=Commandes à traiter
OrdersToValid=Commandes clients à valider
OrdersToBill=Commandes clients à facturer
OrdersInProcess=Commandes clients en traitement
OrdersToProcess=Commandes clients à traiter
SuppliersOrdersToProcess=Commandes fournisseurs à traiter
StatusOrderCanceledShort=Annulée
StatusOrderDraftShort=Brouillon
StatusOrderValidatedShort=Validée