paymentmode value sent to the front end.

Wrote code in gkUpgrade to set paymentmode (i.e 2 for 'bank' and 3 for 'cash') to make a database consistent.

gkcore/views/api_invoice.py

@@ -284,7 +284,7 @@ There will be an icFlag which will determine if it's  an incrementing or decreme
                 self.con = eng.connect()
                 result = self.con.execute(select([invoice]).where(invoice.c.invid==self.request.params["invid"]))
                 invrow = result.fetchone()
-                inv = {"invid":invrow["invid"],"taxflag":invrow["taxflag"],"invoiceno":invrow["invoiceno"],"invoicedate":datetime.strftime(invrow["invoicedate"],"%d-%m-%Y"),"icflag":invrow["icflag"],"invoicetotal":"%.2f"%float(invrow["invoicetotal"]),"bankdetails":invrow["bankdetails"], "orgstategstin":invrow["orgstategstin"]}
+                inv = {"invid":invrow["invid"],"taxflag":invrow["taxflag"],"invoiceno":invrow["invoiceno"],"invoicedate":datetime.strftime(invrow["invoicedate"],"%d-%m-%Y"),"icflag":invrow["icflag"],"invoicetotal":"%.2f"%float(invrow["invoicetotal"]),"bankdetails":invrow["bankdetails"], "orgstategstin":invrow["orgstategstin"], "paymentmode":invrow["paymentmode"]}
                 if invrow["sourcestate"] != None:
                     inv["sourcestate"] = invrow["sourcestate"]
                     inv["sourcestatecode"] = getStateCode(invrow["sourcestate"],self.con)["statecode"]

gkcore/views/api_organisation.py

@@ -93,6 +93,20 @@ class api_organisation(object):
             self.con.execute("alter table invoice add address text")
             self.con.execute("alter table customerandsupplier add bankdetails jsonb")
             self.con.execute("alter table invoice add paymentmode integer")
+            #Code for assinging paymentmode where paymentmode is blank and bank details are present.
+            bankresult = self.con.execute(select([gkdb.invoice.c.invid,gkdb.invoice.c.bankdetails]).where(gkdb.invoice.c.paymentmode == None))
+            #Fetching invid,bankdetails using fetchall() method in list.for loop is used to fetch each record in bankresult.
+            dict = bankresult.fetchall()
+            for invdata in dict:
+                #Storing account number,ifsc number,invoice id in invaccno,invifsc,invoid respectively
+                invaccno = invdata["bankdetails"]["accountno"]
+                invifsc = invdata["bankdetails"]["ifsc"] 
+                invoid = invdata["invid"]
+                #Checking for bankdetails,if accountno and ifsc are present then set paymentmode=2 else set paymentmode=3. 
+                if (invaccno == "" or invifsc == ""):
+                    self.con.execute("update invoice set paymentmode=3 where invid = %d"%int(invoid))
+                else:
+                    self.con.execute("update invoice set paymentmode=2 where invid = %d"%int(invoid))
             self.con.execute("alter table organisation add bankdetails json")
             self.con.execute("alter table delchal add consignee jsonb")
             self.con.execute("alter table invoice add orgstategstin text")