hg merge release-1.0c (forward-porting)

migration/i1.0c-release/oracle/201307290810_IDEMPIERE-1211.sql

@@ -0,0 +1,7 @@
+-- Jul 29, 2013 2:55:25 PM IST
+-- IDEMPIERE-1211: Tenant view of Dashboard Content and Dashboard Preference windows incorrect.
+UPDATE AD_Tab SET WhereClause='PA_DashboardPreference.AD_Client_ID = @#AD_Client_ID@',Updated=TO_DATE('2013-07-29 14:55:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=200011
+;
+
+SELECT register_migration_script('201307290810_IDEMPIERE-1211.sql') FROM dual
+;

migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql

@@ -8,7 +8,7 @@ UPDATE R_MailText SET MailText='Dear @Name@,
 You are receiving this email because you (or somebody pretending to be you) said you have lost your iDempiere password.
 
 To access your iDempiere, use the temporary password from @AD_Client_ID<Name>@ below:
-@#NewPassword@
+'||chr(64)||'#NewPassword@
 
 Once you login, you will be directed to change password screen. Please change your password to something you can remember.
 

migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql

@@ -0,0 +1,8 @@
+-- Jul 31, 2013 3:43:04 PM IST
+-- Changes in the layout of Web Service Security window
+UPDATE AD_Column SET FieldLength=40,Updated=TO_DATE('2013-07-31 15:43:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=61999
+;
+
+SELECT register_migration_script('201307311545_IDEMPIERE-1020.sql') FROM dual
+;
+

migration/i1.0c-release/oracle/201308031107_IDEMPIERE-1247.sql

@@ -0,0 +1,9 @@
+-- IDEMPIERE-1247 UX: consistency on opening as single record view
+UPDATE AD_Tab SET IsSingleRow='Y'
+WHERE IsSingleRow='N'
+AND IsActive='Y'
+;
+
+SELECT register_migration_script('201308031107_IDEMPIERE-1247.sql') FROM dual
+;
+

migration/i1.0c-release/postgresql/201307290810_IDEMPIERE-1211.sql

@@ -0,0 +1,7 @@
+-- Jul 29, 2013 2:55:25 PM IST
+-- IDEMPIERE-1211: Tenant view of Dashboard Content and Dashboard Preference windows incorrect.
+UPDATE AD_Tab SET WhereClause='PA_DashboardPreference.AD_Client_ID = @#AD_Client_ID@',Updated=TO_TIMESTAMP('2013-07-29 14:55:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=200011
+;
+
+SELECT register_migration_script('201307290810_IDEMPIERE-1211.sql') FROM dual
+;

migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql

@@ -0,0 +1,8 @@
+-- Jul 31, 2013 3:43:04 PM IST
+-- Changes in the layout of Web Service Security window
+UPDATE AD_Column SET FieldLength=40,Updated=TO_TIMESTAMP('2013-07-31 15:43:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=61999
+;
+
+SELECT register_migration_script('201307311545_IDEMPIERE-1020.sql') FROM dual
+;
+

migration/i1.0c-release/postgresql/201308031107_IDEMPIERE-1247.sql

@@ -0,0 +1,9 @@
+-- IDEMPIERE-1247 UX: consistency on opening as single record view
+UPDATE AD_Tab SET IsSingleRow='Y'
+WHERE IsSingleRow='N'
+AND IsActive='Y'
+;
+
+SELECT register_migration_script('201308031107_IDEMPIERE-1247.sql') FROM dual
+;
+

org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java

@@ -425,6 +425,13 @@ public class CalloutInOut extends CalloutEngine
 			//
 			mTab.setValue("C_UOM_ID", new Integer(ol.getC_UOM_ID()));
 			BigDecimal MovementQty = ol.getQtyOrdered().subtract(ol.getQtyDelivered());
+			BigDecimal runningqty = DB.getSQLValueBDEx(null, "SELECT SUM(MovementQty) FROM M_InOutLine WHERE M_InOut_ID=? AND M_InOutLine_ID!=? AND C_OrderLine_ID=?",
+					Env.getContextAsInt(ctx, WindowNo, "M_InOut_ID"),
+					Env.getContextAsInt(ctx, WindowNo, "M_InOutLine_ID"),
+					ol.get_ID());
+			if (runningqty != null) {
+				MovementQty = MovementQty.subtract(runningqty); // IDEMPIERE-1140
+			}
 			mTab.setValue("MovementQty", MovementQty);
 			BigDecimal QtyEntered = MovementQty;
 			if (ol.getQtyEntered().compareTo(ol.getQtyOrdered()) != 0)
@@ -694,6 +701,12 @@ public class CalloutInOut extends CalloutEngine
 				mTab.setValue("M_Locator_ID", new Integer (selectedM_Locator_ID));
 			}
 		}
+		MAttributeSetInstance asi = MAttributeSetInstance.get(ctx, M_ASI_ID.intValue(), 0);
+		if (asi.getSerNo() != null) {
+			// serialized ASI - force qty yo 1 - IDEMPIERE-1140
+			mTab.setValue("MovementQty", Env.ONE);
+			mTab.setValue("QtyEntered", Env.ONE);
+		}
 		return "";
 	}	//	asi
 

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java

@@ -2856,7 +2856,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 		ProcessInfoLog m_logs[] = pi.getLogs();
 		statusBar.setStatusLine(pi.getSummary(), pi.isError(),m_logs);
 		if (m_logs != null) {
-			ProcessInfoDialog dialog = new ProcessInfoDialog(AEnv.getDialogHeader(ctx, curWindowNo),Env.getHeader(ctx, curWindowNo), m_logs);
+			ProcessInfoDialog dialog = new ProcessInfoDialog(AEnv.getDialogHeader(ctx, curWindowNo),AEnv.getDialogHeader(ctx, curWindowNo), m_logs);
 			dialog.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener<Event>() {
 				@Override
 				public void onEvent(Event event) throws Exception {

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java

@@ -198,7 +198,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 		}
 		m_isCanExport = MRole.getDefault().isCanExport(m_AD_Table_ID);
 		
-		setTitle(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Report") + ": " + m_reportEngine.getName() + "  " + Env.getHeader(Env.getCtx(), 0)));
+		setTitle(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Report") + ": " + m_reportEngine.getName()));
 	}
 	
 	
@@ -653,7 +653,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 	private void revalidate()
 	{
 		//	Report Info
-		setTitle(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Report") + ": " + m_reportEngine.getName() + "  " + Env.getHeader(Env.getCtx(), 0)));
+		setTitle(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Report") + ": " + m_reportEngine.getName()));
 		StringBuilder sb = new StringBuilder ();
 		sb.append(Msg.getMsg(Env.getCtx(), "DataCols")).append("=")
 			.append(m_reportEngine.getColumnCount())