From b084a3995002ef73b7b55d5cd79507f08d34480c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 25 Mar 2015 18:47:05 -0500 Subject: [PATCH] IDEMPIERE-2540 Allowing Vendor qty break to specify breaks for all customers / peer review --- migration/i2.1/oracle/201503251255_IDEMPIERE-2540.sql | 2 +- migration/i2.1/postgresql/201503251255_IDEMPIERE-2540.sql | 2 +- .../src/org/compiere/model/CalloutOrder.java | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/migration/i2.1/oracle/201503251255_IDEMPIERE-2540.sql b/migration/i2.1/oracle/201503251255_IDEMPIERE-2540.sql index c0ff655952..081b2c0691 100644 --- a/migration/i2.1/oracle/201503251255_IDEMPIERE-2540.sql +++ b/migration/i2.1/oracle/201503251255_IDEMPIERE-2540.sql @@ -22,7 +22,7 @@ ALTER TABLE M_ProductPriceVendorBreak DROP CONSTRAINT cbpartner_mproductpriceven ALTER TABLE M_ProductPriceVendorBreak ADD CONSTRAINT cbpartner_mproductpricevendorb FOREIGN KEY (C_BPartner_ID) REFERENCES c_bpartner(c_bpartner_id) DEFERRABLE INITIALLY DEFERRED ; -SELECT register_migration_script('201503251255_IDEMPIERE-2540') FROM dual +SELECT register_migration_script('201503251255_IDEMPIERE-2540.sql') FROM dual ; diff --git a/migration/i2.1/postgresql/201503251255_IDEMPIERE-2540.sql b/migration/i2.1/postgresql/201503251255_IDEMPIERE-2540.sql index 91ae3b6dc5..942d6502a0 100644 --- a/migration/i2.1/postgresql/201503251255_IDEMPIERE-2540.sql +++ b/migration/i2.1/postgresql/201503251255_IDEMPIERE-2540.sql @@ -19,7 +19,7 @@ ALTER TABLE M_ProductPriceVendorBreak DROP CONSTRAINT cbpartner_mproductpriceven ALTER TABLE M_ProductPriceVendorBreak ADD CONSTRAINT cbpartner_mproductpricevendorb FOREIGN KEY (C_BPartner_ID) REFERENCES c_bpartner(c_bpartner_id) DEFERRABLE INITIALLY DEFERRED ; -SELECT register_migration_script('201503251255_IDEMPIERE-2540') FROM dual +SELECT register_migration_script('201503251255_IDEMPIERE-2540.sql') FROM dual ; diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java index 0ff22e3ca8..515ab3419c 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java @@ -1101,7 +1101,14 @@ public class CalloutOrder extends CalloutEngine if (log.isLoggable(Level.FINE)) log.fine("QtyChanged -> PriceActual=" + pp.getPriceStd() + ", PriceEntered=" + PriceEntered + ", Discount=" + pp.getDiscount()); PriceActual = pp.getPriceStd(); + PriceEntered = pp.getPriceStd(); + Discount = pp.getDiscount(); + PriceLimit = pp.getPriceLimit(); + PriceList = pp.getPriceList(); + mTab.setValue("PriceList", pp.getPriceList()); + mTab.setValue("PriceLimit", pp.getPriceLimit()); mTab.setValue("PriceActual", pp.getPriceStd()); + mTab.setValue("PriceEntered", pp.getPriceStd()); mTab.setValue("Discount", pp.getDiscount()); mTab.setValue("PriceEntered", PriceEntered); Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N");