diff --git a/client/src/org/compiere/grid/ed/VPAttribute.java b/client/src/org/compiere/grid/ed/VPAttribute.java
index 05c9082eb6..519249365f 100644
--- a/client/src/org/compiere/grid/ed/VPAttribute.java
+++ b/client/src/org/compiere/grid/ed/VPAttribute.java
@@ -55,7 +55,7 @@ import org.compiere.util.Msg;
  *  
  * @author Teo Sarca, SC ARHIPAC SERVICE SRL
  * 			<li>BF [ 1895041 ] NPE when move product with attribute set
- * 			<li>BF [ 1770177 ] Inventory Move Locator Error
+ * 			<li>BF [ 1770177 ] Inventory Move Locator Error - integrated MGrigioni bug fix
  */
 public class VPAttribute extends JComponent
 	implements VEditor, ActionListener
@@ -371,7 +371,7 @@ public class VPAttribute extends JComponent
 			{
 				m_text.setText(vad.getM_AttributeSetInstanceName());
 				M_AttributeSetInstance_ID = vad.getM_AttributeSetInstance_ID();
-				if (m_GridTab != null && !vad.isNew())
+				if (m_GridTab != null && !productWindow)
 					m_GridTab.setValue("M_Locator_ID", vad.getM_Locator_ID());
 				changed = true;
 			}
diff --git a/client/src/org/compiere/grid/ed/VPAttributeDialog.java b/client/src/org/compiere/grid/ed/VPAttributeDialog.java
index cb85590b16..f01c694869 100644
--- a/client/src/org/compiere/grid/ed/VPAttributeDialog.java
+++ b/client/src/org/compiere/grid/ed/VPAttributeDialog.java
@@ -138,8 +138,6 @@ public class VPAttributeDialog extends CDialog
 	private boolean					m_productWindow = false;
 	/**	Change							*/
 	private boolean					m_changed = false;
-	/** Was New ASI was created ?		*/
-	private boolean					m_newASI = false;
 	
 	private CLogger					log = CLogger.getCLogger(getClass());
 	/** Row Counter					*/
@@ -524,7 +522,6 @@ public class VPAttributeDialog extends CDialog
 		else if (e.getActionCommand().equals(ConfirmPanel.A_CANCEL))
 		{
 			m_changed = false;
-			m_newASI = false;
 			m_M_AttributeSetInstance_ID = 0;
 			m_M_Locator_ID = 0;
 			dispose();
@@ -705,7 +702,6 @@ public class VPAttributeDialog extends CDialog
 			m_masi.save ();
 			m_M_AttributeSetInstance_ID = m_masi.getM_AttributeSetInstance_ID ();
 			m_M_AttributeSetInstanceName = m_masi.getDescription();
-			m_newASI = true;
 		}
 
 		//	Save Instance Attributes
@@ -795,13 +791,6 @@ public class VPAttributeDialog extends CDialog
 	{
 		return m_changed;
 	}	//	isChanged
-	
-	/**
-	 * @return true if new ASI was created
-	 */
-	public boolean isNew() {
-		return m_newASI;
-	}
 
 } //	VPAttributeDialog