Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
211b47f4
Commit
211b47f4
authored
Nov 12, 2009
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: disable warehouse
parent
7b6dcc73
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/cashdesk/include/environnement.php
+4
-2
4 additions, 2 deletions
htdocs/cashdesk/include/environnement.php
htdocs/cashdesk/templates/menu.tpl.php
+3
-0
3 additions, 0 deletions
htdocs/cashdesk/templates/menu.tpl.php
with
7 additions
and
2 deletions
htdocs/cashdesk/include/environnement.php
+
4
−
2
View file @
211b47f4
...
...
@@ -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
.
=
'<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))
{
$error.= '<div class="error">Setup of CashDesk module not complete. Warehouse not defined</div>';
}
*/
// 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
...
...
This diff is collapsed.
Click to expand it.
htdocs/cashdesk/templates/menu.tpl.php
+
3
−
0
View file @
211b47f4
...
...
@@ -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"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment