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

IDEMPIERE-2540 Allowing Vendor qty break to specify breaks for all customers / peer review

This commit is contained in:
Carlos Ruiz 2015-03-25 18:47:05 -05:00
parent 23a9ccd7e0
commit b084a39950
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/i2.1/oracle/201503251255_IDEMPIERE-2540.sql
View File

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

2
migration/i2.1/postgresql/201503251255_IDEMPIERE-2540.sql
View File

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

7
org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
View File

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