CHANGE IN IF ELSE CONDTION

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@194407 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/PoReceiptIc.java

@@ -1007,7 +1007,7 @@ public class PoReceiptIc extends ValidatorEJB implements  PoReceiptIcLocal,PoRec
 							if(! "P-RET".equals(tranSer))
 							{
 								sql="select count(*) from voucher where bill_no = ? and supp_code = ? and bill_date = ?" +
-										"and vouch_type <> ?";
+										"and vouch_type <> ? and  confirmed='N'" ;// confirmed= N added by nandkumar gadkari on 13/12/18
 								pstmt=conn.prepareStatement(sql);
 								pstmt.setString(1,invoiceNo );
 								pstmt.setString(2,suppCode );
@@ -1060,10 +1060,10 @@ public class PoReceiptIc extends ValidatorEJB implements  PoReceiptIcLocal,PoRec
 									errList.add(errCode);
 									errFields.add(childNodeName.toLowerCase());
 								}
-							}
+							//}// COMMENTED BY NANDKUMAR GADKARI ON 13/12/18
 							else
 							{
-								sql="select count(*) from misc_payables where sundry_type = ? and sundry_code=? and bill_no=? and bill_date= ? and tran_ser not in ('P-ADV','VOUCH')";
+								sql="select count(*) from misc_payables where sundry_type = ? and sundry_code=? and bill_no=? and bill_date= ? and tran_ser not in ('P-ADV','M-ADV')";
 								pstmt=conn.prepareStatement(sql);
 								pstmt.setString(1, "S");
 								pstmt.setString(2, suppCode);
@@ -1088,7 +1088,7 @@ public class PoReceiptIc extends ValidatorEJB implements  PoReceiptIcLocal,PoRec
 								}
 								else
 								{
-									sql="select count(*) from  misc_voucher where sundry_code = ? and bill_no = ? and bill_date = ? and sundry_type = ?";
+									sql="select count(*) from  misc_voucher where sundry_code = ? and bill_no = ? and bill_date = ? and sundry_type = ? and  confirmed='N'";// confirmed= N added by nandkumar gadkari on 13/12/18
 									pstmt=conn.prepareStatement(sql);
 									pstmt.setString(1, suppCode);
 									pstmt.setString(2, invoiceNo);
@@ -1140,7 +1140,7 @@ public class PoReceiptIc extends ValidatorEJB implements  PoReceiptIcLocal,PoRec
 									}
 								}
 							}
-							
+							}
 						}
 					}
 					//Added by sarita for invoice_date validation on 09JAN2018[start]