diff --git a/gkwebapp/static/js/addcashmemo.js b/gkwebapp/static/js/addcashmemo.js index 14b3b43b588430796d52a3c7cae2e18e8bd43468..5907c66aecb6635463319530c254f2e3577f9443 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(); @@ -1220,7 +1220,18 @@ $(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)); + //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 { + //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); + } + + $('.modal-backdrop').remove(); $('.modal').modal('hide'); $('#confirm_yes').modal('show').one('click', '#tn_save_yes', function(e) { @@ -1555,7 +1566,7 @@ $(document).off("keyup").on("keyup", function(event) { event.preventDefault(); } else if (event.which == 27) { - $("#accountno").focus().select(); + $("#chkcash").focus().click(); } }); @@ -1619,7 +1630,7 @@ $(document).off("keyup").on("keyup", function(event) { } else if (event.which == 27) { event.preventDefault(); - $("#accountno").focus().select(); + $("#chkcash").focus().click(); } }); @@ -1664,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(); } }); @@ -1777,7 +1788,7 @@ $(document).off("keyup").on("keyup", function(event) { } else if (event.which == 27) { event.preventDefault(); - $("#accountno").focus().select(); + $("#chkcash").focus().click(); } }); @@ -1787,7 +1798,34 @@ $(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. + if ($("#chkcash").is(":checked")) { + //If cash is selected then bankdetails fields are hide and 'CASH RECEIVED' is shown. + $("#cash").show(); + $("#bank").hide(); + } 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 60eb1d61656dcf0b7c4afa60959f20d2aa2b9e21..ae5e3f6b190d8434778c247a0bb0422be034450d 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,182 @@ 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 %} +
+
+
+ +
+ +
+
+ +
+
+
+ -
-

- - -
+
+
+
+ +
+
+
+
+ + --> +
diff --git a/gkwebapp/templates/printcashmemo.jinja2 b/gkwebapp/templates/printcashmemo.jinja2 index e23f277f902c264b6384cd3f529a6df0cb45ebf5..2d7e9ec45ada3f05fb0371d66f8a27810fbf7b70 100644 --- a/gkwebapp/templates/printcashmemo.jinja2 +++ b/gkwebapp/templates/printcashmemo.jinja2 @@ -279,52 +279,56 @@
-
-
+ + {% 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/printinvoice.jinja2 b/gkwebapp/templates/printinvoice.jinja2 index 916bfc3d5c17cbc4a93c979d2800a892a22bbf18..fa1f7c40ec77eaf40ae834a1a004b10f45e4164f 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 10f0bcc81e3949ec29bf8701f72da97fe24e4cf5..638802d671438edd7b83d4d42a556d442a7bf194 100644 --- a/gkwebapp/templates/viewsinglecashmemo.jinja2 +++ b/gkwebapp/templates/viewsinglecashmemo.jinja2 @@ -219,13 +219,16 @@
- +
-
-

Bank Details :

-
+ + {% if gkresult["paymentmode"] == 2 %} +
+ +
+
@@ -240,7 +243,7 @@
- {% if gkresult["bankdetails"]["branch"] %}{{ gkresult["bankdetails"]["branch"] }}{% else %}N/A{% endif %} + {% if gkresult["bankdetails"]["branchname"] %}{{ gkresult["bankdetails"]["branchname"] }}{% else %}N/A{% endif %}
@@ -248,5 +251,7 @@
-
+
+ {% else %} +
{% endif %} diff --git a/gkwebapp/views/cashmemo.py b/gkwebapp/views/cashmemo.py index a87c2f00d21a603c674fb2aeca8f83b1df354cfb..fc7239356988766386540f44949d5e367f5468e6 100644 --- a/gkwebapp/views/cashmemo.py +++ b/gkwebapp/views/cashmemo.py @@ -71,14 +71,12 @@ 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"]) if request.params.has_key("bankdetails"): cashmemodata["bankdetails"]=json.loads(request.params["bankdetails"]) - stock = json.loads(request.params["stock"]) invoicewholedata = {"invoice":cashmemodata,"stock":stock}