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

Try to sync the pending changes #32604

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open

Try to sync the pending changes #32604

wants to merge 21 commits into from

Conversation

mikee2
Copy link
Contributor

@mikee2 mikee2 commented Jan 9, 2025

FIX|Fix #2

This is a try to, again, sync the changes made years ago that never went into the main branch for whatever reason.

Pull request #1 is still ending and I do not know how to fix that. Please help with instructions.

Thanks.

mikee2 and others added 16 commits January 8, 2022 21:22
Tested changes as of version 14.0.0
Based on code of V14.0.0.

Added function used in later Segment.php
Hi Eldy.

You are right, {object_date} has the inmutable invoice date but the fact is that it is not available in the 'segment' file (or I was not able to find it) so I created the new function in the 'odf' file to retrieve it. It is the only modification to that file.

In the meantime you also are right that __CURRENTDAY__ should give the value relative to the current date to be consistent, not the one of the invoice. As I want, and need, the one on the invoice I have created a new block where 'CURRENT' has been changed by 'INVOICE' to build equivalents to the others (now relative to the current date) but relative to the invoice date.

Hope this clarifies the used tags and validate the changes.
Deleted extra parenthesis.
@eldy
Copy link
Member

eldy commented Jan 10, 2025

Did you send your changes into a PR ? Do you have the number ?
You mention an issue # 1 and # 2 in your PR but they are not related to your code.

@eldy eldy added the Discussion Some questions or discussions are opened and wait answers of author or other people to be processed label Jan 10, 2025
- scripts
- dolibarr/htdocs
- dolibarr/scripts
- dolibarr/htdocs/core
Copy link
Member

@eldy eldy Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should not add this dir here, it is already include into dolibarr/htdocs.
I see no reason tomodify the phpstan.neon.dist for a change that is a feature enhancement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those were suggestions by Git Copilot because I am were not able for many tries to make the pull request to get through the phpStan check. As I am not a very advanced user in Git, I did apply them blindly even though I also though that they were redundant.

I am trying to update the former code that is now not only obsolete, but wrong, and that I have to manually change every new version of Dolibarr is published making painful to apply updates. I know there are other users out there that also had issues with this code and I hope that, by applying the suggested changes, it will help them too.

To match the original file.
Match parameter name to definition
Make substitutionarray fully a compatible (string, string) array
@mikee2
Copy link
Contributor Author

mikee2 commented Jan 11, 2025

Did you send your changes into a PR ? Do you have the number ? You mention an issue # 1 and # 2 in your PR but they are not related to your code.

I am not quite sure. Maybe this is the number: 32604?

This what it show at the top:

Try to sync the pending changes #32604
[mikee2]wants to merge 21 commits into [Dolibarr:develop] from [mikee2:develop]

As told I am not quite good at managing this git thing. But I am learning. Sorry.

@mikee2 mikee2 requested a review from eldy January 11, 2025 16:54
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.

2 participants