Gh6543 #6561
Merged
Gh6543 #6561
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
solved Conflicts: src/actions/WindowActions.js
solved Conflicts: backend/de.metas.acct.base/src/main/sql/postgresql/system/43-de.metas.acct/5558090_sys_app_cleanup_AD_ModelValidator_AcctModuleInterceptor.sql backend/de.metas.adempiere.adempiere/base/src/test/java/de/metas/cache/CacheInvalidationRemoteHandlerTest.java backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5558060_sys_gh6532_AddRefereceFromProductToBomLine.sql backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5558080_sys_gh6534_AddFiltersTo_StorageConferenceVersion_Lagerkonferenz.sql backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5558180_sys_gh6545_extend_smtp_password_column_to_255.sql backend/de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/system/70-de.metas.fresh/5557970_sys_gh6527_RecreateFunctions.sql
solve Conflicts: backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/payment_allocation/process/PaymentsViewAllocateCommand.java backend/metasfresh-webui-api/src/test/java/de/metas/ui/web/payment_allocation/process/PaymentsViewAllocateCommandTest.java
…#2699) * Initial skeleton to render the modal when menu item is accessed #6504 * Add store placeholder for commentPanel #6504 * Basic functionality #6504 * Add date format #6504 * Layout changes boxes #6504 * Updates to layout and date format #6504 * Fix the minus input issue in the form #6504 * Add unit tests #6504 * Preserve new lines and updated unit tests #6504 * Hooked the ALT+T combination for opening the comments * Shaped the test such that it wont fail in jenkins * Added form element #6504 * Reshaped the code after review #6504 * Documented the apiCall function within WindowActions #6504 Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com> Co-authored-by: TheBestPessimist <cristian@tbp.land>
solved Conflicts: frontend/src/__tests__/components/comments/CommentsPanel.test.js frontend/src/__tests__/components/comments/CommentsPanelForm.test.js frontend/src/__tests__/components/comments/CommentsPanelListing.test.js frontend/src/__tests__/components/comments/CommentsPanelListingItem.test.js frontend/src/actions/CommentsPanelActions.js frontend/src/components/comments/CommentsPanel.js frontend/src/components/comments/CommentsPanelForm.js frontend/src/components/comments/CommentsPanelListing.js frontend/src/components/comments/CommentsPanelListingItem.js frontend/src/constants/CommentTypes.js frontend/src/reducers/commentsPanel.js
…o gh6543 # Conflicts: # backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/FixedConversionRateMap.java # backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5558170_sys_gh6543MakingCurrencyRateEditable.sql
…o gh6543 # Conflicts: # backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/FixedConversionRateMap.java # backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5558170_sys_gh6543MakingCurrencyRateEditable.sql #6543 Also setting currency rate after updating the line's context for both bank statements and gl journal entries.
solved Conflicts: backend/de.metas.adempiere.adempiere/base/src/main/java-gen/org/compiere/model/I_CM_Chat.java backend/de.metas.adempiere.adempiere/base/src/main/java-gen/org/compiere/model/I_CM_ChatEntry.java backend/de.metas.device.scales/src/test/java/de/metas/device/scales/endpoint/TcpConnectionEndPointTest.java backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/window/model/DocumentStandardAction.java e2e/cypress/fixtures/contracts/flatrate_conditions_material_tracking_spec.json e2e/cypress/integration/contracts/flatrate_conditions_material_tracking_spec.js e2e/cypress/integration/misc/pricesystem_pricelist_plv_setup_spec.js e2e/cypress/support/utils/pricelist.js
..at least in this branch
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.
#6543