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

New classify billed order without invoice #29614

Merged

Conversation

atm-etienne
Copy link
Contributor

NEW [Add conf to allow or not to classify billed a supplier order without invoice]

New conf to allow or not to classify billed a supplier order without invoice
Add new visible conf to replace the old hide one, to disallow to classify billed an order from itself, without invoice

@eldy
Copy link
Member

eldy commented May 10, 2024

Can you update merge last version and repush it. It seems your branch is protected and I can't contribute to fix it myself.

@eldy eldy added the PR to fix or conflict to solve PR needs to be fixed to be integrated (except for conflicts, a comment describes the fix to do) label May 10, 2024
htdocs/admin/invoice.php Outdated Show resolved Hide resolved
htdocs/admin/invoice.php Outdated Show resolved Hide resolved
@eldy eldy added the PR OK to merge (but suggested fix required) PR was analyzed by PR merger and seems ok to be merged as soon as a fix has been published label May 13, 2024
@atm-etienne
Copy link
Contributor Author

I did a new commit according to your feedback, but a conflict on htdocs/admin/commande.php appears, which I don't have while I do the same thing on my local repository, with the same branches, and I can't see what this is about

@eldy
Copy link
Member

eldy commented May 15, 2024

If you make a pull of the develop branch into your working branch, you should get the conflict. I ca'nt fix it myself, it seems you repo is forbidden to external contrib.

…EW_classify_billed_order_without_invoice
@atm-etienne
Copy link
Contributor Author

I did not have conflict while merging on local, but it's now possible to merge

@eldy eldy merged commit dc8b79e into Dolibarr:develop May 22, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR OK to merge (but suggested fix required) PR was analyzed by PR merger and seems ok to be merged as soon as a fix has been published PR to fix or conflict to solve PR needs to be fixed to be integrated (except for conflicts, a comment describes the fix to do)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants