From 95f9bdf22e3808a0cbe4c6d0f8e9458890e406b2 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 26 Sep 2013 10:58:31 +0800 Subject: [PATCH 1/3] #1002861 Product Costing in Bizidum. minor cleanup. --- org.adempiere.base/src/org/compiere/model/MInvoice.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java index 6066970004..53c83e5daa 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoice.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java @@ -2286,11 +2286,6 @@ public class MInvoice extends X_C_Invoice implements DocAction accrual = true; } - if (!accrual) - { - - } - if (accrual) return reverseAccrualIt(); else From ac0099efa05f1ba3d8785b97057df3b42006d4ad Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 26 Sep 2013 11:29:20 +0800 Subject: [PATCH 2/3] #1002868 IDEMPIERE-1188 Invoice Price Variance for Average PO Costing. Fixed syntax error for oracle script. --- migration/i1.0c-release/oracle/201309250432_IDEMPIERE-1188.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/i1.0c-release/oracle/201309250432_IDEMPIERE-1188.sql b/migration/i1.0c-release/oracle/201309250432_IDEMPIERE-1188.sql index df26c6f8d5..fe27ddb047 100644 --- a/migration/i1.0c-release/oracle/201309250432_IDEMPIERE-1188.sql +++ b/migration/i1.0c-release/oracle/201309250432_IDEMPIERE-1188.sql @@ -4,7 +4,7 @@ SET DEFINE OFF UPDATE M_CostDetail SET M_MatchInv_ID=NULL WHERE M_MatchInv_ID IS NOT NULL AND NOT EXISTS (SELECT a.M_MatchInv_ID FROM M_MatchInv a WHERE a.M_MatchInv_ID=M_CostDetail.M_MatchInv_ID) ; -ALTER TABLE M_CostDetail ADD CONSTRAINT MCostDetail_MatchInv FOREIGN KEY(M_MatchInv_ID) REFERENCES M_MatchInv(M_MatchInv_ID) ON DELETE RESTRICT +ALTER TABLE M_CostDetail ADD CONSTRAINT MCostDetail_MatchInv FOREIGN KEY(M_MatchInv_ID) REFERENCES M_MatchInv(M_MatchInv_ID) ; SELECT register_migration_script('201309250432_IDEMPIERE-1188.sql') FROM dual From 1777eda79c83e17df5e9e99783115c8f50fb749b Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 26 Sep 2013 11:33:45 +0800 Subject: [PATCH 3/3] #1002861 Product Costing in Bizidum. Fixed layout for the cost movement tab. IDEMPIERE-117 --- .../oracle/201309260313_1002861.sql | 87 +++++++++++++++++++ .../postgresql/201309260313_1002861.sql | 83 ++++++++++++++++++ 2 files changed, 170 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201309260313_1002861.sql create mode 100644 migration/i1.0c-release/postgresql/201309260313_1002861.sql diff --git a/migration/i1.0c-release/oracle/201309260313_1002861.sql b/migration/i1.0c-release/oracle/201309260313_1002861.sql new file mode 100644 index 0000000000..86d0d99cfe --- /dev/null +++ b/migration/i1.0c-release/oracle/201309260313_1002861.sql @@ -0,0 +1,87 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=30, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200011 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=60, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200008 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=80, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200007 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=100, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200015 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=120, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200025 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=140, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200023 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=160, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200021 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=180, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200019 +; + +-- Sep 26, 2013 11:07:27 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_MovementLine_ID@!0',Updated=TO_DATE('2013-09-26 11:07:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200018 +; + +-- Sep 26, 2013 11:07:41 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@C_InvoiceLine_ID@!0',Updated=TO_DATE('2013-09-26 11:07:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200017 +; + +-- Sep 26, 2013 11:07:57 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_InventoryLine_ID@!0',Updated=TO_DATE('2013-09-26 11:07:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200028 +; + +-- Sep 26, 2013 11:08:09 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_ProductionLine_ID@!0',Updated=TO_DATE('2013-09-26 11:08:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200030 +; + +-- Sep 26, 2013 11:08:24 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@C_ProjectIssue_ID@!0',Updated=TO_DATE('2013-09-26 11:08:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200031 +; + +-- Sep 26, 2013 11:08:40 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@C_OrderLine_ID@!0',Updated=TO_DATE('2013-09-26 11:08:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200033 +; + +-- Sep 26, 2013 11:08:53 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_InOutLine_ID@!0',Updated=TO_DATE('2013-09-26 11:08:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200034 +; + +-- Sep 26, 2013 11:09:09 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_MatchInv_ID@!0',Updated=TO_DATE('2013-09-26 11:09:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202340 +; + + +SELECT register_migration_script('201309260313_1002861.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201309260313_1002861.sql b/migration/i1.0c-release/postgresql/201309260313_1002861.sql new file mode 100644 index 0000000000..76509afe87 --- /dev/null +++ b/migration/i1.0c-release/postgresql/201309260313_1002861.sql @@ -0,0 +1,83 @@ +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=30, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200011 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=60, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200008 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=80, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200007 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=100, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200015 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=120, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200025 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=140, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200023 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=160, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200021 +; + +-- Sep 26, 2013 11:06:55 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET SeqNo=180, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-26 11:06:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200019 +; + +-- Sep 26, 2013 11:07:27 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_MovementLine_ID@!0',Updated=TO_TIMESTAMP('2013-09-26 11:07:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200018 +; + +-- Sep 26, 2013 11:07:41 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@C_InvoiceLine_ID@!0',Updated=TO_TIMESTAMP('2013-09-26 11:07:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200017 +; + +-- Sep 26, 2013 11:07:57 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_InventoryLine_ID@!0',Updated=TO_TIMESTAMP('2013-09-26 11:07:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200028 +; + +-- Sep 26, 2013 11:08:09 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_ProductionLine_ID@!0',Updated=TO_TIMESTAMP('2013-09-26 11:08:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200030 +; + +-- Sep 26, 2013 11:08:24 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@C_ProjectIssue_ID@!0',Updated=TO_TIMESTAMP('2013-09-26 11:08:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200031 +; + +-- Sep 26, 2013 11:08:40 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@C_OrderLine_ID@!0',Updated=TO_TIMESTAMP('2013-09-26 11:08:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200033 +; + +-- Sep 26, 2013 11:08:53 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_InOutLine_ID@!0',Updated=TO_TIMESTAMP('2013-09-26 11:08:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200034 +; + +-- Sep 26, 2013 11:09:09 AM MYT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Field SET DisplayLogic='@M_MatchInv_ID@!0',Updated=TO_TIMESTAMP('2013-09-26 11:09:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202340 +; + +SELECT register_migration_script('201309260313_1002861.sql') FROM dual +; +