fresh 112 #6
Closed
fresh 112 #6
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
…SH-112 solved conflict in .gitignore
… into it_FRESH-112
… into it_FRESH-112
…the embedded broker also for WEBUI runmode
…_valuesWithSpaces)
… incl. editor and fieldgroup minor: adding some getters for properties that are currently used in metasfresh-webui
…h tab, one field per field type incl. editor and fieldgroup
… into it_FRESH-112 # Conflicts: # de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridTabVO.java
… into it_FRESH-112
… (as it is in master branch)
…SH-112 # Conflicts: # de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridField.java # de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/callout/api/ICalloutField.java # de.metas.adempiere.adempiere/base/src/test/java/org/adempiere/ad/callout/api/impl/PlainCalloutField.java # de.metas.business/src/main/java-legacy/org/compiere/model/CalloutOrder.java
homebeaver
pushed a commit
to klst-com/metasfresh
that referenced
this pull request
Feb 13, 2017
metas-ts
added a commit
that referenced
this pull request
Jan 11, 2020
* [#6](metasfresh/metasfresh-edi-legacy#6) STEPcom EDI - Convert between input charset and UTF-8 * [#7](metasfresh/metasfresh-edi-legacy#7) STEPcom EDI - Support customizable output filename prefices
metas-ts
pushed a commit
that referenced
this pull request
Jun 6, 2020
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.
considering to integrate the current state now, in order not to make the difference too big