Merge branch 'master' of github.com:metasfresh/metasfresh

metasfresh · Apr 11, 2019 · 5d8cf56 · 5d8cf56
2 parents a5f7264 + 3b1429e
commit 5d8cf56
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/...resql/system/10-de.metas.adempiere/5518990_sys_gh5121_AddTrlInMenuForCompanyPhoneBook.sql b/...resql/system/10-de.metas.adempiere/5518990_sys_gh5121_AddTrlInMenuForCompanyPhoneBook.sql
@@ -0,0 +1,15 @@
+-- 2019-04-10T11:40:46.406
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Menu SET WEBUI_NameBrowse='Firmenverzeichnis',Updated=TO_TIMESTAMP('2019-04-10 11:40:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=541234
+;
+
+-- 2019-04-10T11:41:03.425
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Menu_Trl SET WEBUI_NameBrowse='Company Phone Book',Updated=TO_TIMESTAMP('2019-04-10 11:41:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Language='en_US' AND AD_Menu_ID=541234
+;
+
+-- 2019-04-10T11:41:09.024
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Menu_Trl SET WEBUI_NameBrowse='Firmenverzeichnis',Updated=TO_TIMESTAMP('2019-04-10 11:41:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Language='de_CH' AND AD_Menu_ID=541234
+;
+
diff --git a/...s.base/src/main/java/de/metas/handlingunits/attribute/impl/PPOrderProductAttributeBL.java b/...s.base/src/main/java/de/metas/handlingunits/attribute/impl/PPOrderProductAttributeBL.java
@@ -302,20 +302,6 @@ private static void updateHUAttributesFromAttributesMap(
 		{
 			final AttributeId attributeId = AttributeId.ofRepoId(existingHUAttribute.getM_Attribute_ID());
 
-			//
-			// Update HU attribute from order's collected attribute
-			if (from.getByAttributeId(attributeId) != null)
-			{
-				final AttributeWithValue attributeWithValue = from.getByAttributeId(attributeId);
-
-				// TODO: shall we skip it if attribute is null and isTransferIfNull=false
-
-				existingHUAttribute.setValue(attributeWithValue.getValueString());
-				existingHUAttribute.setValueNumber(attributeWithValue.getValueNumber());
-				huAttributesRepo.save(existingHUAttribute);
-				logger.trace("Updated {}/{} from {}", hu, existingHUAttribute, attributeWithValue);
-			}
-
 			//
 			// SerialNo
 			if (serialNoAttributeId != null
@@ -330,8 +316,26 @@ private static void updateHUAttributesFromAttributesMap(
 					existingHUAttribute.setValueNumber(null);
 					huAttributesRepo.save(existingHUAttribute);
 					logger.trace("Updated SerialNo {}/{} to {}", hu, existingHUAttribute, serialNo);
+
+					// IMPORTANT: If we have a configured SerialNo we shall use it.
+					// In this case we shall ignore the SerialNo which was collected from issued HUs.
+					continue;
 				}
 			}
+
+			//
+			// Update HU attribute from order's collected attribute
+			if (from.getByAttributeId(attributeId) != null)
+			{
+				final AttributeWithValue attributeWithValue = from.getByAttributeId(attributeId);
+
+				// TODO: shall we skip it if attribute is null and isTransferIfNull=false
+
+				existingHUAttribute.setValue(attributeWithValue.getValueString());
+				existingHUAttribute.setValueNumber(attributeWithValue.getValueNumber());
+				huAttributesRepo.save(existingHUAttribute);
+				logger.trace("Updated {}/{} from {}", hu, existingHUAttribute, attributeWithValue);
+			}
 		}
 	}