From ef75ffadd71499d460d0c24c295705aed989c19b Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Fri, 19 Jul 2013 11:34:01 +0200 Subject: [PATCH 1/3] IDEMPIERE-1190 --- org.adempiere.base/src/org/compiere/model/MLanguage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MLanguage.java b/org.adempiere.base/src/org/compiere/model/MLanguage.java index 7b9d40fae7..c801c7f700 100644 --- a/org.adempiere.base/src/org/compiere/model/MLanguage.java +++ b/org.adempiere.base/src/org/compiere/model/MLanguage.java @@ -425,10 +425,10 @@ public class MLanguage extends X_AD_Language StringBuilder keyColumn = new StringBuilder(baseTable).append("_ID"); StringBuilder insert = new StringBuilder("INSERT INTO ").append(tableName) .append("(AD_Language,IsTranslated, AD_Client_ID,AD_Org_ID, ") - .append("Createdby,UpdatedBy, ") + .append("Createdby,UpdatedBy,Created,Updated, ") .append(keyColumn).append(cols).append(") ") .append("SELECT '").append(getAD_Language()).append("','N', AD_Client_ID,AD_Org_ID, ") - .append(AD_User_ID).append(",").append(AD_User_ID).append(", ") + .append(AD_User_ID).append(",").append(AD_User_ID).append(", SysDate, SysDate, ") .append(keyColumn).append(cols) .append(" FROM ").append(baseTable) .append(" WHERE ").append(keyColumn).append(" NOT IN (SELECT ").append(keyColumn) From a4e04341f269d829f9bdf4df5b2e5c7b0d22b6b5 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 7 Apr 2014 14:28:01 -0500 Subject: [PATCH 2/3] IDEMPIERE-1853 Can't add record on Accounting Schema Default --- .../oracle/201404071427_IDEMPIERE-1853.sql | 167 ++++++++++++++++++ .../201404071427_IDEMPIERE-1853.sql | 164 +++++++++++++++++ 2 files changed, 331 insertions(+) create mode 100644 migration/i2.0/oracle/201404071427_IDEMPIERE-1853.sql create mode 100644 migration/i2.0/postgresql/201404071427_IDEMPIERE-1853.sql diff --git a/migration/i2.0/oracle/201404071427_IDEMPIERE-1853.sql b/migration/i2.0/oracle/201404071427_IDEMPIERE-1853.sql new file mode 100644 index 0000000000..99f455aa91 --- /dev/null +++ b/migration/i2.0/oracle/201404071427_IDEMPIERE-1853.sql @@ -0,0 +1,167 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- 7/04/2014 09:21:13 PM CEST +-- IDEMPIERE-1853 Accounting Schema Default +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2014-04-07 21:21:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3455 +; + +-- 7/04/2014 09:21:15 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY V_Liability_Services_Acct NUMBER(10) DEFAULT NULL +; + +-- 7/04/2014 09:21:15 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY V_Liability_Services_Acct NULL +; + +-- 7/04/2014 09:21:15 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_vliabilityservices_cschemad +; + +-- 7/04/2014 09:21:16 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_vliabilityservices_cschemad FOREIGN KEY (V_Liability_Services_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:24:14 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2014-04-07 21:24:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4872 +; + +-- 7/04/2014 09:24:16 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY UnEarnedRevenue_Acct NUMBER(10) DEFAULT NULL +; + +-- 7/04/2014 09:24:16 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY UnEarnedRevenue_Acct NULL +; + +-- 7/04/2014 09:24:16 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_unearnedrevenue_cschemadefa +; + +-- 7/04/2014 09:24:16 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_unearnedrevenue_cschemadefa FOREIGN KEY (UnEarnedRevenue_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:24:46 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2014-04-07 21:24:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5206 +; + +-- 7/04/2014 09:24:48 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_Asset_Acct NUMBER(10) DEFAULT NULL +; + +-- 7/04/2014 09:24:48 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_Asset_Acct NULL +; + +-- 7/04/2014 09:24:48 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbasset_cschemadefault +; + +-- 7/04/2014 09:24:48 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbasset_cschemadefault FOREIGN KEY (CB_Asset_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:25:05 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2014-04-07 21:25:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6493 +; + +-- 7/04/2014 09:25:08 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_CashTransfer_Acct NUMBER(10) DEFAULT NULL +; + +-- 7/04/2014 09:25:08 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_CashTransfer_Acct NULL +; + +-- 7/04/2014 09:25:08 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbcashtransfer_cschemadefau +; + +-- 7/04/2014 09:25:08 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbcashtransfer_cschemadefau FOREIGN KEY (CB_CashTransfer_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:25:23 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2014-04-07 21:25:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5207 +; + +-- 7/04/2014 09:25:28 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_Differences_Acct NUMBER(10) DEFAULT NULL +; + +-- 7/04/2014 09:25:28 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_Differences_Acct NULL +; + +-- 7/04/2014 09:25:28 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbdifferences_cschemadefaul +; + +-- 7/04/2014 09:25:28 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbdifferences_cschemadefaul FOREIGN KEY (CB_Differences_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:25:43 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2014-04-07 21:25:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5208 +; + +-- 7/04/2014 09:25:46 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_Expense_Acct NUMBER(10) DEFAULT NULL +; + +-- 7/04/2014 09:25:46 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_Expense_Acct NULL +; + +-- 7/04/2014 09:25:46 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbexpense_cschemadefault +; + +-- 7/04/2014 09:25:46 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbexpense_cschemadefault FOREIGN KEY (CB_Expense_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:26:02 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2014-04-07 21:26:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5209 +; + +-- 7/04/2014 09:26:05 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_Receipt_Acct NUMBER(10) DEFAULT NULL +; + +-- 7/04/2014 09:26:05 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY CB_Receipt_Acct NULL +; + +-- 7/04/2014 09:26:05 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbreceipt_cschemadefault +; + +-- 7/04/2014 09:26:05 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbreceipt_cschemadefault FOREIGN KEY (CB_Receipt_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:26:34 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2014-04-07 21:26:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14430 +; + +-- 7/04/2014 09:26:36 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY C_Receivable_Services_Acct NUMBER(10) DEFAULT NULL +; + +-- 7/04/2014 09:26:36 PM CEST +ALTER TABLE C_AcctSchema_Default MODIFY C_Receivable_Services_Acct NULL +; + +-- 7/04/2014 09:26:36 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT creceivableservices_cacctschem +; + +-- 7/04/2014 09:26:36 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT creceivableservices_cacctschem FOREIGN KEY (C_Receivable_Services_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +SELECT register_migration_script('201404071427_IDEMPIERE-1853.sql') FROM dual +; + diff --git a/migration/i2.0/postgresql/201404071427_IDEMPIERE-1853.sql b/migration/i2.0/postgresql/201404071427_IDEMPIERE-1853.sql new file mode 100644 index 0000000000..f0ef964989 --- /dev/null +++ b/migration/i2.0/postgresql/201404071427_IDEMPIERE-1853.sql @@ -0,0 +1,164 @@ +-- 7/04/2014 09:21:13 PM CEST +-- IDEMPIERE-1853 Accounting Schema Default +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-04-07 21:21:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3455 +; + +-- 7/04/2014 09:21:15 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','V_Liability_Services_Acct','NUMERIC(10)',null,'NULL') +; + +-- 7/04/2014 09:21:15 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','V_Liability_Services_Acct',null,'NULL',null) +; + +-- 7/04/2014 09:21:15 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_vliabilityservices_cschemad +; + +-- 7/04/2014 09:21:16 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_vliabilityservices_cschemad FOREIGN KEY (V_Liability_Services_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:24:14 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-04-07 21:24:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4872 +; + +-- 7/04/2014 09:24:16 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','UnEarnedRevenue_Acct','NUMERIC(10)',null,'NULL') +; + +-- 7/04/2014 09:24:16 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','UnEarnedRevenue_Acct',null,'NULL',null) +; + +-- 7/04/2014 09:24:16 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_unearnedrevenue_cschemadefa +; + +-- 7/04/2014 09:24:16 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_unearnedrevenue_cschemadefa FOREIGN KEY (UnEarnedRevenue_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:24:46 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-04-07 21:24:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5206 +; + +-- 7/04/2014 09:24:48 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_Asset_Acct','NUMERIC(10)',null,'NULL') +; + +-- 7/04/2014 09:24:48 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_Asset_Acct',null,'NULL',null) +; + +-- 7/04/2014 09:24:48 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbasset_cschemadefault +; + +-- 7/04/2014 09:24:48 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbasset_cschemadefault FOREIGN KEY (CB_Asset_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:25:05 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-04-07 21:25:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6493 +; + +-- 7/04/2014 09:25:08 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_CashTransfer_Acct','NUMERIC(10)',null,'NULL') +; + +-- 7/04/2014 09:25:08 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_CashTransfer_Acct',null,'NULL',null) +; + +-- 7/04/2014 09:25:08 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbcashtransfer_cschemadefau +; + +-- 7/04/2014 09:25:08 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbcashtransfer_cschemadefau FOREIGN KEY (CB_CashTransfer_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:25:23 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-04-07 21:25:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5207 +; + +-- 7/04/2014 09:25:28 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_Differences_Acct','NUMERIC(10)',null,'NULL') +; + +-- 7/04/2014 09:25:28 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_Differences_Acct',null,'NULL',null) +; + +-- 7/04/2014 09:25:28 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbdifferences_cschemadefaul +; + +-- 7/04/2014 09:25:28 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbdifferences_cschemadefaul FOREIGN KEY (CB_Differences_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:25:43 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-04-07 21:25:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5208 +; + +-- 7/04/2014 09:25:46 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_Expense_Acct','NUMERIC(10)',null,'NULL') +; + +-- 7/04/2014 09:25:46 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_Expense_Acct',null,'NULL',null) +; + +-- 7/04/2014 09:25:46 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbexpense_cschemadefault +; + +-- 7/04/2014 09:25:46 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbexpense_cschemadefault FOREIGN KEY (CB_Expense_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:26:02 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-04-07 21:26:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5209 +; + +-- 7/04/2014 09:26:05 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_Receipt_Acct','NUMERIC(10)',null,'NULL') +; + +-- 7/04/2014 09:26:05 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','CB_Receipt_Acct',null,'NULL',null) +; + +-- 7/04/2014 09:26:05 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT vc_cbreceipt_cschemadefault +; + +-- 7/04/2014 09:26:05 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT vc_cbreceipt_cschemadefault FOREIGN KEY (CB_Receipt_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +-- 7/04/2014 09:26:34 PM CEST +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-04-07 21:26:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14430 +; + +-- 7/04/2014 09:26:36 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','C_Receivable_Services_Acct','NUMERIC(10)',null,'NULL') +; + +-- 7/04/2014 09:26:36 PM CEST +INSERT INTO t_alter_column values('c_acctschema_default','C_Receivable_Services_Acct',null,'NULL',null) +; + +-- 7/04/2014 09:26:36 PM CEST +ALTER TABLE C_AcctSchema_Default DROP CONSTRAINT creceivableservices_cacctschem +; + +-- 7/04/2014 09:26:36 PM CEST +ALTER TABLE C_AcctSchema_Default ADD CONSTRAINT creceivableservices_cacctschem FOREIGN KEY (C_Receivable_Services_Acct) REFERENCES c_validcombination(c_validcombination_id) DEFERRABLE INITIALLY DEFERRED +; + +SELECT register_migration_script('201404071427_IDEMPIERE-1853.sql') FROM dual +; + From 8b603ec432fee06778f5fbef73172ad2dae6628f Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Mon, 7 Apr 2014 14:37:30 -0500 Subject: [PATCH 3/3] IDEMPIERE-1734 Product Info history records/reserved qty doesn't show reservations --- .../adempiere/webui/panel/InvoiceHistory.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java index c8ae1a0c08..fa3929f2e1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java @@ -401,6 +401,7 @@ public class InvoiceHistory extends Window implements EventListener Vector columnNames = new Vector(); columnNames.add(Msg.translate(Env.getCtx(), m_C_BPartner_ID == 0 ? "C_BPartner_ID" : "M_Product_ID")); columnNames.add(Msg.translate(Env.getCtx(), "PriceActual")); + columnNames.add(Msg.translate(Env.getCtx(), "C_Currency_ID")); columnNames.add(Msg.translate(Env.getCtx(), reserved ? "QtyReserved" : "QtyOrdered")); columnNames.add(Msg.translate(Env.getCtx(), "Discount")); columnNames.add(Msg.translate(Env.getCtx(), "DocumentNo")); @@ -411,7 +412,7 @@ public class InvoiceHistory extends Window implements EventListener Vector> data = null; if (m_C_BPartner_ID == 0) { - String sql = "SELECT bp.Name, ol.PriceActual,ol.PriceList,ol.QtyReserved," + String sql = "SELECT bp.Name, ol.PriceActual,c.Iso_Code,ol.PriceList,ol.QtyReserved," + "o.DateOrdered,dt.PrintName || ' ' || o.DocumentNo As DocumentNo, " + "w.Name," + "ol.Discount, 0 " // 8,9=M_PriceList_ID @@ -420,6 +421,7 @@ public class InvoiceHistory extends Window implements EventListener + " INNER JOIN C_DocType dt ON (o.C_DocType_ID=dt.C_DocType_ID)" + " INNER JOIN M_Warehouse w ON (ol.M_Warehouse_ID=w.M_Warehouse_ID)" + " INNER JOIN C_BPartner bp ON (o.C_BPartner_ID=bp.C_BPartner_ID) " + + " INNER JOIN C_Currency c ON (o.C_Currency_ID=c.C_Currency_ID) " + "WHERE ol.QtyReserved<>0" + " AND ol.M_Product_ID=?" + " AND o.IsSOTrx=" + (reserved ? "'Y'" : "'N'") @@ -428,7 +430,7 @@ public class InvoiceHistory extends Window implements EventListener } else { - String sql = "SELECT p.Name, ol.PriceActual,ol.PriceList,ol.QtyReserved," + String sql = "SELECT p.Name, ol.PriceActual,c.Iso_Code,ol.PriceList,ol.QtyReserved," + "o.DateOrdered,dt.PrintName || ' ' || o.DocumentNo As DocumentNo, " + "w.Name," + "ol.Discount, 0 " // 8,9=M_PriceList_ID @@ -437,6 +439,7 @@ public class InvoiceHistory extends Window implements EventListener + " INNER JOIN C_DocType dt ON (o.C_DocType_ID=dt.C_DocType_ID)" + " INNER JOIN M_Warehouse w ON (ol.M_Warehouse_ID=w.M_Warehouse_ID)" + " INNER JOIN M_Product p ON (ol.M_Product_ID=p.M_Product_ID) " + + " INNER JOIN C_Currency c ON (o.C_Currency_ID=c.C_Currency_ID) " + "WHERE ol.QtyReserved<>0" + " AND o.C_BPartner_ID=?" + " AND o.IsSOTrx=" + (reserved ? "'Y'" : "'N'") @@ -452,11 +455,12 @@ public class InvoiceHistory extends Window implements EventListener // m_tableReserved.setColumnClass(0, String.class, true); // Product/Partner m_tableReserved.setColumnClass(1, BigDecimal.class, true); // Price - m_tableReserved.setColumnClass(2, Double.class, true); // Quantity - m_tableReserved.setColumnClass(3, BigDecimal.class, true); // Discount (%) - m_tableReserved.setColumnClass(4, String.class, true); // DocNo - m_tableReserved.setColumnClass(5, Timestamp.class, true); // Date - m_tableReserved.setColumnClass(6, String.class, true); // Warehouse + m_tableReserved.setColumnClass(2, String.class, true); // Currency + m_tableReserved.setColumnClass(3, Double.class, true); // Quantity + m_tableReserved.setColumnClass(4, BigDecimal.class, true); // Discount (%) + m_tableReserved.setColumnClass(5, String.class, true); // DocNo + m_tableReserved.setColumnClass(6, Timestamp.class, true); // Date + m_tableReserved.setColumnClass(7, String.class, true); // Warehouse // m_tableReserved.autoSize(); } @@ -467,11 +471,12 @@ public class InvoiceHistory extends Window implements EventListener // m_tableOrdered.setColumnClass(0, String.class, true); // Product/Partner m_tableOrdered.setColumnClass(1, BigDecimal.class, true); // Price - m_tableOrdered.setColumnClass(2, Double.class, true); // Quantity - m_tableOrdered.setColumnClass(3, BigDecimal.class, true); // Discount (%) - m_tableOrdered.setColumnClass(4, String.class, true); // DocNo - m_tableOrdered.setColumnClass(5, Timestamp.class, true); // Date - m_tableOrdered.setColumnClass(6, String.class, true); // Warehouse + m_tableOrdered.setColumnClass(2, String.class, true); // Currency + m_tableOrdered.setColumnClass(3, Double.class, true); // Quantity + m_tableOrdered.setColumnClass(4, BigDecimal.class, true); // Discount (%) + m_tableOrdered.setColumnClass(5, String.class, true); // DocNo + m_tableOrdered.setColumnClass(6, Timestamp.class, true); // Date + m_tableOrdered.setColumnClass(7, String.class, true); // Warehouse // m_tableOrdered.autoSize(); }