#3042 Set Pharmaproductpermlaw52 only if is not empty

#3042 C_Bpartner: new Additional fields
metasfresh · Nov 23, 2017 · f32e0ae · f32e0ae
1 parent 8465f50
commit f32e0ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/de.metas.business/src/main/java/org/adempiere/impexp/bpartner/BPartnerImportHelper.java b/de.metas.business/src/main/java/org/adempiere/impexp/bpartner/BPartnerImportHelper.java
@@ -107,15 +107,13 @@ private I_C_BPartner createNewBPartner(final I_I_BPartner importRecord)
 		bpartner.setName(extractBPName(importRecord));
 		bpartner.setName2(importRecord.getName2());
 		bpartner.setName3(importRecord.getName3());
-		bpartner.setPharmaproductpermlaw52(importRecord.getPharmaproductpermlaw52());
 		bpartner.setDescription(importRecord.getDescription());
 		bpartner.setDUNS(importRecord.getDUNS());
 		bpartner.setVATaxID(importRecord.getTaxID());
 		bpartner.setNAICS(importRecord.getNAICS());
 		bpartner.setC_BP_Group_ID(importRecord.getC_BP_Group_ID());
 		bpartner.setAD_Language(importRecord.getAD_Language());
 		bpartner.setIsSEPASigned(importRecord.isSEPASigned());
-		bpartner.setIsPharmaciePermission(importRecord.isPharmaciePermission());
 		return bpartner;
 	}
 
@@ -157,10 +155,6 @@ private I_C_BPartner updateExistingBPartner(final I_I_BPartner importRecord)
 		{
 			bpartner.setName3(importRecord.getName3());
 		}
-		if (importRecord.getPharmaproductpermlaw52() != null)
-		{
-			bpartner.setPharmaproductpermlaw52(importRecord.getPharmaproductpermlaw52());
-		}
 		if (importRecord.getDUNS() != null)
 		{
 			bpartner.setDUNS(importRecord.getDUNS());
@@ -187,7 +181,6 @@ private I_C_BPartner updateExistingBPartner(final I_I_BPartner importRecord)
 			bpartner.setAD_Language(importRecord.getAD_Language());
 		}
 		bpartner.setIsSEPASigned(importRecord.isSEPASigned());
-		bpartner.setIsPharmaciePermission(importRecord.isPharmaciePermission());
 		return bpartner;
 	}
 

diff --git a/de.metas.vertical.pharma/src/main/java/org/adempiere/impexp/impl/PharmaImportListener.java b/de.metas.vertical.pharma/src/main/java/org/adempiere/impexp/impl/PharmaImportListener.java
@@ -7,6 +7,7 @@
 
 import org.adempiere.impexp.IImportListener;
 import org.adempiere.model.InterfaceWrapperHelper;
+import org.adempiere.util.Check;
 
 import de.metas.vertical.pharma.model.I_C_BPartner;
 import de.metas.vertical.pharma.model.I_I_BPartner;
@@ -53,7 +54,10 @@ public void onImport(@NonNull final Object importRecord, @NonNull final Object m
 		final I_I_BPartner ibpartner = InterfaceWrapperHelper.create(model, I_I_BPartner.class);
 		final I_C_BPartner bpartner = InterfaceWrapperHelper.create(model, I_C_BPartner.class);
 		bpartner.setIsPharmaciePermission(ibpartner.isPharmaciePermission());
-		bpartner.setPharmaproductpermlaw52(ibpartner.getPharmaproductpermlaw52());
+		if (!Check.isEmpty(ibpartner.getPharmaproductpermlaw52(),true))
+		{
+			bpartner.setPharmaproductpermlaw52(ibpartner.getPharmaproductpermlaw52());
+		}
 		save(bpartner);
 	}