Merge tenacious_d_uat to master #10504
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
Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
* #10412 - Added HaddexCheck, DateHaddexCheck and HaddexControlNr columns to m_product table - Added fields to product window - added sys config MAX_HADDEX_DATE - added error msg - when trying to add a product to a sales orderline, if current date - product.haddexcheckdate (in months) > the added sys config, throw error msg. * #10412 - Added sales order check. * #10412 - Update Sys Config Name * Changed fields two fields: SYS_CONFIG_MAX_HADDEX_AGE_IN_MONTHS and MSG_HADDEX_CHECK_ERROR; and two methods: checkHaddexDate and getMaxHaddexAgeInMonths * Changing the differenceBetweenHaddexCheckDateAndPromisedDateInMonths * Adding messagens, translations, and sysconfig * Updating key for error message * Updating sysconfig * Solving duplicated sysconfig and message * Updating MessageKey as teo suggested * Updating MessageKey * Updating AD_Messages and AD_Message_Trl. de_DE must be the default! * Updating sysconfig message and using order instead orderline to access DatePromised. * Update backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5575110_sys_gh10412_AddSysconfig.sql * Update backend/de.metas.business/src/main/java/de/metas/order/model/interceptor/C_OrderLine.java * Update backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5575110_sys_gh10412_AddSysconfig.sql * Update backend/de.metas.business/src/main/java/de/metas/order/model/interceptor/C_OrderLine.java Co-authored-by: arthurlmf <arthurlucio@gmail.com> Co-authored-by: Tobias Schöneberg <metas-ts@users.noreply.github.com>
# Conflicts: # frontend/src/constants/Constants.js
cristinamghita
approved these changes
Jan 8, 2021
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.
No description provided.