diff --git a/ChangeLog b/ChangeLog index 5d0669cb33f..1f4349b7175 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 2.9 compared to 2.8 ***** For users: +- New: POS module allow to choose which warehouse use. - New: Support "Department/State" field on contact and members card. - New: Can reopen a refused/canceled supplier order. - New: Add Gant diagramm on project module. diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index 49f913b96b9..77e20b63fb3 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -31,6 +31,7 @@ if ( $_SESSION['uid'] <= 0 ) { exit; } + print ''; print ''."\n"; @@ -58,7 +59,7 @@ print ''."\n"; print ''."\n"; -if (!empty($error)) +if (!empty($error)) { print $error; print ''; diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index 54715628826..68bfb3d1c56 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -1,6 +1,6 @@ - * Copyright (C) 2009 Laurent Destailleur + * Copyright (C) 2009-2010 Laurent Destailleur * * 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 @@ -41,13 +41,15 @@ $conf_db_base = $dolibarr_main_db_name; // Identifiant unique correspondant au tiers generique pour la vente $conf_fksoc = $conf->global->CASHDESK_ID_THIRDPARTY; // Identifiant unique correspondant au compte caisse / liquide -$conf_fkaccount_cash = $conf->global->CASHDESK_ID_BANKACCOUNT_CASH > 0?$conf->global->CASHDESK_ID_BANKACCOUNT_CASH:$_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"]; +$conf_fkaccount_cash = (! empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"]))?$_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"]:($conf->global->CASHDESK_ID_BANKACCOUNT_CASH>0?$conf->global->CASHDESK_ID_BANKACCOUNT_CASH:0); // Identifiant unique correspondant au compte cheque -$conf_fkaccount_cheque = $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE > 0?$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE:$_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"]; +$conf_fkaccount_cheque = (! empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"]))?$_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"]:($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE>0?$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE:0); // 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 = (! empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"]))?$_SESSION["CASHDESK_ID_BANKACCOUNT_CB"]:($conf->global->CASHDESK_ID_BANKACCOUNT_CB>0?$conf->global->CASHDESK_ID_BANKACCOUNT_CB:0); // Identifiant unique correspondant a l'entrepot a utiliser -$conf_fkentrepot = $conf->global->CASHDESK_ID_WAREHOUSE > 0?$conf->global->CASHDESK_ID_WAREHOUSE:$_SESSION["CASHDESK_ID_WAREHOUSE"]; +$conf_fkentrepot = (! empty($_SESSION["CASHDESK_ID_WAREHOUSE"]))?$_SESSION["CASHDESK_ID_WAREHOUSE"]:($conf->global->CASHDESK_ID_WAREHOUSE>0?$conf->global->CASHDESK_ID_WAREHOUSE:0); +//var_dump($_SESSION); + // Check if setup ok $error = ''; @@ -59,11 +61,6 @@ if ($conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkacco { $error.= '
Setup of CashDesk module not complete. Bank account not defined
'; } -// If we setup stock module to ask movement on invoices, with must not work if required setup not finished. -if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL && empty($conf_fkentrepot)) -{ - $error.= '
Setup of CashDesk module not complete. You ask to decrease stock on invoice creation but warehouse for this is not defined (Change stock module setup, or complete point of sale module setup).
'; -} // Parametres d'affichage $conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index 9c9cb5cc712..0ad3e748eff 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -78,12 +78,14 @@ $formproduct=new FormProduct($db);
-

CAISSE : identification

+

-
+
+