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.

Sign up for GitHub

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

Jump to bottom

FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) FPC21 #22278

Merged
merged 6 commits into from Oct 8, 2022
Merged

FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) FPC21 #22278

merged 6 commits into from Oct 8, 2022

Conversation

aspangaro
Copy link
Member

Based on customer return

Add possibility to reconcile operation :

  • On manuel & auto mode directly on subledger (not only on transfert)
  • On the same journal (Example : One customer invoice and one credit note)
  • Reconcile with a manuel entry & generated entry (coming from a module)

@eldy eldy changed the base branch from 16.0 to develop September 24, 2022 16:59
@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 Sep 24, 2022
@aspangaro aspangaro added PR OK to merge PR was analyzed by PR merger and seems ok to be validated. Merge may occurs soon... and removed 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) labels Oct 1, 2022
@aspangaro aspangaro requested a review from eldy October 2, 2022 16:13
@eldy
Copy link
Member

eldy commented Oct 6, 2022

@aspangaro Can you help me to solve conflict on this PR ?

@eldy eldy added 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) and removed PR OK to merge PR was analyzed by PR merger and seems ok to be validated. Merge may occurs soon... labels Oct 6, 2022
@aspangaro aspangaro added PR OK to merge PR was analyzed by PR merger and seems ok to be validated. Merge may occurs soon... and removed 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) labels Oct 7, 2022
@eldy eldy merged commit 8d2a708 into Dolibarr:develop Oct 8, 2022
@aspangaro aspangaro changed the title FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) FPC21 Nov 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eldy eldy Awaiting requested review from eldy

Assignees
No one assigned
Labels
PR OK to merge PR was analyzed by PR merger and seems ok to be validated. Merge may occurs soon...
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aspangaro @eldy @stickler-ci