From eef3b475b92be3d463be5377d609fbd3f048eaff Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 15 Jul 2013 10:47:11 -0500 Subject: [PATCH] IDEMPIERE-1173 Fixed landed cost allocation for Average Costing --- .../oracle/201307151037_IDEMPIERE-1173.sql | 76 +++++++++++++++++++ .../201307151037_IDEMPIERE-1173.sql | 76 +++++++++++++++++++ .../src/org/compiere/acct/Doc_Invoice.java | 2 +- 3 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 migration/i1.0c-release/oracle/201307151037_IDEMPIERE-1173.sql create mode 100644 migration/i1.0c-release/postgresql/201307151037_IDEMPIERE-1173.sql diff --git a/migration/i1.0c-release/oracle/201307151037_IDEMPIERE-1173.sql b/migration/i1.0c-release/oracle/201307151037_IDEMPIERE-1173.sql new file mode 100644 index 0000000000..db9cc0f4aa --- /dev/null +++ b/migration/i1.0c-release/oracle/201307151037_IDEMPIERE-1173.sql @@ -0,0 +1,76 @@ +-- Jul 15, 2013 10:36:11 AM COT +-- IDEMPIERE-1173 Fixed landed cost allocation for Average Costing +UPDATE AD_Field SET SeqNo=280, AD_FieldGroup_ID=200013, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-07-15 10:36:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58783 +; + +-- Jul 15, 2013 10:36:11 AM COT +UPDATE AD_Field SET SeqNo=290,Updated=TO_DATE('2013-07-15 10:36:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2662 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=300,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3842 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=310,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3841 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=320,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5132 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=330,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5133 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=340,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3845 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=350,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3844 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=360,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3839 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=370,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3840 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=380,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3836 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=390,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3851 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=400,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2654 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=410,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3835 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=420,Updated=TO_DATE('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3823 +; + +-- Jul 15, 2013 10:36:42 AM COT +UPDATE AD_Field SET SeqNo=190, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-07-15 10:36:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58784 +; + +-- Jul 15, 2013 10:36:42 AM COT +UPDATE AD_Field SET SeqNo=200,Updated=TO_DATE('2013-07-15 10:36:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3945 +; + +-- Jul 15, 2013 10:37:13 AM COT +UPDATE AD_Field SET SeqNo=170, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-07-15 10:37:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58785 +; + +SELECT register_migration_script('201307151037_IDEMPIERE-1173.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201307151037_IDEMPIERE-1173.sql b/migration/i1.0c-release/postgresql/201307151037_IDEMPIERE-1173.sql new file mode 100644 index 0000000000..22518240eb --- /dev/null +++ b/migration/i1.0c-release/postgresql/201307151037_IDEMPIERE-1173.sql @@ -0,0 +1,76 @@ +-- Jul 15, 2013 10:36:11 AM COT +-- IDEMPIERE-1173 Fixed landed cost allocation for Average Costing +UPDATE AD_Field SET SeqNo=280, AD_FieldGroup_ID=200013, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-07-15 10:36:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58783 +; + +-- Jul 15, 2013 10:36:11 AM COT +UPDATE AD_Field SET SeqNo=290,Updated=TO_TIMESTAMP('2013-07-15 10:36:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2662 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=300,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3842 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=310,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3841 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=320,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5132 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=330,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5133 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=340,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3845 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=350,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3844 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=360,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3839 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=370,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3840 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=380,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3836 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=390,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3851 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=400,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2654 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=410,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3835 +; + +-- Jul 15, 2013 10:36:12 AM COT +UPDATE AD_Field SET SeqNo=420,Updated=TO_TIMESTAMP('2013-07-15 10:36:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3823 +; + +-- Jul 15, 2013 10:36:42 AM COT +UPDATE AD_Field SET SeqNo=190, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-07-15 10:36:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58784 +; + +-- Jul 15, 2013 10:36:42 AM COT +UPDATE AD_Field SET SeqNo=200,Updated=TO_TIMESTAMP('2013-07-15 10:36:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3945 +; + +-- Jul 15, 2013 10:37:13 AM COT +UPDATE AD_Field SET SeqNo=170, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-07-15 10:37:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58785 +; + +SELECT register_migration_script('201307151037_IDEMPIERE-1173.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java index 3444a4077c..5017708be7 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java @@ -896,7 +896,7 @@ public class Doc_Invoice extends Doc String costingMethod = pc.getProduct().getCostingMethod(as); MAccount account = null; if (X_M_Cost.COSTINGMETHOD_AverageInvoice.equals(costingMethod) || X_M_Cost.COSTINGMETHOD_AveragePO.equals(costingMethod)) { - account = zeroQty ? pc.getAccount(ProductCost.ACCTTYPE_P_Cogs, as) : pc.getAccount(ProductCost.ACCTTYPE_P_Asset, as); + account = zeroQty ? pc.getAccount(ProductCost.ACCTTYPE_P_AverageCostVariance, as) : pc.getAccount(ProductCost.ACCTTYPE_P_Asset, as); } else { account = pc.getAccount(ProductCost.ACCTTYPE_P_CostAdjustment, as); }