Skip to content

B
business-java
Commit f7fc00ae authored by mjadhav's avatar mjadhav
Browse files
Options

changes done for gross amount 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97114 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9daa4d8a
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 8 deletions
webitm-fin/ibase/webitm/ejb/fin/GenInvoiceSchedule.java
View file @ f7fc00ae
...@@ -629,7 +629,7 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -629,7 +629,7 @@ public class GenInvoiceSchedule implements Schedule {
sql = "select reg_no from siteregno where site_code=? and REF_CODE='TAXNO' " ; sql = "select reg_no from siteregno where site_code=? and REF_CODE='TAXNO1' " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
...@@ -899,7 +899,7 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -899,7 +899,7 @@ public class GenInvoiceSchedule implements Schedule {
String itemCodeDet="",itemDescrDet="",quantityDet="",unitDet="",accDet="",instAmtDet=""; String itemCodeDet="",itemDescrDet="",quantityDet="",unitDet="",accDet="",instAmtDet="";
String rate="",unitRate="",discountInv="",taxEffects="",siteCode="",paymentMeans="",accToBeCredited="",docStatus=""; String rate="",unitRate="",discountInv="",taxEffects="",siteCode="",paymentMeans="",accToBeCredited="",docStatus="";
double taxBaseAmt=0.00,taxAmtHd=0.00 ,NetAmtHd=0.00,discAmtHd=0.00,invoiceAmtHd=0.00,rateDet=0.00; double taxBaseAmt=0.00,taxAmtHd=0.00 ,NetAmtHd=0.00,discAmtHd=0.00,invoiceAmtHd=0.00,rateDet=0.00;
double taxAmtDet=0.00,netAmtDet=0.00,discAmtDet=0.00,taxAmt=0.00,taxPersc=0.00,discountDet=0.00,totalCost=0.0; double taxAmtDet=0.00,netAmtDet=0.00,discAmtDet=0.00,taxAmt=0.00,taxPersc=0.00,discountDet=0.00,totalCost=0.0,grossAmount=0.0,totalGrossAmount=0.0;
GenericUtility genericUtility = null; GenericUtility genericUtility = null;
PreparedStatement pstmt = null,pstmt1=null; PreparedStatement pstmt = null,pstmt1=null;
ResultSet rs = null,rs1=null; ResultSet rs = null,rs1=null;
...@@ -971,7 +971,7 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -971,7 +971,7 @@ public class GenInvoiceSchedule implements Schedule {
sql = " select ITEM_CODE,ITEM_DESCR,QUANTITY,UNIT,RATE,DISCOUNT,TAX_AMT,NET_AMT ," + sql = " select ITEM_CODE,ITEM_DESCR,QUANTITY,UNIT,RATE,DISCOUNT,TAX_AMT,NET_AMT ," +
"DISC_AMT,INST_AMOUNT,ACC_CODE__ITEM from invdet " + "DISC_AMT,INST_AMOUNT,ACC_CODE__ITEM,QUANTITY__STDUOM,RATE__STDUOM from invdet " +
" where invoice_id=?" ; " where invoice_id=?" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -983,9 +983,11 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -983,9 +983,11 @@ public class GenInvoiceSchedule implements Schedule {
System.out.println("cnt "+cnt); System.out.println("cnt "+cnt);
itemCodeDet = rs.getString("ITEM_CODE"); itemCodeDet = rs.getString("ITEM_CODE");
itemDescrDet = rs.getString("ITEM_DESCR"); itemDescrDet = rs.getString("ITEM_DESCR");
quantityDet = rs.getString("QUANTITY"); //quantityDet = rs.getString("QUANTITY");
quantityDet = rs.getString("QUANTITY__STDUOM");
unitDet = rs.getString("UNIT"); unitDet = rs.getString("UNIT");
rateDet = rs.getDouble("RATE"); //rateDet = rs.getDouble("RATE");
rateDet = rs.getDouble("RATE__STDUOM");
discountDet = rs.getDouble("DISCOUNT"); discountDet = rs.getDouble("DISCOUNT");
taxAmtDet = rs.getDouble("TAX_AMT"); taxAmtDet = rs.getDouble("TAX_AMT");
netAmtDet = rs.getDouble("NET_AMT"); netAmtDet = rs.getDouble("NET_AMT");
...@@ -995,7 +997,10 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -995,7 +997,10 @@ public class GenInvoiceSchedule implements Schedule {
totalCost=rateDet * Integer.parseInt(quantityDet); totalCost=rateDet * Integer.parseInt(quantityDet);
System.out.println("totalCost :"+totalCost); System.out.println("totalCost :"+totalCost);
System.out.println("discAmtDet :"+discAmtDet);
grossAmount=totalCost - discAmtDet;
totalGrossAmount=totalGrossAmount + grossAmount;
itemCodeDet = itemCodeDet == null ? " " : itemCodeDet.trim(); itemCodeDet = itemCodeDet == null ? " " : itemCodeDet.trim();
itemDescrDet = itemDescrDet == null ? " " : itemDescrDet.trim(); itemDescrDet = itemDescrDet == null ? " " : itemDescrDet.trim();
...@@ -1024,6 +1029,8 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1024,6 +1029,8 @@ public class GenInvoiceSchedule implements Schedule {
tempMap.put("installment_amt" + cnt, instAmtDet); tempMap.put("installment_amt" + cnt, instAmtDet);
tempMap.put("acc_code" + cnt, accDet); tempMap.put("acc_code" + cnt, accDet);
tempMap.put("total_cost" + cnt, utilMethods.getReqDecString(totalCost,6)); tempMap.put("total_cost" + cnt, utilMethods.getReqDecString(totalCost,6));
tempMap.put("gross_amt" + cnt, utilMethods.getReqDecString(grossAmount,6));
//tempMap.put("tot_gross_amt" + cnt, utilMethods.getReqDecString(totalGrossAmount,2));
} }
...@@ -1207,9 +1214,10 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1207,9 +1214,10 @@ public class GenInvoiceSchedule implements Schedule {
taxesWithheld.appendChild(taxHeld); taxesWithheld.appendChild(taxHeld);
invoice.appendChild(taxesWithheld); invoice.appendChild(taxesWithheld);
System.out.println("totalGrossAmount :"+totalGrossAmount);
Element invoiceTotals = doc.createElement("InvoiceTotals"); Element invoiceTotals = doc.createElement("InvoiceTotals");
invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalGrossAmount",utilMethods.getReqDecString(NetAmtHd,2))); invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalGrossAmount",utilMethods.getReqDecString(totalGrossAmount,2)));
Element generalDiscounts = doc.createElement("GeneralDiscounts"); Element generalDiscounts = doc.createElement("GeneralDiscounts");
Element discount = doc.createElement("Discount"); Element discount = doc.createElement("Discount");
//discount.appendChild(getElementValue(doc, invoiceParent, "DiscountReason", "Sales Promotions")); //discount.appendChild(getElementValue(doc, invoiceParent, "DiscountReason", "Sales Promotions"));
...@@ -1219,7 +1227,7 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1219,7 +1227,7 @@ public class GenInvoiceSchedule implements Schedule {
invoiceTotals.appendChild(generalDiscounts); invoiceTotals.appendChild(generalDiscounts);
invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalGeneralDiscounts", utilMethods.getReqDecString(discAmtHd,2))); invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalGeneralDiscounts", utilMethods.getReqDecString(discAmtHd,2)));
invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalGeneralSurcharges", "0.00")); invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalGeneralSurcharges", "0.00"));
invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalGrossAmountBeforeTaxes", utilMethods.getReqDecString(NetAmtHd,2))); invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalGrossAmountBeforeTaxes", utilMethods.getReqDecString(totalGrossAmount,2)));
invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalTaxOutputs",utilMethods.getReqDecString(taxAmtHd,2))); invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalTaxOutputs",utilMethods.getReqDecString(taxAmtHd,2)));
invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalTaxesWithheld","0.00" )); invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "TotalTaxesWithheld","0.00" ));
invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "InvoiceTotal",utilMethods.getReqDecString(NetAmtHd,2))); invoiceTotals.appendChild(getElementValue(doc, invoiceParent, "InvoiceTotal",utilMethods.getReqDecString(NetAmtHd,2)));
...@@ -1281,7 +1289,10 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1281,7 +1289,10 @@ public class GenInvoiceSchedule implements Schedule {
invoiceLine.appendChild(charges);*/ invoiceLine.appendChild(charges);*/
invoiceLine.appendChild(getElementValue(doc, invoiceParent, "GrossAmount", (String) tempMap.get("net_amt" + i)));
invoiceLine.appendChild(getElementValue(doc, invoiceParent, "GrossAmount", (String) tempMap.get("gross_amt" + i)));
......
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