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
d16ce7eb
Commit
d16ce7eb
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Bad var
parent
362167f3
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/comm/action/class/actioncomm.class.php
+1
-1
1 addition, 1 deletion
htdocs/comm/action/class/actioncomm.class.php
test/phpunit/NumberingModulesTest.php
+2
-2
2 additions, 2 deletions
test/phpunit/NumberingModulesTest.php
with
3 additions
and
3 deletions
htdocs/comm/action/class/actioncomm.class.php
+
1
−
1
View file @
d16ce7eb
...
...
@@ -142,7 +142,7 @@ class ActionComm extends CommonObject
$userdoneid
=
$this
->
userdoneid
;
// Be sure assigned user array is not empty.
if
(
count
(
$this
->
userassigned
)
==
0
)
$this
->
userassigned
=
array
(
'id'
=>
$
this
->
$
userownerid
);
if
(
count
(
$this
->
userassigned
)
==
0
)
$this
->
userassigned
=
array
(
'id'
=>
$userownerid
);
if
(
!
$this
->
type_id
||
!
$this
->
type_code
)
{
...
...
This diff is collapsed.
Click to expand it.
test/phpunit/NumberingModulesTest.php
+
2
−
2
View file @
d16ce7eb
...
...
@@ -165,7 +165,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$this
->
assertEquals
(
1
,
$result
);
// Can be deleted
$result
=
$localobject
->
is_erasable
();
print
__METHOD__
.
" is_erasable="
.
$result
.
"
\n
"
;
$this
->
assertEquals
(
0
,
$result
,
'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice'
);
// 1 can no more be deleted (2 is more recent
$this
->
assertEquals
(
0
,
$result
,
'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice'
);
// 1 can no more be deleted (2 is more recent
)
// Now we try with a reset
$conf
->
global
->
FACTURE_MERCURE_MASK_CREDIT
=
'{yyyy}-{0000@1}'
;
...
...
@@ -552,7 +552,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$localobject
=
new
Facture
(
$this
->
savdb
);
$localobject
->
initAsSpecimen
();
$localobject
->
date
=
dol_mktime
(
12
,
0
,
0
,
1
,
1
,
1982
);
// we use year 198
0
to be sure to not have existing invoice for this year
$localobject
->
date
=
dol_mktime
(
12
,
0
,
0
,
1
,
1
,
1982
);
// we use year 198
2
to be sure to not have existing invoice for this year
$numbering
=
new
mod_facture_mercure
();
$result
=
$numbering
->
getNextValue
(
$tmpthirdparty
,
$localobject
);
$result2
=
$localobject
->
create
(
$user
,
1
);
...
...
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