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

Final Invoice Creation Process #17831

Merged
merged 23 commits into from
Apr 19, 2024
Merged

Final Invoice Creation Process #17831

merged 23 commits into from
Apr 19, 2024

Conversation

dm-ps
Copy link
Contributor

@dm-ps dm-ps commented Apr 11, 2024

refs: #17811

@dm-ps
fix unit tests
d2af717
@dm-ps
refactoring
0268d60
@dm-ps
Merge branch 'inner_silence_uat' into inner_silence_uat_gh17811
03e4fca 
# Conflicts:
#	backend/de.metas.contracts/src/main/java-gen/de/metas/contracts/model/I_ModCntr_Module.java
#	backend/de.metas.contracts/src/main/java-gen/de/metas/contracts/model/X_ModCntr_Module.java
#	backend/de.metas.contracts/src/main/java/de/metas/contracts/modular/log/ModularContractLogDAO.java
#	backend/de.metas.contracts/src/main/java/de/metas/contracts/modular/log/ModularContractLogQuery.java
#	backend/de.metas.contracts/src/test/java/de/metas/contracts/invoicecandidate/FlatrateTermHandlerTest.java
#	backend/de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/invoicecandidate/model/X_C_Invoice_Candidate.java
teosarca
teosarca requested changes Apr 11, 2024
View reviewed changes
Copy link
Member

@teosarca teosarca left a comment

Choose a reason for hiding this comment

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

check my comments

@dm-ps
Merge branch 'inner_silence_uat' into inner_silence_uat_gh17811
2102ade 
# Conflicts:
#	backend/de.metas.contracts/src/main/java-gen/de/metas/contracts/model/X_ModCntr_Module.java
@dm-ps
contract specific prices
d8e9113
@dm-ps
Merge branch 'inner_silence_uat' into inner_silence_uat_gh17811
340c045
@dm-ps
consider only the completed modular contracts
efce4fa
@dm-ps
Merge branch 'inner_silence_uat' into inner_silence_uat_gh17811
8dbdaff 
# Conflicts:
#	backend/de.metas.contracts/src/main/java/de/metas/contracts/modular/log/ModularContractLogDAO.java
#	backend/de.metas.contracts/src/main/java/de/metas/contracts/modular/settings/ModularContractModuleId.java
#	backend/de.metas.contracts/src/test/java/de/metas/contracts/invoicecandidate/FlatrateTermHandlerTest.java
@dm-ps
fix cucumber
cb22748
@dm-ps
add computing method
aeba761
teosarca
teosarca previously requested changes Apr 19, 2024
View reviewed changes
Copy link
Member

@teosarca teosarca left a comment

Choose a reason for hiding this comment

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

pls check my comments; pls check/test my last QA commits

@metas-rc metas-rc dismissed teosarca’s stale review April 19, 2024 12:38

Rechecked and all seems covered now. Dismissing review since Teo is not available.

@dm-ps dm-ps merged commit 7cb4f03 into inner_silence_uat Apr 19, 2024
26 of 28 checks passed
@dm-ps dm-ps deleted the inner_silence_uat_gh17811 branch April 19, 2024 12:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teosarca teosarca teosarca left review comments

@metas-ts metas-ts metas-ts left review comments

@mrie04 mrie04 mrie04 left review comments

@metas-rc metas-rc metas-rc approved these changes

Assignees
No one assigned
Labels
branch:inner_silence_uat branch:master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dm-ps @teosarca @metas-ts @metas-rc @mrie04