-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FIX #25853 Thirdparty Massaction #25868
Conversation
// if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1); | ||
// if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2); | ||
if (isset($this->total_localtax1)) { | ||
$this->total_localtax1=trim($this->total_localtax1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Welcome back juanjo !
We should not use trim here, because total_localtax1 should be a float here when calling the method. And trim is designed for string. May be you want to do this ?
if (empty($this->total_localtax1)) {
$this->total_localtax1 = 0;
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you Laurent for the welcome,
Ok, I had only uncommented the lines, now changed by empty check and make and also done for total_ttc
# Conflicts: # htdocs/core/lib/functions.lib.php
if (empty($this->total_localtax2)) { | ||
$this->total_localtax2 = 0; | ||
} | ||
if (empty($this->total_ttc)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@eldy @simnandez
On develop you have "if (isset($this->total_ttc)) {" and maybe it not needeed for yout fix (can occur conflicts with develop branch)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, solution is to edit the suggestion to restore code for this line as it is done in v20 so this should avoid any conflict and has same effect than the suggested code.
So we can validate the PR just after.
Done.
same point as lvessiller |
No description provided.