From 37e24fb680193e40485cca41ff5f03d750974066 Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Wed, 31 Jul 2013 16:00:54 +0530 Subject: [PATCH 1/8] IDEMPIERE-1020 BOM error if product searchkey is longer than 22 characters --- .../i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql | 5 +++++ .../i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql create mode 100644 migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql diff --git a/migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql b/migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql new file mode 100644 index 0000000000..a7a0e5dddb --- /dev/null +++ b/migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql @@ -0,0 +1,5 @@ +-- 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 +; + diff --git a/migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql b/migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql new file mode 100644 index 0000000000..3b702c437a --- /dev/null +++ b/migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql @@ -0,0 +1,5 @@ +-- 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 +; + From 8e5d0c4d0483b3fe55cdc3a3048229376867ce88 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 2 Aug 2013 23:28:53 -0500 Subject: [PATCH 2/8] IDEMPIERE-1020 BOM error if product searchkey is longer than 22 characters / peer review --- migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql | 3 +++ .../i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql | 3 +++ 2 files changed, 6 insertions(+) diff --git a/migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql b/migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql index a7a0e5dddb..1e0b85ed37 100644 --- a/migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql +++ b/migration/i1.0c-release/oracle/201307311545_IDEMPIERE-1020.sql @@ -3,3 +3,6 @@ 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 +; + diff --git a/migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql b/migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql index 3b702c437a..3d0189161a 100644 --- a/migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql +++ b/migration/i1.0c-release/postgresql/201307311545_IDEMPIERE-1020.sql @@ -3,3 +3,6 @@ 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 +; + From d7dc94dbabfc001692e0f3ac9f5f53dc15d02542 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 2 Aug 2013 23:40:28 -0500 Subject: [PATCH 3/8] IDEMPIERE-1211 Tenant view of Dashboard Content and Dashboard Preference windows incorrect. --- .../i1.0c-release/oracle/201307290810_IDEMPIERE-1211.sql | 7 +++++++ .../postgresql/201307290810_IDEMPIERE-1211.sql | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201307290810_IDEMPIERE-1211.sql create mode 100644 migration/i1.0c-release/postgresql/201307290810_IDEMPIERE-1211.sql diff --git a/migration/i1.0c-release/oracle/201307290810_IDEMPIERE-1211.sql b/migration/i1.0c-release/oracle/201307290810_IDEMPIERE-1211.sql new file mode 100644 index 0000000000..5639c5cf4a --- /dev/null +++ b/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 +; diff --git a/migration/i1.0c-release/postgresql/201307290810_IDEMPIERE-1211.sql b/migration/i1.0c-release/postgresql/201307290810_IDEMPIERE-1211.sql new file mode 100644 index 0000000000..5fb757afc9 --- /dev/null +++ b/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 +; From ad274f6ad20949c288131ef885d8e17b179c8e2f Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 3 Aug 2013 10:04:38 -0500 Subject: [PATCH 4/8] IDEMPIERE-1140 Copy record uses wrong quantity when used in shipment line / receipt line - implemented: - calculate running qty on same shipment/receipt - when user choose same order line twice the callout subtract the running qty of orderline - callout set qty to 1 when using a serialized ASI --- .../src/org/compiere/model/CalloutInOut.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java index d75fa50d5d..8f70134894 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java +++ b/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 From a9e13f7983570dfe1a6379f258c1e1cfc8b581b5 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 3 Aug 2013 10:12:34 -0500 Subject: [PATCH 5/8] IDEMPIERE-1162 / fix iDempiereDaily build broken --- migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql b/migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql index ee2aa76831..62bbe0240f 100644 --- a/migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql +++ b/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@ 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. From 76822fcd3c0b4f4389ca32d2767c375bb405063c Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Sat, 3 Aug 2013 10:50:57 -0500 Subject: [PATCH 6/8] IDEMPIERE-1191 DB Connection string is displayed in Report --- .../src/org/adempiere/webui/window/ZkReportViewer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java index 0ecd852f5f..02904c466b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java @@ -198,7 +198,7 @@ public class ZkReportViewer extends Window implements EventListener, 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, 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()) From 85a4506d06058d48bb09381201f3116d829cf5e3 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 3 Aug 2013 10:51:36 -0500 Subject: [PATCH 7/8] IDEMPIERE-1191 DB Connection string is displayed in Report / include also process info from buttons showing DB info --- .../org/adempiere/webui/adwindow/AbstractADWindowContent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java index e1ec1dcaad..5fb2a71c22 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java +++ b/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() { @Override public void onEvent(Event event) throws Exception { From f33e50eb7e7d8df0f544cff7c50a88f9e64cd1b2 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 3 Aug 2013 11:10:42 -0500 Subject: [PATCH 8/8] IDEMPIERE-1247 UX: consistency on opening as single record view --- .../i1.0c-release/oracle/201308031107_IDEMPIERE-1247.sql | 9 +++++++++ .../postgresql/201308031107_IDEMPIERE-1247.sql | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201308031107_IDEMPIERE-1247.sql create mode 100644 migration/i1.0c-release/postgresql/201308031107_IDEMPIERE-1247.sql diff --git a/migration/i1.0c-release/oracle/201308031107_IDEMPIERE-1247.sql b/migration/i1.0c-release/oracle/201308031107_IDEMPIERE-1247.sql new file mode 100644 index 0000000000..ecdee61625 --- /dev/null +++ b/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 +; + diff --git a/migration/i1.0c-release/postgresql/201308031107_IDEMPIERE-1247.sql b/migration/i1.0c-release/postgresql/201308031107_IDEMPIERE-1247.sql new file mode 100644 index 0000000000..ecdee61625 --- /dev/null +++ b/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 +; +