Skip to content

B
business-java
Commit 81ae40e8 authored by vvengurlekar's avatar vvengurlekar
Browse files
Options

AssetSales.java - added code for setting acct_code__ar, acct_code__ar, customer_cust_name 

AssetSalesConf.java - commented tax calculation code for avoiding tax calculation
FixedAssetTransf.java -  added code to set item_ser__to,grp_code__to,aloc_code__to,asset_code__par_to,depr_type__to,cctr_code__to
MiscVoucherIC.java - added code for setting tax_class, tax_chap, tax_env


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185361 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4763b3c3
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 10 deletions
webitm-fin/ibase/webitm/ejb/fin/AssetSales.java
View file @ 81ae40e8
......@@ -1152,20 +1152,24 @@ conn = getConnection();
if(custCode != null && custCode.trim().length()>0 )
{
//added by varsha v on 24-05-18 for setting acct_code__ar, acct_code__ar, customer_cust_name
valueXmlString.append("<exch_rate>").append("<![CDATA[" + excRate + "]]>").append("</exch_rate>");
valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>");
valueXmlString.append("<customer_cust_name>").append("<![CDATA[" + custName + "]]>").append("</customer_cust_name>");
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + acctCodeArLs + "]]>").append("</acct_code__ar>");
valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + cctrCodeArLs + "]]>").append("</cctr_code__ar>");
}
else
{
valueXmlString.append("<exch_rate>").append("<![CDATA[]]>").append("</exch_rate>");
valueXmlString.append("<cust_name>").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<customer_cust_name>").append("<![CDATA[]]>").append("</customer_cust_name>");
valueXmlString.append("<curr_code>").append("<![CDATA[]]>").append("</curr_code>");
valueXmlString.append("<acct_code__ar>").append("<![CDATA[]]>").append("</acct_code__ar>");
valueXmlString.append("<cctr_code__ar>").append("<![CDATA[]]>").append("</cctr_code__ar>");
}
//ended by varsha v on 24-05-18 for setting acct_code__ar, acct_code__ar, customer_cust_name
}
if(currentColumn.trim().equalsIgnoreCase("curr_code"))
{
......
webitm-fin/ibase/webitm/ejb/fin/AssetSalesConf.java
View file @ 81ae40e8
......@@ -82,7 +82,8 @@ AssetSalesConfLocal,AssetSalesConfRemote
String getAcctCctrLo="",getAcctCctrPl="",loginEmpCode="",getErr="";
String [] acctCctr;
SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
TaxCalculation taxCal = new TaxCalculation("assetsales");
//commented below line for avoiding tax calculation by varsha v on 24-05-18
//TaxCalculation taxCal = new TaxCalculation("assetsales");
int cnt = 0;
int cdupto=0,cdfr=0;
SimpleDateFormat sdf = null;
......@@ -292,8 +293,8 @@ conn = getConnection();
}
}
System.out.println("calling taxCalc");
//commented below code for avoiding tax calculation by varsha v on 24-05-18
/*System.out.println("calling taxCalc");
retString = taxCal.taxCalc(transer, tranId, currAppdate, "sale_amt", "", currCode, siteCode, "2");
System.out.println("exit taxCalc>>"+retString);
......@@ -303,7 +304,8 @@ conn = getConnection();
errString = itmDBAccess.getErrorString("",errCode,"","",conn);
System.out.println("errString :>>kkk"+errString);
return errString;
}
}*/
//commented below line for avoiding tax calculation by varsha v on 24-05-18
......
webitm-fin/ibase/webitm/ejb/fin/FixedAssetTransf.java
View file @ 81ae40e8
......@@ -744,13 +744,21 @@ conn = getConnection();
valueXmlString.append("<depr_type__to protect = \"0\">").append("<![CDATA[]]>").append("</depr_type__to>");
//Basic
valueXmlString.append("<asset_type>").append("<![CDATA[" + assetType + "]]>").append("</asset_type>");
//Added code by varsha v on 24-05-18 to set item_ser__to,grp_code__to,aloc_code__to,asset_code__par_to,depr_type__to,cctr_code__to
valueXmlString.append("<asset_code__to>").append("<![CDATA[" + assetCodeFrom + "]]>").append("</asset_code__to>");
valueXmlString.append("<item_ser__from>").append("<![CDATA[" + itemSer + "]]>").append("</item_ser__from>");
valueXmlString.append("<item_ser__to>").append("<![CDATA[" + itemSer + "]]>").append("</item_ser__to>");
valueXmlString.append("<grp_code__from>").append("<![CDATA[" + grpCode + "]]>").append("</grp_code__from>");
valueXmlString.append("<grp_code__to>").append("<![CDATA[" + grpCode + "]]>").append("</grp_code__to>");
valueXmlString.append("<aloc_code__from>").append("<![CDATA[" + alocCode + "]]>").append("</aloc_code__from>");
valueXmlString.append("<aloc_code__to>").append("<![CDATA[" + alocCode + "]]>").append("</aloc_code__to>");
valueXmlString.append("<asset_code__par_from>").append("<![CDATA[" + assetCodePar + "]]>").append("</asset_code__par_from>");
valueXmlString.append("<asset_code__par_to>").append("<![CDATA[" + assetCodePar + "]]>").append("</asset_code__par_to>");
valueXmlString.append("<depr_type__from>").append("<![CDATA[" + deprType + "]]>").append("</depr_type__from>");
valueXmlString.append("<depr_type__to>").append("<![CDATA[" + deprType + "]]>").append("</depr_type__to>");
valueXmlString.append("<cctr_code__from>").append("<![CDATA[" + cctrCode + "]]>").append("</cctr_code__from>");
valueXmlString.append("<cctr_code__to>").append("<![CDATA[" + cctrCode + "]]>").append("</cctr_code__to>");
//ended code by varsha v on 24-05-18 to set item_ser__to,grp_code__to,aloc_code__to,asset_code__par_to,depr_type__to,cctr_code__to
//Others
valueXmlString.append("<item_code>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>");
......
webitm-fin/ibase/webitm/ejb/fin/MiscVoucherIC.java
View file @ 81ae40e8
......@@ -1410,7 +1410,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
errFields.add(childNodeName.toLowerCase());
}
}
}*///end by Abhijit
}//end by Abhijit
}
}
break;
......@@ -4360,6 +4360,11 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
{
valueXmlString.append("<proj_code>").append("<![CDATA[" + projCode1 + "]]>").append("</proj_code>");
}
//Added by Varsha V on 24-05-18 for setting tax_class, tax_chap, tax_env
valueXmlString.append("<tax_class>").append("<![CDATA[" + checkNull(taxClass) + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap>").append("<![CDATA[" + checkNull(taxChap) + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_env>").append("<![CDATA[" + checkNull(taxEnv) + "]]>").append("</tax_env>");
//Ended by Varsha V on 24-05-18 for setting tax_class, tax_chap, tax_env
}
else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
......
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