From 4cce639e76193320c8e0abd98c07ccf77805c328 Mon Sep 17 00:00:00 2001 From: PravinDake97 Date: Mon, 29 Jan 2018 12:40:32 +0530 Subject: [PATCH 1/6] Added two radio buttons in Add Cash Memo model to check whether paymentmode is Cash or Bank. In View Cash Memo,if bank details are available then it will display otherwise CASH RECEIVED will be shown --- gkwebapp/static/js/addcashmemo.js | 15 +- gkwebapp/templates/addcashmemo.jinja2 | 315 ++++++++++--------- gkwebapp/templates/printinvoice.jinja2 | 83 ++--- gkwebapp/templates/viewsinglecashmemo.jinja2 | 6 +- 4 files changed, 216 insertions(+), 203 deletions(-) diff --git a/gkwebapp/static/js/addcashmemo.js b/gkwebapp/static/js/addcashmemo.js index 14b3b43b..6520d759 100644 --- a/gkwebapp/static/js/addcashmemo.js +++ b/gkwebapp/static/js/addcashmemo.js @@ -1787,7 +1787,16 @@ $(document).off("keyup").on("keyup", function(event) { } }); - - - + $("input[name='chkpaymentmode']").click(function () { + if ($("#chkcash").is(":checked")) { + $("#cash").show(); + $("#bank").hide(); + + } else { + $("#cash").hide(); + $("#bank").show(); + } + }); + }); + diff --git a/gkwebapp/templates/addcashmemo.jinja2 b/gkwebapp/templates/addcashmemo.jinja2 index 60eb1d61..06d6e767 100644 --- a/gkwebapp/templates/addcashmemo.jinja2 +++ b/gkwebapp/templates/addcashmemo.jinja2 @@ -30,7 +30,7 @@
- - {% if resultgstvat == '29' or resultgstvat == '7' %} - - - {% else %} - - - {% endif %} + + {% if resultgstvat == '29' or resultgstvat == '7' %} + + + {% else %} + + + {% endif %}
{% if resultgstvat != '22' %}
-
+ {% endif %} {% if gkstatus=="out" %} @@ -256,175 +256,176 @@ Use 'Ctrl + <' or 'Ctr + >' to navigate horizontally and 'Shift + <' or 'Shift + >' to navigate vertically. Press 'Insert' key to save Cash Memo. Press 'Esc' key to exit from the table. -
-
- - +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
{% trans %}Product/ Service{% endtrans %}{% trans %}HSN Code/ ACS Code{% endtrans %}{% trans %}Billed Quantity{% endtrans %}{% trans %}Free Quantity{% endtrans %}{% trans %}Rate{% endtrans %}{% trans %}Discount Amount{% endtrans %}{% trans %}Taxable Value {% endtrans %}{% trans %}CGST{% endtrans %}{% trans %}SGST/UTGST{% endtrans %}{% trans %}CESS{% endtrans %}
{%trans%}Rate{%endtrans%} %{%trans%}Amount{%endtrans%}{%trans%}Rate{%endtrans%} %{%trans%}Amount{%endtrans%}{% trans %}Rate{% endtrans %} %{% trans %}Amount{% endtrans %}
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + +
+ 		+
+ + +
+ + + + + + + +
+
+
+ + + + + + + + + + +
Total
+
+
+
+ + - - - - - - - - - - + + - - - - - - - - - -
{% trans %}Product/ Service{% endtrans %}{% trans %}HSN Code/ ACS Code{% endtrans %}{% trans %}Billed Quantity{% endtrans %}{% trans %}Free Quantity{% endtrans %}{% trans %}Rate{% endtrans %}{% trans %}Discount Amount{% endtrans %}{% trans %}Taxable Value {% endtrans %}{% trans %}CGST{% endtrans %}{% trans %}SGST/UTGST{% endtrans %}{% trans %}CESS{% endtrans %}Total
{%trans%}Rate{%endtrans%} %{%trans%}Amount{%endtrans%}{%trans%}Rate{%endtrans%} %{%trans%}Amount{%endtrans%}{% trans %}Rate{% endtrans %} %{% trans %}Amount{% endtrans %}
-
-
- - - - - - - - - + + + + + + - - - - - - - - + +
- - - -
- - -
- 		-
- - -
- - - - - +
+ + - - -
-
- - - - - - - - - - -
Total
-
- -
- - - - - - - - - - - - - - - - - -
Total
-
- - - -
- - {% endif %} - - + {% endif %} + -
-
+
+

Payment Details : Cash + Bank +

+ -
+


-
+
+
CASH RECEIVED
+
+ +
-->
+
diff --git a/gkwebapp/templates/printinvoice.jinja2 b/gkwebapp/templates/printinvoice.jinja2 index 916bfc3d..fa1f7c40 100644 --- a/gkwebapp/templates/printinvoice.jinja2 +++ b/gkwebapp/templates/printinvoice.jinja2 @@ -419,48 +419,49 @@


+
-
- - - - - - - - - - - - - - - - - - - - -
- Bank Details -
- - - {% if gkresult["bankdetails"]["accountno"] %}{{ gkresult["bankdetails"]["accountno"] }}{% else %}N/A{% endif %} - - - - {% if gkresult["bankdetails"]["bankname"] %}{{ gkresult["bankdetails"]["bankname"] }}{% else %}N/A{% endif %} -
- - - {% if gkresult["bankdetails"]["branch"] %}{{ gkresult["bankdetails"]["branch"] }}{% else %}N/A{% endif %} - - - - {% if gkresult["bankdetails"]["ifsc"] %}{{ gkresult["bankdetails"]["ifsc"] }}{% else %}N/A{% endif %} -
-
+
+ + + + + + + + + + + + + + + + + + + + +
+ Bank Details +
+ + + {% if gkresult["bankdetails"]["accountno"] %}{{ gkresult["bankdetails"]["accountno"] }}{% else %}N/A{% endif %} + + + + {% if gkresult["bankdetails"]["bankname"] %}{{ gkresult["bankdetails"]["bankname"] }}{% else %}N/A{% endif %} +
+ + + {% if gkresult["bankdetails"]["branch"] %}{{ gkresult["bankdetails"]["branch"] }}{% else %}N/A{% endif %} + + + + {% if gkresult["bankdetails"]["ifsc"] %}{{ gkresult["bankdetails"]["ifsc"] }}{% else %}N/A{% endif %} +
+
diff --git a/gkwebapp/templates/viewsinglecashmemo.jinja2 b/gkwebapp/templates/viewsinglecashmemo.jinja2 index 10f0bcc8..c6bbf8c0 100644 --- a/gkwebapp/templates/viewsinglecashmemo.jinja2 +++ b/gkwebapp/templates/viewsinglecashmemo.jinja2 @@ -223,7 +223,8 @@ -
+ {% if gkresult["bankdetails"]["accountno"] != "" %} +

Bank Details :

@@ -248,5 +249,6 @@
-
+ + {% else %}CASH RECEIVED{% endif %} -- GitLab From 6d28fb95567a5ca18cfab7e73fa72737daad109e Mon Sep 17 00:00:00 2001 From: PravinDake97 Date: Mon, 29 Jan 2018 20:05:27 +0530 Subject: [PATCH 2/6] Done with an insertion of data in database and assigned code to paymentmode as 2 for bank and 3 for cash. --- gkwebapp/static/js/addcashmemo.js | 10 +++++++++- gkwebapp/templates/viewsinglecashmemo.jinja2 | 2 +- gkwebapp/views/cashmemo.py | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gkwebapp/static/js/addcashmemo.js b/gkwebapp/static/js/addcashmemo.js index 6520d759..bb87d800 100644 --- a/gkwebapp/static/js/addcashmemo.js +++ b/gkwebapp/static/js/addcashmemo.js @@ -1220,7 +1220,15 @@ $(document).off("keyup").on("keyup", function(event) { form_data.append("orgstategstin",$("#orggstin").text() ); form_data.append("freeqty", JSON.stringify(freeqty)); form_data.append("discount", JSON.stringify(discount)); - form_data.append("bankdetails", JSON.stringify(bankdetails)); + if ($("#chkcash").is(":checked")) { + form_data.append("paymentmode",3); + + } else { + form_data.append("bankdetails", JSON.stringify(bankdetails)); + form_data.append("paymentmode",2); + } + + $('.modal-backdrop').remove(); $('.modal').modal('hide'); $('#confirm_yes').modal('show').one('click', '#tn_save_yes', function(e) { diff --git a/gkwebapp/templates/viewsinglecashmemo.jinja2 b/gkwebapp/templates/viewsinglecashmemo.jinja2 index c6bbf8c0..94d2fe63 100644 --- a/gkwebapp/templates/viewsinglecashmemo.jinja2 +++ b/gkwebapp/templates/viewsinglecashmemo.jinja2 @@ -223,7 +223,7 @@ - {% if gkresult["bankdetails"]["accountno"] != "" %} + {% if gkresult["paymentmode"] == 2 or gkresult["bankdetails"]["accountno"] != "" %}

Bank Details :

diff --git a/gkwebapp/views/cashmemo.py b/gkwebapp/views/cashmemo.py index a87c2f00..bfdb1922 100644 --- a/gkwebapp/views/cashmemo.py +++ b/gkwebapp/views/cashmemo.py @@ -54,6 +54,8 @@ def showeditcashmemo(request): def showsinglecashmemo(request): header={"gktoken":request.headers["gktoken"]} invoicedata = requests.get("http://127.0.0.1:6543/invoice?inv=single&invid=%d"%(int(request.params["invid"])), headers=header) + print "cash memo data" + print invoicedata.json()["gkresult"] return {"gkstatus": invoicedata.json()["gkstatus"],"gkresult": invoicedata.json()["gkresult"]} @@ -71,8 +73,7 @@ def getproducts(request): @view_config(route_name="cashmemos",request_param="action=save",renderer="json") def savecashmemo(request): header={"gktoken":request.headers["gktoken"]} - - cashmemodata = {"invoiceno":request.params["invoiceno"],"invoicetotal":request.params["invoicetotal"],"icflag":3,"taxstate":request.params["taxstate"],"sourcestate":request.params["sourcestate"],"invoicedate":request.params["invoicedate"],"tax":json.loads(request.params["tax"]), "cess":json.loads(request.params["cess"]), "contents":json.loads(request.params["contents"]),"freeqty":json.loads(request.params["freeqty"]),"taxflag":request.params["taxflag"],"orgstategstin":request.params["orgstategstin"]} + cashmemodata = {"invoiceno":request.params["invoiceno"],"invoicetotal":request.params["invoicetotal"],"icflag":3,"taxstate":request.params["taxstate"],"sourcestate":request.params["sourcestate"],"invoicedate":request.params["invoicedate"],"tax":json.loads(request.params["tax"]), "cess":json.loads(request.params["cess"]), "contents":json.loads(request.params["contents"]),"freeqty":json.loads(request.params["freeqty"]),"taxflag":request.params["taxflag"],"orgstategstin":request.params["orgstategstin"],"paymentmode":request.params["paymentmode"]} if request.params.has_key("discount"): cashmemodata["discount"]=json.loads(request.params["discount"]) -- GitLab From 44bbbbb87017b7a04d0f07c7c71c14d6f744b196 Mon Sep 17 00:00:00 2001 From: PravinDake97 Date: Fri, 2 Feb 2018 15:22:30 +0530 Subject: [PATCH 3/6] changes made in viewsinglecashmemo and printcashmemo,if paymentmode is 2 then show bankdetails otherwise if paymentmode is 3,then show cash received. --- gkwebapp/templates/printcashmemo.jinja2 | 89 +++++++++++--------- gkwebapp/templates/viewsinglecashmemo.jinja2 | 4 +- gkwebapp/views/cashmemo.py | 3 - 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/gkwebapp/templates/printcashmemo.jinja2 b/gkwebapp/templates/printcashmemo.jinja2 index e23f277f..c9010d05 100644 --- a/gkwebapp/templates/printcashmemo.jinja2 +++ b/gkwebapp/templates/printcashmemo.jinja2 @@ -281,50 +281,55 @@


+ {% if gkresult["paymentmode"] == 2 %}
-
-
- - - - - - - - - - - - - - - - - - - -
- Bank Details -
- - - {% if gkresult["bankdetails"]["accountno"] %}{{ gkresult["bankdetails"]["accountno"] }}{% else %}N/A{% endif %} - - - - {% if gkresult["bankdetails"]["bankname"] %}{{ gkresult["bankdetails"]["bankname"] }}{% else %}N/A{% endif %} -
- - - {% if gkresult["bankdetails"]["branch"] %}{{ gkresult["bankdetails"]["branch"] }}{% else %}N/A{% endif %} - - - - {% if gkresult["bankdetails"]["ifsc"] %}{{ gkresult["bankdetails"]["ifsc"] }}{% else %}N/A{% endif %} -
-
- +
+ + + + + + + + + + + + + + + + + + + + +
+ Bank Details +
+ + + {% if gkresult["bankdetails"]["accountno"] %}{{ gkresult["bankdetails"]["accountno"] }}{% else %}N/A{% endif %} + + + + {% if gkresult["bankdetails"]["bankname"] %}{{ gkresult["bankdetails"]["bankname"] }}{% else %}N/A{% endif %} +
+ + + {% if gkresult["bankdetails"]["branchname"] %}{{ gkresult["bankdetails"]["branchname"] }}{% else %}N/A{% endif %} + + + + {% if gkresult["bankdetails"]["ifsc"] %}{{ gkresult["bankdetails"]["ifsc"] }}{% else %}N/A{% endif %} +
+
+ {% else %} +
+ CASH RECEIVED +
+ {% endif %}
diff --git a/gkwebapp/templates/viewsinglecashmemo.jinja2 b/gkwebapp/templates/viewsinglecashmemo.jinja2 index 94d2fe63..d8f10de0 100644 --- a/gkwebapp/templates/viewsinglecashmemo.jinja2 +++ b/gkwebapp/templates/viewsinglecashmemo.jinja2 @@ -223,7 +223,7 @@
- {% if gkresult["paymentmode"] == 2 or gkresult["bankdetails"]["accountno"] != "" %} + {% if gkresult["paymentmode"] == 2 %}

Bank Details :

@@ -241,7 +241,7 @@
- {% if gkresult["bankdetails"]["branch"] %}{{ gkresult["bankdetails"]["branch"] }}{% else %}N/A{% endif %} + {% if gkresult["bankdetails"]["branchname"] %}{{ gkresult["bankdetails"]["branchname"] }}{% else %}N/A{% endif %}
diff --git a/gkwebapp/views/cashmemo.py b/gkwebapp/views/cashmemo.py index bfdb1922..fc723935 100644 --- a/gkwebapp/views/cashmemo.py +++ b/gkwebapp/views/cashmemo.py @@ -54,8 +54,6 @@ def showeditcashmemo(request): def showsinglecashmemo(request): header={"gktoken":request.headers["gktoken"]} invoicedata = requests.get("http://127.0.0.1:6543/invoice?inv=single&invid=%d"%(int(request.params["invid"])), headers=header) - print "cash memo data" - print invoicedata.json()["gkresult"] return {"gkstatus": invoicedata.json()["gkstatus"],"gkresult": invoicedata.json()["gkresult"]} @@ -79,7 +77,6 @@ def savecashmemo(request): cashmemodata["discount"]=json.loads(request.params["discount"]) if request.params.has_key("bankdetails"): cashmemodata["bankdetails"]=json.loads(request.params["bankdetails"]) - stock = json.loads(request.params["stock"]) invoicewholedata = {"invoice":cashmemodata,"stock":stock} -- GitLab From e9f60bc98b68720a8135ce57f4456ff0ff946c40 Mon Sep 17 00:00:00 2001 From: PravinDake97 Date: Fri, 2 Feb 2018 16:42:00 +0530 Subject: [PATCH 4/6] Done with Documentation --- gkwebapp/static/js/addcashmemo.js | 2 ++ gkwebapp/templates/printcashmemo.jinja2 | 1 + gkwebapp/templates/viewsinglecashmemo.jinja2 | 1 + 3 files changed, 4 insertions(+) diff --git a/gkwebapp/static/js/addcashmemo.js b/gkwebapp/static/js/addcashmemo.js index bb87d800..2fa696ac 100644 --- a/gkwebapp/static/js/addcashmemo.js +++ b/gkwebapp/static/js/addcashmemo.js @@ -1220,6 +1220,7 @@ $(document).off("keyup").on("keyup", function(event) { form_data.append("orgstategstin",$("#orggstin").text() ); form_data.append("freeqty", JSON.stringify(freeqty)); form_data.append("discount", JSON.stringify(discount)); + //code for sending data to the database based on which radio button is checked i.e."cash" or "bank". if ($("#chkcash").is(":checked")) { form_data.append("paymentmode",3); @@ -1795,6 +1796,7 @@ $(document).off("keyup").on("keyup", function(event) { } }); + //code for radio buttons to show and hide "bankdetails fields" and "cash received" $("input[name='chkpaymentmode']").click(function () { if ($("#chkcash").is(":checked")) { $("#cash").show(); diff --git a/gkwebapp/templates/printcashmemo.jinja2 b/gkwebapp/templates/printcashmemo.jinja2 index c9010d05..55b0be4f 100644 --- a/gkwebapp/templates/printcashmemo.jinja2 +++ b/gkwebapp/templates/printcashmemo.jinja2 @@ -281,6 +281,7 @@


+ {% if gkresult["paymentmode"] == 2 %}
diff --git a/gkwebapp/templates/viewsinglecashmemo.jinja2 b/gkwebapp/templates/viewsinglecashmemo.jinja2 index d8f10de0..0ebf36ae 100644 --- a/gkwebapp/templates/viewsinglecashmemo.jinja2 +++ b/gkwebapp/templates/viewsinglecashmemo.jinja2 @@ -223,6 +223,7 @@
+ {% if gkresult["paymentmode"] == 2 %}

Bank Details :

-- GitLab From 3ce6eb2de523d0f16fdaf6ce68fcf9f24825339f Mon Sep 17 00:00:00 2001 From: PravinDake97 Date: Thu, 8 Feb 2018 18:00:10 +0530 Subject: [PATCH 5/6] Documentation in addcashmemo. --- gkwebapp/static/js/addcashmemo.js | 21 +++++++++++++-------- gkwebapp/templates/addcashmemo.jinja2 | 3 +-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/gkwebapp/static/js/addcashmemo.js b/gkwebapp/static/js/addcashmemo.js index 2fa696ac..ebf6937f 100644 --- a/gkwebapp/static/js/addcashmemo.js +++ b/gkwebapp/static/js/addcashmemo.js @@ -1220,11 +1220,13 @@ $(document).off("keyup").on("keyup", function(event) { form_data.append("orgstategstin",$("#orggstin").text() ); form_data.append("freeqty", JSON.stringify(freeqty)); form_data.append("discount", JSON.stringify(discount)); - //code for sending data to the database based on which radio button is checked i.e."cash" or "bank". - if ($("#chkcash").is(":checked")) { - form_data.append("paymentmode",3); + //Code for sending data to the database based on which radio button is checked i.e."cash" or "bank". + if ($("#chkcash").is(":checked")) { + //Checking which radio button is clicked. if cash is selected then paymentmode is set to 3 (i.e. cash transaction) + form_data.append("paymentmode",3); - } else { + } else { + //If bank is selected then append both bankdetails and paymentmode = 2 (i.e. bank transaction). form_data.append("bankdetails", JSON.stringify(bankdetails)); form_data.append("paymentmode",2); } @@ -1796,13 +1798,16 @@ $(document).off("keyup").on("keyup", function(event) { } }); - //code for radio buttons to show and hide "bankdetails fields" and "cash received" - $("input[name='chkpaymentmode']").click(function () { - if ($("#chkcash").is(":checked")) { + //Code for radio buttons to show and hide "bankdetails fields" and "cash received" + $("input[name='chkpaymentmode']").click(function () { + //Checking which radio button is selected. + if ($("#chkcash").is(":checked")) { + //If cash is selected then bankdetails fields are hide and 'CASH RECEIVED' is shown. $("#cash").show(); $("#bank").hide(); - } else { + } else { + //If bank is selected then bankdetails fields are shown and 'CASH RECEIVED' is hide. $("#cash").hide(); $("#bank").show(); } diff --git a/gkwebapp/templates/addcashmemo.jinja2 b/gkwebapp/templates/addcashmemo.jinja2 index 06d6e767..a8c81d95 100644 --- a/gkwebapp/templates/addcashmemo.jinja2 +++ b/gkwebapp/templates/addcashmemo.jinja2 @@ -375,8 +375,7 @@
{% endif %} -
- +

Payment Details : Cash Bank -- GitLab From 8edef1bec55cc07c21cbdf6e9da7418f55b3bbaa Mon Sep 17 00:00:00 2001 From: PravinDake97 Date: Tue, 13 Feb 2018 13:18:09 +0530 Subject: [PATCH 6/6] Changed the keydown event of product table in addinvoice. Changed the alignment and font size of CASH RECEIVED in addcashmemo,viewsinglecashmemo,printcashmemo. Inlined CASH RECEIVED and Total Amount in printcashmemo. --- gkwebapp/static/js/addcashmemo.js | 32 ++++++++++++----- gkwebapp/templates/addcashmemo.jinja2 | 37 ++++++++++++-------- gkwebapp/templates/printcashmemo.jinja2 | 2 -- gkwebapp/templates/viewsinglecashmemo.jinja2 | 10 +++--- 4 files changed, 51 insertions(+), 30 deletions(-) diff --git a/gkwebapp/static/js/addcashmemo.js b/gkwebapp/static/js/addcashmemo.js index ebf6937f..5907c66a 100644 --- a/gkwebapp/static/js/addcashmemo.js +++ b/gkwebapp/static/js/addcashmemo.js @@ -475,10 +475,10 @@ $(document).ready(function() { } else if (event.which == 190 && event.ctrlKey) { event.preventDefault(); $('#invoice_product_table_gst tbody tr:eq(' + curindex + ') td:eq(2) input').focus().select(); + } else if (event.which == 27) { + event.preventDefault(); + $("#chkcash").focus().click(); } - else if (event.which == 27) { - $("#accountno").focus().select(); - } }); $(document).off('change', '.product_name_gst').on('change', '.product_name_gst', function(event) { @@ -613,7 +613,7 @@ $(document).ready(function() { } else if (event.which == 27) { $("#accountno").focus().select(); - } + } }); $(document).off('change', '.invoice_product_quantity_vat').on('change', '.invoice_product_quantity_vat', function(event) { @@ -992,7 +992,7 @@ else { } else if (previndex == -1) { if ($("#taxapplicable").val() == 7) { - $(".invoice_product_discount_gst:last").focus().select(); + $("#chkcash").focus().select(); } else { $(".invoice_product_discount_vat:last").focus().select(); @@ -1566,7 +1566,7 @@ $(document).off("keyup").on("keyup", function(event) { event.preventDefault(); } else if (event.which == 27) { - $("#accountno").focus().select(); + $("#chkcash").focus().click(); } }); @@ -1630,7 +1630,7 @@ $(document).off("keyup").on("keyup", function(event) { } else if (event.which == 27) { event.preventDefault(); - $("#accountno").focus().select(); + $("#chkcash").focus().click(); } }); @@ -1675,7 +1675,7 @@ $(document).off("keyup").on("keyup", function(event) { $('#invoice_product_table_gst tbody tr:eq(' + curindex + ') td:eq(3) input').focus().select(); } else if (event.which == 27) { - $("#accountno").focus().select(); + $("#chkcash").focus().click(); } }); @@ -1788,7 +1788,7 @@ $(document).off("keyup").on("keyup", function(event) { } else if (event.which == 27) { event.preventDefault(); - $("#accountno").focus().select(); + $("#chkcash").focus().click(); } }); @@ -1798,6 +1798,20 @@ $(document).off("keyup").on("keyup", function(event) { } }); + $(document).off('keydown', '#chkcash').on('keydown', '#chkcash', function(event) { + if(event.which==13){ + $("#invoice_save").focus(); + } + + }); + + $(document).off('keydown', '#chkbank').on('keydown', '#chkbank', function(event) { + if(event.which==13){ + $("#accountno").focus().select(); + } + + }); + //Code for radio buttons to show and hide "bankdetails fields" and "cash received" $("input[name='chkpaymentmode']").click(function () { //Checking which radio button is selected. diff --git a/gkwebapp/templates/addcashmemo.jinja2 b/gkwebapp/templates/addcashmemo.jinja2 index a8c81d95..ae5e3f6b 100644 --- a/gkwebapp/templates/addcashmemo.jinja2 +++ b/gkwebapp/templates/addcashmemo.jinja2 @@ -375,15 +375,22 @@

{% endif %} - -
-

Payment Details : Cash - Bank +

+
+
+ +
+ +
+
+ +
+
- - +
diff --git a/gkwebapp/templates/printcashmemo.jinja2 b/gkwebapp/templates/printcashmemo.jinja2 index 55b0be4f..2d7e9ec4 100644 --- a/gkwebapp/templates/printcashmemo.jinja2 +++ b/gkwebapp/templates/printcashmemo.jinja2 @@ -279,8 +279,6 @@
-
-
{% if gkresult["paymentmode"] == 2 %}
diff --git a/gkwebapp/templates/viewsinglecashmemo.jinja2 b/gkwebapp/templates/viewsinglecashmemo.jinja2 index 0ebf36ae..638802d6 100644 --- a/gkwebapp/templates/viewsinglecashmemo.jinja2 +++ b/gkwebapp/templates/viewsinglecashmemo.jinja2 @@ -219,15 +219,16 @@
- +
{% if gkresult["paymentmode"] == 2 %}
-

Bank Details :

-
+ +
+
@@ -251,5 +252,6 @@
- {% else %}CASH RECEIVED{% endif %} + {% else %} +
{% endif %} -- GitLab