F17ABAS001 source code commit

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

webitm-gst/ibase/webitm/bean/gst/CDNDetails.java

@@ -17,5 +17,9 @@ public class CDNDetails
 	
 	public double val;
 	
+	public String reason;
+	
+	public boolean isPreGSTInvoice;
+	
 	public List<InvLineItem> items;
 }

webitm-gst/ibase/webitm/bean/gst/CDNUR.java

@@ -24,5 +24,9 @@ public class CDNUR extends BaseData
 	
 	public double val;
 	
+	public String reason;
+	
+	public boolean isPreGSTInvoice;
+	
 	public List<InvLineItem> items;
 }

webitm-gst/ibase/webitm/bean/gst/Invoice.java

@@ -24,6 +24,8 @@ public class Invoice
 
     public String invoiceType;
     
+    public String shippingPortCode;
+    
     public String shippingBillNum;
     
     public Date shippingBillDt;

webitm-gst/ibase/webitm/util/gst/BaseSerializer.java

@@ -42,6 +42,10 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             }
             else
             {
+            	if(inv.shippingPortCode != null)
+            	{
+            		json.writeStringField("sbpcode",inv.shippingPortCode);
+            	}
                 if(inv.shippingBillNum != null)
                 {
                 	json.writeStringField("sbnum", inv.shippingBillNum);

webitm-gst/ibase/webitm/util/gst/CDNRSerializer.java

@@ -47,6 +47,8 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
 			json.writeStringField("inum", cdnDetails.invoiceNumber);
 			json.writeStringField("idt", gstFmt.format(cdnDetails.invoiceDate));
 			json.writeNumberField("val", cdnDetails.val);
+			json.writeStringField("rsn", cdnDetails.reason);
+			json.writeStringField("p_gst", cdnDetails.isPreGSTInvoice ? "Y" : "N");
 			
 			writeCDNLineItems(cdnDetails, json);
 

webitm-gst/ibase/webitm/util/gst/CDNURSerializer.java

@@ -27,6 +27,8 @@ public class CDNURSerializer extends JsonSerializer<CDNUR>
 		json.writeStringField("inum", cdnur.invoiceNumber);
 		json.writeStringField("idt", gstFmt.format(cdnur.invoiceDate));
 		json.writeNumberField("val", cdnur.val);
+		json.writeStringField("rsn", cdnur.reason);
+		json.writeStringField("p_gst", cdnur.isPreGSTInvoice ? "Y" : "N");
 		
 		writeLineItems(cdnur.items, json);