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
f03ffaf5
Commit
f03ffaf5
authored
10 years ago
by
Juanjo Menent
Browse files
Options
Downloads
Patches
Plain Diff
Fix: withdrawal create error if in the same month are deleted previus
withdrawals. Conflicts: ChangeLog
parent
e20c1dec
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+2
-0
2 additions, 0 deletions
ChangeLog
htdocs/compta/prelevement/class/bonprelevement.class.php
+3
-2
3 additions, 2 deletions
htdocs/compta/prelevement/class/bonprelevement.class.php
with
5 additions
and
2 deletions
ChangeLog
+
2
−
0
View file @
f03ffaf5
...
@@ -172,6 +172,8 @@ Dolibarr better:
...
@@ -172,6 +172,8 @@ Dolibarr better:
***** ChangeLog for 3.6.3 compared to 3.6.2 *****
***** ChangeLog for 3.6.3 compared to 3.6.2 *****
- Fix: ref_ext was not saved when recording a customer order from web service
- Fix: ref_ext was not saved when recording a customer order from web service
- Fix: amarok is a bugged theme making dolidroid failed. We swith to eldy automatically with dolidroid.
- Fix: withdrawal create error if in the same month are deleted previus withdrawals.
***** ChangeLog for 3.6.2 compared to 3.6.1 *****
***** ChangeLog for 3.6.2 compared to 3.6.1 *****
- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/prelevement/class/bonprelevement.class.php
+
3
−
2
View file @
f03ffaf5
<?php
<?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-201
4
Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-201
5
Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
*
*
...
@@ -895,10 +895,11 @@ class BonPrelevement extends CommonObject
...
@@ -895,10 +895,11 @@ class BonPrelevement extends CommonObject
{
{
$ref
=
"T"
.
substr
(
$year
,
-
2
)
.
$month
;
$ref
=
"T"
.
substr
(
$year
,
-
2
)
.
$month
;
$sql
=
"SELECT
count(*
)"
;
$sql
=
"SELECT
CAST(RIGHT(ref,2) AS SIGNED INTEGER
)"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"prelevement_bons"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"prelevement_bons"
;
$sql
.
=
" WHERE ref LIKE '"
.
$ref
.
"%'"
;
$sql
.
=
" WHERE ref LIKE '"
.
$ref
.
"%'"
;
$sql
.
=
" AND entity = "
.
$conf
->
entity
;
$sql
.
=
" AND entity = "
.
$conf
->
entity
;
$sql
.
=
" ORDER BY ref DESC LIMIT 1"
;
dol_syslog
(
get_class
(
$this
)
.
"::Create"
,
LOG_DEBUG
);
dol_syslog
(
get_class
(
$this
)
.
"::Create"
,
LOG_DEBUG
);
$resql
=
$this
->
db
->
query
(
$sql
);
$resql
=
$this
->
db
->
query
(
$sql
);
...
...
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