Commit 8849f0db authored by smanohar's avatar smanohar

discount set as per porcpdet instead of porddet

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209108 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f2f051ff
...@@ -68,7 +68,7 @@ public class CreatePoRcpVoucher ...@@ -68,7 +68,7 @@ public class CreatePoRcpVoucher
java.sql.Timestamp tranDate = null, effectiveDate = null, taxDate = null, dueDate = null; java.sql.Timestamp tranDate = null, effectiveDate = null, taxDate = null, dueDate = null;
java.sql.Timestamp today = null, invoiceDate = null, DcDate = null, receiptDate = null, hdrRcpDate = null; java.sql.Timestamp today = null, invoiceDate = null, DcDate = null, receiptDate = null, hdrRcpDate = null;
String errCode = "", errString = "", winName = "", roundString = "",roundOff = "", confFinVar = "N", autoConfirm = "N"; String errCode = "", errString = "", winName = "", roundString = "",roundOff = "", confFinVar = "N", autoConfirm = "N";
double diffTotal = 0, advTotal = 0, amount = 0, discount = 0, taxAmt = 0, exchRate = 0, suppBillAmount = 0, rcpTaxNP = 0; double diffTotal = 0, advTotal = 0, amount = 0, taxAmt = 0, exchRate = 0, suppBillAmount = 0, rcpTaxNP = 0;
int roundTo = 0, lineCount = 0, count = 0, ctr = 0; int roundTo = 0, lineCount = 0, count = 0, ctr = 0;
String tranType = "", purcOrder = "", suppCode = "", tranCode = "", currCode = "", tranSer = "", taxClass = "", taxEnv = "", taxChap = ""; String tranType = "", purcOrder = "", suppCode = "", tranCode = "", currCode = "", tranSer = "", taxClass = "", taxEnv = "", taxChap = "";
...@@ -179,7 +179,7 @@ public class CreatePoRcpVoucher ...@@ -179,7 +179,7 @@ public class CreatePoRcpVoucher
suppCode = rs.getString("SUPP_CODE"); suppCode = rs.getString("SUPP_CODE");
tranCode = rs.getString("TRAN_CODE"); tranCode = rs.getString("TRAN_CODE");
amount = rs.getDouble("AMOUNT"); amount = rs.getDouble("AMOUNT");
discount = rs.getDouble("DISCOUNT"); rcpDiscount = rs.getDouble("DISCOUNT");
taxAmt = rs.getDouble("TAX"); taxAmt = rs.getDouble("TAX");
currCode = rs.getString("CURR_CODE"); currCode = rs.getString("CURR_CODE");
exchRate = rs.getDouble("EXCH_RATE"); exchRate = rs.getDouble("EXCH_RATE");
...@@ -532,7 +532,7 @@ public class CreatePoRcpVoucher ...@@ -532,7 +532,7 @@ public class CreatePoRcpVoucher
{ {
amount = 0 - amount; amount = 0 - amount;
taxAmt = 0 - taxAmt; taxAmt = 0 - taxAmt;
discount = 0 - discount; rcpDiscount = 0 - rcpDiscount;
dueDate = tranDate; dueDate = tranDate;
} }
else else
...@@ -908,7 +908,7 @@ public class CreatePoRcpVoucher ...@@ -908,7 +908,7 @@ public class CreatePoRcpVoucher
rcpRate = purcRate; rcpRate = purcRate;
rcpRateStd = purcRateStd;*/ rcpRateStd = purcRateStd;*/
//Commented by Ajay on 26/04/18:END //Commented by Ajay on 26/04/18:END
rcpDiscount = purcDisc; //rcpDiscount = purcDisc;
} }
// end - amit - 27/08/02 // end - amit - 27/08/02
...@@ -1382,7 +1382,7 @@ public class CreatePoRcpVoucher ...@@ -1382,7 +1382,7 @@ public class CreatePoRcpVoucher
rcpRate = purcRate; rcpRate = purcRate;
rcpRateStd = purcRateStd;*/ rcpRateStd = purcRateStd;*/
//Commented by Ajay on 26/04/18:END //Commented by Ajay on 26/04/18:END
rcpDiscount = purcDisc; //rcpDiscount = purcDisc;
} }
/* // manoharan this part is not required in RCP /* // manoharan this part is not required in RCP
// end - amit - 27/08/02 // end - amit - 27/08/02
...@@ -1747,7 +1747,7 @@ public class CreatePoRcpVoucher ...@@ -1747,7 +1747,7 @@ public class CreatePoRcpVoucher
rcpRate = purcRate; rcpRate = purcRate;
rcpRateStd = purcRateStd;*/ rcpRateStd = purcRateStd;*/
//Commented by Ajay on 26/04/18:END //Commented by Ajay on 26/04/18:END
rcpDiscount = purcDisc; //rcpDiscount = purcDisc;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment