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

BF [1933948] - CalloutPayment working just with Draft Status 

https://sourceforge.net/tracker/index.php?func=detail&aid=1933948&group_id=176962&atid=879332
This commit is contained in:
Carlos Ruiz 2011-03-25 21:56:31 -05:00
parent 65842a7312
commit ce4d1b2ca3
1 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
View File

@ -35,6 +35,8 @@ import org.compiere.util.Env;
* <li>BF [ 1803316 ] CalloutPayment: use C_Order.Bill_BPartner_ID * <li>BF [ 1803316 ] CalloutPayment: use C_Order.Bill_BPartner_ID
* @author j2garcia - GlobalQSS * @author j2garcia - GlobalQSS
* <li>BF [ 2021745 ] Cannot assign project to payment with charge * <li>BF [ 2021745 ] Cannot assign project to payment with charge
* @author Carlos Ruiz - GlobalQSS
* <li>BF [ 1933948 ] CalloutPayment working just with Draft Status
*/ */
public class CalloutPayment extends CalloutEngine public class CalloutPayment extends CalloutEngine
{ {
@ -429,59 +431,54 @@ public class CalloutPayment extends CalloutEngine
mTab.setValue ("WriteOffAmt", Env.ZERO); mTab.setValue ("WriteOffAmt", Env.ZERO);
if (Env.ZERO.compareTo (OverUnderAmt) != 0) if (Env.ZERO.compareTo (OverUnderAmt) != 0)
mTab.setValue ("OverUnderAmt", Env.ZERO); mTab.setValue ("OverUnderAmt", Env.ZERO);
} } else {
// PayAmt - calculate write off boolean processed = mTab.getValueAsBoolean(MPayment.COLUMNNAME_Processed);
// Added Lines By Goodwill (02-03-2006) if (colName.equals ("PayAmt")
// Reason: we must make the callout is called just when docstatus is && (!processed)
// draft && "Y".equals (Env.getContext (ctx, WindowNo, "IsOverUnderPayment")))
// Old Code : else if (colName.equals("PayAmt"))
// New Code :
else if (colName.equals ("PayAmt")
&& mTab.get_ValueAsString ("DocStatus").equals ("DR")
&& "Y"
.equals (Env.getContext (ctx, WindowNo, "IsOverUnderPayment")))
{
OverUnderAmt = InvoiceOpenAmt.subtract (PayAmt).subtract (
DiscountAmt).subtract (WriteOffAmt);
mTab.setValue ("OverUnderAmt", OverUnderAmt);
}
else if (colName.equals ("PayAmt")
&& mTab.get_ValueAsString ("DocStatus").equals ("DR"))
{
WriteOffAmt = InvoiceOpenAmt.subtract (PayAmt).subtract (
DiscountAmt).subtract (OverUnderAmt);
mTab.setValue ("WriteOffAmt", WriteOffAmt);
}
else if (colName.equals ("IsOverUnderPayment")
&& mTab.get_ValueAsString ("DocStatus").equals ("DR"))
{
boolean overUnderPaymentActive = "Y".equals (Env.getContext (ctx,
WindowNo, "IsOverUnderPayment"));
if (overUnderPaymentActive)
{ {
OverUnderAmt = InvoiceOpenAmt.subtract (PayAmt).subtract ( OverUnderAmt = InvoiceOpenAmt.subtract (PayAmt).subtract (
DiscountAmt); DiscountAmt).subtract (WriteOffAmt);
mTab.setValue ("WriteOffAmt", Env.ZERO);
mTab.setValue ("OverUnderAmt", OverUnderAmt); mTab.setValue ("OverUnderAmt", OverUnderAmt);
}else{
WriteOffAmt = InvoiceOpenAmt.subtract (PayAmt).subtract (
DiscountAmt);
mTab.setValue ("WriteOffAmt", WriteOffAmt);
mTab.setValue ("OverUnderAmt", Env.ZERO);
} }
} else if (colName.equals ("PayAmt")
// Added Lines By Goodwill (02-03-2006) && (!processed))
// Reason: we must make the callout is called just when docstatus is {
// draft WriteOffAmt = InvoiceOpenAmt.subtract (PayAmt).subtract (
// Old Code : else // calculate PayAmt DiscountAmt).subtract (OverUnderAmt);
// New Code : mTab.setValue ("WriteOffAmt", WriteOffAmt);
else if (mTab.get_ValueAsString ("DocStatus").equals ("DR")) // calculate }
// PayAmt else if (colName.equals ("IsOverUnderPayment")
// End By Goodwill && (!processed))
{ {
PayAmt = InvoiceOpenAmt.subtract (DiscountAmt).subtract ( boolean overUnderPaymentActive = "Y".equals (Env.getContext (ctx,
WriteOffAmt).subtract (OverUnderAmt); WindowNo, "IsOverUnderPayment"));
mTab.setValue ("PayAmt", PayAmt); if (overUnderPaymentActive)
{
OverUnderAmt = InvoiceOpenAmt.subtract (PayAmt).subtract (
DiscountAmt);
mTab.setValue ("WriteOffAmt", Env.ZERO);
mTab.setValue ("OverUnderAmt", OverUnderAmt);
}else{
WriteOffAmt = InvoiceOpenAmt.subtract (PayAmt).subtract (
DiscountAmt);
mTab.setValue ("WriteOffAmt", WriteOffAmt);
mTab.setValue ("OverUnderAmt", Env.ZERO);
}
}
// Added Lines By Goodwill (02-03-2006)
// Reason: we must make the callout is called just when docstatus is
// draft
// Old Code : else // calculate PayAmt
// New Code :
else if ((!processed)) // calculate
// PayAmt
// End By Goodwill
{
PayAmt = InvoiceOpenAmt.subtract (DiscountAmt).subtract (
WriteOffAmt).subtract (OverUnderAmt);
mTab.setValue ("PayAmt", PayAmt);
}
} }
return ""; return "";
} // amounts } // amounts