midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1173 Fixed landed cost allocation for Average Costing

This commit is contained in:
Carlos Ruiz 2013-07-15 10:47:11 -05:00
parent 0062c09768
commit eef3b475b9
3 changed files with 153 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
migration/i1.0c-release/oracle/201307151037_IDEMPIERE-1173.sql Normal file
View File

@ -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
;

76
migration/i1.0c-release/postgresql/201307151037_IDEMPIERE-1173.sql Normal file
View File

@ -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
;

2
org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java
View File

@ -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);
}