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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
dbb0fa09
Commit
dbb0fa09
authored
11 years ago
by
Juanjo Menent
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Debug of withdrawals rejects
parent
6c4e4751
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/compta/prelevement/class/rejetprelevement.class.php
+2
-2
2 additions, 2 deletions
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
+19
-5
19 additions, 5 deletions
htdocs/compta/prelevement/ligne.php
with
21 additions
and
7 deletions
htdocs/compta/prelevement/class/rejetprelevement.class.php
+
2
−
2
View file @
dbb0fa09
<?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-201
1
Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-201
3
Juanjo Menent <jmenent@2byte.es>
*
* 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
...
...
@@ -50,7 +50,7 @@ class RejetPrelevement
$this
->
motifs
=
array
();
$this
->
facturer
=
array
();
$this
->
motifs
[
0
]
=
$langs
->
trans
(
"StatusMotif0"
);
$this
->
motifs
[
0
]
=
""
;
//
$langs->trans("StatusMotif0");
$this
->
motifs
[
1
]
=
$langs
->
trans
(
"StatusMotif1"
);
$this
->
motifs
[
2
]
=
$langs
->
trans
(
"StatusMotif2"
);
$this
->
motifs
[
3
]
=
$langs
->
trans
(
"StatusMotif3"
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/prelevement/ligne.php
+
19
−
5
View file @
dbb0fa09
...
...
@@ -55,12 +55,24 @@ if ($action == 'confirm_rejet')
{
$daterej
=
mktime
(
2
,
0
,
0
,
GETPOST
(
'remonth'
,
'int'
),
GETPOST
(
'reday'
,
'int'
),
GETPOST
(
'reyear'
,
'int'
));
if
(
empty
(
$daterej
))
{
$error
++
;
setEventMessage
(
$langs
->
trans
(
"ErrorFieldRequired"
,
$langs
->
trans
(
"Date"
)),
'errors'
);
}
if
(
GETPOST
(
'motif'
,
'alpha'
)
==
0
)
{
$error
++
;
setEventMessage
(
$langs
->
trans
(
"ErrorFieldRequired"
,
$langs
->
transnoentities
(
"RefusedReason"
)),
'errors'
);
}
$lipre
=
new
LignePrelevement
(
$db
,
$user
);
if
(
$lipre
->
fetch
(
$id
)
==
0
)
{
if
(
GETPOST
(
'motif'
,
'alpha'
)
>
0
&&
$daterej
<
time
())
if
(
!
$error
&&
$daterej
<
time
())
{
$rej
=
new
RejetPrelevement
(
$db
,
$user
);
...
...
@@ -73,8 +85,8 @@ if ($action == 'confirm_rejet')
{
dol_syslog
(
"Motif : "
.
GETPOST
(
'motif'
,
'alpha'
));
dol_syslog
(
"
$daterej
$time
"
);
header
(
"Location: ligne.php?id="
.
$id
.
"&action=rejet"
);
exit
;
$action
=
"rejet"
;
}
}
}
...
...
@@ -305,9 +317,11 @@ if ($id)
{
dol_print_error
(
$db
);
}
$db
->
close
();
}
dol_htmloutput_mesg
(
$mesg
);
llxFooter
();
$db
->
close
();
?>
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