MERGING release/24.04 into main #55
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MERGING RELEASE branches
CM-485: added BenefitConsumption entity
hotfix-validation: fix unique name
CM-486: update of payroll generation process - based on BenefitConsumption entity
* CM-489: added adjustments in backend related to maker-checker logic * CM-489: fixing removing related objects * CM-489: improve querysets * CM-489: improve querysets 2 * CM-489: make public method --------- Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
CM-551: update delete payroll to match new flow
hothix: user adjustment in calcrule
* CM-487: fetch benefit consumptions by payroll * CM-487: add payroll mutation --------- Co-authored-by: Jan <j.dolkowski@soldevelo.com>
…roll_py into feature/CM-487
CM-493: added gql adjustments to attachment
Feature/merge migration
* CM-715: added payroll benefit consumtpion gql to visualize benefits * CM-715: added filtering for benefit plan * CM-315: added missing filters * CM-315: added missing filters2 * CM-715: added benefits summary
…roll_py into hothfix/status-reconc
Hothfix/status reconc
CM-743: note payment date also on bill level
CM-779: added improvements for summary of benefits
Co-authored-by: Jan <j.dolkowski@soldevelo.com>
…#48) Co-authored-by: Jan <j.dolkowski@soldevelo.com>
MERGING develop into release/24.04
* CM-840: added document for opensearch payroll * CM-840: fixed content type for payment cycle document * CM-840: fixed content type for payment cycle document * CM-840: added ndjson dashboard data with new payroll indexes
CM-853: added invoice report/synch data
* CM-840: synchronization of basic data about payments (#50) * CM-840: added document for opensearch payroll * CM-840: fixed content type for payment cycle document * CM-840: fixed content type for payment cycle document * CM-840: added ndjson dashboard data with new payroll indexes * CM-853: added document related to bill entity * CM-853: fixed payroll related instance * CM-853: added benefit relation into quersyet to fetch attachment by payroll * CM-853: changed object type to nested type * CM-853: added invoice report/synch data --------- Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com> Co-authored-by: sniedzielski <sniedzielski@soldevelo.com> Co-authored-by: Jan <jdolkowski@soldevelo.com>
fix location not found
MERGING develop into release/24.04
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
MERGING release/24.04 into main