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

Fix: disable warehouse

Browse Source
This commit is contained in:
Regis Houssin 2009-11-12 07:48:23 +00:00
parent 7b6dcc73c8
commit 211b47f417
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/cashdesk/include/environnement.php
View File

@ -45,7 +45,7 @@ $conf_fkaccount_cheque = $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE > 0?$conf
// Identifiant unique correspondant au compte cb // Identifiant unique correspondant au compte cb
$conf_fkaccount_cb = $conf->global->CASHDESK_ID_BANKACCOUNT_CB > 0?$conf->global->CASHDESK_ID_BANKACCOUNT_CB:$_SESSION["CASHDESK_ID_BANKACCOUNT_CB"]; $conf_fkaccount_cb = $conf->global->CASHDESK_ID_BANKACCOUNT_CB > 0?$conf->global->CASHDESK_ID_BANKACCOUNT_CB:$_SESSION["CASHDESK_ID_BANKACCOUNT_CB"];
// Identifiant unique correspondant a l'entrepot associe a la caisse // Identifiant unique correspondant a l'entrepot associe a la caisse
$conf_fkentrepot = $conf->global->CASHDESK_ID_WAREHOUSE > 0?$conf->global->CASHDESK_ID_WAREHOUSE:$_SESSION["CASHDESK_ID_WAREHOUSE"]; //$conf_fkentrepot = $conf->global->CASHDESK_ID_WAREHOUSE > 0?$conf->global->CASHDESK_ID_WAREHOUSE:$_SESSION["CASHDESK_ID_WAREHOUSE"];
// Check if setup ok // Check if setup ok
$error = ''; $error = '';
@ -57,11 +57,13 @@ if ($conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkacco
{ {
$error.= '<div class="error">Setup of CashDesk module not complete. Bank account not defined</div>'; $error.= '<div class="error">Setup of CashDesk module not complete. Bank account not defined</div>';
} }
// TODO: ajouter gestion entrepot
/*
if ($conf->stock->enabled && empty($conf_fkentrepot)) if ($conf->stock->enabled && empty($conf_fkentrepot))
{ {
$error.= '<div class="error">Setup of CashDesk module not complete. Warehouse not defined</div>'; $error.= '<div class="error">Setup of CashDesk module not complete. Warehouse not defined</div>';
} }
*/
// Parametres d'affichage // Parametres d'affichage
$conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes $conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes
$conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes $conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes

3
htdocs/cashdesk/templates/menu.tpl.php
View File

@ -46,12 +46,15 @@ if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE))
$bankcheque->fetch($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE); $bankcheque->fetch($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE);
$bankchequeLink = $bankcheque->getNomUrl(1); $bankchequeLink = $bankcheque->getNomUrl(1);
} }
// TODO: ajouter gestion entrepot
/*
if (!empty($conf->global->CASHDESK_ID_WAREHOUSE)) if (!empty($conf->global->CASHDESK_ID_WAREHOUSE))
{ {
$warehouse=new Entrepot($db); $warehouse=new Entrepot($db);
$warehouse->fetch($conf->global->CASHDESK_ID_WAREHOUSE); $warehouse->fetch($conf->global->CASHDESK_ID_WAREHOUSE);
$warehouseLink = $warehouse->getNomUrl(1); $warehouseLink = $warehouse->getNomUrl(1);
} }
*/
$langs->load("@cashdesk"); $langs->load("@cashdesk");
$langs->load("main"); $langs->load("main");