Skip to content
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

Merged
merged 10 commits into from
Nov 7, 2024
Merged

FIX #25853 Thirdparty Massaction #25868

merged 10 commits into from
Nov 7, 2024

Conversation

simnandez
Copy link
Member

No description provided.

// 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);
Copy link
Member

@eldy eldy Sep 11, 2023

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;
		}

Copy link
Member Author

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

@eldy eldy added the Discussion Some questions or discussions are opened and wait answers of author or other people to be processed label Sep 11, 2023
@lvessiller-opendsi lvessiller-opendsi self-assigned this Jun 20, 2024
if (empty($this->total_localtax2)) {
$this->total_localtax2 = 0;
}
if (empty($this->total_ttc)) {
Copy link
Contributor

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)

Copy link
Member

@eldy eldy Nov 7, 2024

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.

@rycks
Copy link
Contributor

rycks commented Jul 11, 2024

same point as lvessiller

@eldy eldy merged commit 5eb5033 into Dolibarr:18.0 Nov 7, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Discussion Some questions or discussions are opened and wait answers of author or other people to be processed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants