diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index 60dda7f948d..71b922551a4 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -45,7 +45,7 @@ $conf_fkaccount_cheque = $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE > 0?$conf // 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"]; // 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 $error = ''; @@ -57,11 +57,13 @@ if ($conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkacco { $error.= '
Setup of CashDesk module not complete. Bank account not defined
'; } +// TODO: ajouter gestion entrepot +/* if ($conf->stock->enabled && empty($conf_fkentrepot)) { $error.= '
Setup of CashDesk module not complete. Warehouse not defined
'; } - +*/ // Parametres d'affichage $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 diff --git a/htdocs/cashdesk/templates/menu.tpl.php b/htdocs/cashdesk/templates/menu.tpl.php index dac92908bec..002d477ddfd 100644 --- a/htdocs/cashdesk/templates/menu.tpl.php +++ b/htdocs/cashdesk/templates/menu.tpl.php @@ -46,12 +46,15 @@ if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE)) $bankcheque->fetch($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE); $bankchequeLink = $bankcheque->getNomUrl(1); } +// TODO: ajouter gestion entrepot +/* if (!empty($conf->global->CASHDESK_ID_WAREHOUSE)) { $warehouse=new Entrepot($db); $warehouse->fetch($conf->global->CASHDESK_ID_WAREHOUSE); $warehouseLink = $warehouse->getNomUrl(1); } +*/ $langs->load("@cashdesk"); $langs->load("main");