...
 
Commits (69)
......@@ -46,3 +46,22 @@ input[type="checkbox"]:focus {outline: 2px #1f0e5e solid !important;}
outline: 2px #1f0e5e solid !important;
}
@media (min-width: 767px) {
nav, .navbar-collapse, .navbar-fixed-top, .navbar-header, nav > li, .navbar-brand {
min-height:35px !important;
height:35px !important;
}
nav > li > a, , .navbar-brand{
padding-top:7px !important;
padding-bottom:7px !important;
}
.navbar-nav > li > a {
padding-top:7px !important;
padding-bottom:7px !important;
}
#mainshellticker {
margin-top: 37px;
margin-bottom:1px;
}
}
......@@ -117,16 +117,16 @@ $(document).ready(function() {
if(str[1] != undefined){
if(len.length == 1){
str[1] = str[1]+0;
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees";
}
}else{
numbertowords = "Zero"+" "+ "rupees";
numbertowords = "Zero"+" "+ "Rupees";
}
}
......@@ -180,16 +180,16 @@ $(document).ready(function() {
if(str[1] != undefined){
if(len.length == 1){
str[1] = str[1]+0;
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees";
}
}else{
numbertowords = "Zero"+" "+ "rupees";
numbertowords = "Zero"+" "+ "Rupees";
}
}
//Total of various columns are displayed on the footer.
......@@ -974,10 +974,6 @@ $('#invoice_product_table_vat tbody tr:eq(' + curindex + ') td:eq(4) input').foc
}
});
///
///
$(document).off("keydown", ".invoice_product_tax_rate_vat").on("keydown", ".invoice_product_tax_rate_vat", function(event) {
var curindex1 = $(this).closest('tr').index();
var nextindex1 = curindex1 + 1;
......@@ -1051,23 +1047,25 @@ var curindex = $(this).closest('tr').index();
var nextindex = curindex + 1;
var previndex = curindex - 1;
if ($("#invoice_product_table_vat tbody tr").length > 1) {
$(this).closest('tr').fadeOut(200, function() {
$(this).closest('tr').remove(); //closest method gives the closest element productified
$("#invoice_product_table_vat tbody tr:first td:eq(0) select").focus();
});
$(this).closest('tr').fadeOut(200, function() {
$(this).closest('tr').remove(); //closest method gives the closest element productified
$("#invoice_product_table_vat tbody tr:first td:eq(0) select").focus();
calculatevataxamt(curindex);
});
}
if ($("#invoice_product_table_vat tbody tr").length == 1) {
$("#invoice_product_table_vat tbody tr:eq(0) td:eq(9)").empty();
}
if ($("#invoice_product_table_gst tbody tr").length > 1) {
$(this).closest('tr').remove();
$("#invoice_product_table_gst tbody tr:eq("+curindex+")").remove();
$("#invoice_product_table_gst tbody tr:first td:eq(0) select").focus();
}
if ($("#invoice_product_table_gst tbody tr").length == 1) {
$("#invoice_product_table_total tbody tr:eq(0) td:eq(1)").empty();
$(this).closest('tr').remove();
$("#invoice_product_table_gst tbody tr:eq("+curindex+")").remove();
$("#invoice_product_table_gst tbody tr:first td:eq(0) select").focus();
calculategstaxamt(curindex);
}
if ($("#invoice_product_table_gst tbody tr").length == 1) {
$("#invoice_product_table_total tbody tr:eq(0) td:eq(1)").empty();
}
});
$(document).off("keydown", ".lastfield").on("keydown", ".lastfield", function(event) {
......@@ -1117,7 +1115,98 @@ $(document).off("keyup").on("keyup", function(event) {
return false;
}
});
//Validation for 'Bank Deatils'.
$("#bankname").keydown(function(event) {
if (event.which==13) {
event.preventDefault();
if ($.trim($("#accountno").val())=="" && $.trim($("#bankname").val())!="") {
$("#accountno-blank-alert").alert();
$("#accountno-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#accountno-blank-alert").hide();
});
$("#accountno").focus();
return false;
}
else if ($.trim($("#accountno").val())!="" && $.trim($("#bankname").val())=="") {
$("#bankname-blank-alert").alert();
$("#bankname-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#bankname-blank-alert").hide();
});
$("#bankname").focus();
return false;
}
}
});
$("#branchname").keydown(function(event) {
if (event.which==13) {
if ($.trim($("#accountno").val())=="" && $.trim($("#branchname").val())!="" ) {
$("#accountno-blank-alert").alert();
$("#accountno-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#accountno-blank-alert").hide();
});
$("#accountno").focus();
return false;
}
if ( $.trim($("#bankname").val())=="" && $.trim($("#branchname").val())!="" ) {
$("#bankname-blank-alert").alert();
$("#bankname-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#bankname-blank-alert").hide();
});
$("#bankname").focus();
return false;
}
if ($.trim($("#accountno").val())!="" && $.trim($("#bankname").val())!="" && $.trim($("#branchname").val())=="" ) {
$("#branch-blank-alert").alert();
$("#branch-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#branch-blank-alert").hide();
});
$("#branchname").focus();
return false;
}
}
});
$("#ifsc").keydown(function(event) {
if (event.which==13) {
if ($.trim($("#accountno").val())=="" && $.trim($("#bankname").val())=="" && $.trim($("#branchname").val())=="" && $.trim($("#ifsc").val())!="" ) {
$("#accountno_bankname_branch-blank-alert").alert();
$("#accountno_bankname_branch-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#accountno_bankname_branch-blank-alert").hide();
});
$("#accountno").focus();
return false;
}
if ($.trim($("#accountno").val())!="" && $.trim($("#bankname").val())=="" && $.trim($("#branchname").val())=="" && $.trim($("#ifsc").val())!="" ) {
$("#bankname_branch-blank-alert").alert();
$("#bankname_branch-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#bankname_branch-blank-alert").hide();
});
$("#bankname").focus();
return false;
}
if ($.trim($("#accountno").val())!="" && $.trim($("#bankname").val())!="" && $.trim($("#branchname").val())=="" && $.trim($("#ifsc").val())=="" ) {
$("#branch-blank-alert").alert();
$("#branch-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#branch-blank-alert").hide();
});
$("#branchname").focus();
return false;
}
if ($.trim($("#accountno").val())!="" && $.trim($("#bankname").val())!="" && $.trim($("#branchname").val())!="" && $.trim($("#ifsc").val())=="" ) {
$("#ifsc-blank-alert").alert();
$("#ifsc-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#ifsc-blank-alert").hide();
});
$("#ifsc").focus();
return false;
}
}
});
$("#invoice_save").click(function(event) {
// Validations start below
event.stopPropagation();
......@@ -1173,6 +1262,17 @@ $(document).off("keyup").on("keyup", function(event) {
$('#invoice_date').focus().select();
return false;
}
/* Bank Details Validation */
if (!($("#accountno").val() == "" && $("#bankname").val() == "" && $("#branchname").val() == "" && $("#ifsc").val() == "")){
if ($("#accountno").val() == "" || $("#bankname").val() == "" || $("#branchname").val() == "" || $("#ifsc").val() == ""){
$("#allbank-blank-alert").alert();
$("#allbank-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#allbank-blank-alert").hide();
});
$("#accountno").focus();
return false;
}
}
//Validation for GSTIN on Save Button.
var regExp = /[a-zA-z]{5}\d{4}[a-zA-Z]{1}/;
......@@ -1409,7 +1509,6 @@ $(document).off("keyup").on("keyup", function(event) {
$("#success-alert").fadeTo(2250, 500).slideUp(500, function() {
$("#success-alert").hide();
let invid = resp["gkresult"];
if (inoutflag == "15") {
$.ajax({
url: '/cashmemos?action=showcashmemo',
type: 'POST',
......@@ -1427,6 +1526,9 @@ $(document).off("keyup").on("keyup", function(event) {
$("#viewcashmemo_div").show();
$("#cashmemodiv").hide();
$("#editbutton").hide();
if(inoutflag==9){
$("#printbutton").hide();
}
$("#printbutton").attr("invid",invid); //Sending invid with printbutton;
$("#cashmemo_div").html("");
})
......@@ -1436,7 +1538,7 @@ $(document).off("keyup").on("keyup", function(event) {
.always(function() {
console.log("complete");
});
}
});
return false;
} else if (resp["gkstatus"] == 1) {
......
......@@ -140,16 +140,16 @@ $(document).ready(function() {
if(str[1] != undefined){
if(len.length == 1){
str[1] = str[1]+0;
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees";
}
}else{
numbertowords = "Zero"+" "+ "rupees";
numbertowords = "Zero"+" "+ "Rupees";
}
}
......@@ -205,16 +205,16 @@ $(document).ready(function() {
if(str[1] != undefined){
if(len.length == 1){
str[1] = str[1]+0;
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees";
}
}else{
numbertowords = "Zero"+" "+ "rupees";
numbertowords = "Zero"+" "+ "Rupees";
}
}
//Total of various columns are displayed on the footer.
......
......@@ -2285,6 +2285,7 @@ if (event.which == 13) {
$("#bankdetails-blank-alert").hide();
});
$("#accountno").focus();
return false;
}
}
......@@ -2639,7 +2640,7 @@ if (event.which == 13) {
});
$(document).off('keydown', '#chkcash').on('keydown', '#chkcash', function(event) {
if(event.which==13){
$("#transportationmode").focus();
$("#modeoftransport").focus();
}
});
......
......@@ -133,16 +133,16 @@ $(document).ready(function() {
if(str[1] != undefined){
if(len.length == 1){
str[1] = str[1]+0;
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees";
}
}else{
numbertowords = "Zero"+" "+ "rupees";
numbertowords = "Zero"+" "+ "Rupees";
}}
//Total of various columns are displayed on the footer.
......@@ -196,16 +196,16 @@ $(document).ready(function() {
if(str[1] != undefined){
if(len.length == 1){
str[1] = str[1]+0;
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"paise";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees"+" "+"and"+" "+ convertNumberToWords(parseInt(str[1]))+"Paise";
}
}else{
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"rupees";
numbertowords =convertNumberToWords(parseInt(str[0]))+" "+"Rupees";
}
}else{
numbertowords = "Zero"+" "+ "rupees";
numbertowords = "Zero"+" "+ "Rupees";
}}
//Total of various columns are displayed on the footer.
$('#discounttotal_product_vat').val(parseFloat(totaldiscount).toFixed(2));
......@@ -2726,6 +2726,7 @@ if (event.which == 13) {
$("#invoice_edit").click(function(event){
editflag = false;
$("#invoice_save").show();
$("#tviw").show();
$("#invoice_edit").hide();
$("#invoice_editprint").hide();
$(".uploadclass").show();
......
......@@ -608,7 +608,7 @@ $(document).off("keydown",".gstinstate").on("keydown",".gstinstate",function(eve
$("#bank_name").keydown(function(event) {
if (event.which==13) {
event.preventDefault();
if ($.trim($("#accnum").val())=="" && $.trim($("#bank_name").val())!="") {
$("#accno-improper-modal").alert();
$("#accno-improper-modal").fadeTo(2250, 500).slideUp(500, function(){
......@@ -705,19 +705,33 @@ $(document).off("keydown",".gstinstate").on("keydown",".gstinstate",function(eve
};
});
$("#bankdel_done").keydown(function(event) {
if (event.which==13) {
event.preventDefault();
$('#addbankdel').modal('hide');
}
if (event.which==13) {
if($("#accnum").val()=="" && $("#branch_name").val()=="" && $("#bank_name").val()=="" && $("#ifsc_code").val()=="" )
{
$("#bankdel_done").click(function(event){
$('#addbankdel').modal('hide');
});
}
else if($("#accnum").val()=="" || $("#branch_name").val()=="" || $("#bank_name").val()=="" || $("#ifsc_code").val()=="" ){
$("#bankdetails-improper-modal").alert();
$("#bankdetails-improper-modal").fadeTo(2250, 500).slideUp(500, function(){
$("#bankdetails-improper-modal").hide();
$("#accnum").focus();
});
}
if($("#accnum").val()!="" && $("#branch_name").val()!="" && $("#bank_name").val()!="" && $("#ifsc_code").val()!="" )
{
$("#bankdel_done").click(function(event){
$('#addbankdel').modal('hide');
});
}
}
if (event.which==38) {
event.preventDefault();
$("#ifsc_code").focus().select();
}});
event.preventDefault();
$("#ifsc_code").focus().select();
}});
$("#orgmvat").keydown(function(event) {
if (event.which==13) {
......
......@@ -108,9 +108,12 @@ $(document).ready(function() {
$("#sub_unit_edit").focus();
}
});
//click event for reset button so that focus will be shifted to unit_dit_list.
$("#unit_reset").click(function(event) {
$("a[href ='#unit_edit']").click();
$("a[href ='#unit_edit']").click();
event.preventDefault();
$('#unit_edit_list').focus();
return false;
});
$("#edit_btn").click(function(event) {
......@@ -129,7 +132,8 @@ $(document).ready(function() {
return false;
}
});
$("#unit_edit_save").click(function(event) {
//click event for save button so that the focus will be shifted to unit_edit_list.
$("#unit_edit_save").click(function(event) {
if ($.trim($('#unit_edit_name').val())=="") {
$("#unit-blank-alert").alert();
$("#unit-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
......@@ -183,7 +187,9 @@ $(document).ready(function() {
$("a[href='#unit_edit']").click();
$("#success-alert").alert();
$("#success-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#success-alert").hide();
$("#success-alert").hide();
event.preventDefault();
$("#unit_edit_list").focus().select();
});
return false;
}
......@@ -212,7 +218,8 @@ $(document).ready(function() {
console.log("complete");
});
event.stopPropogation();
});
});
//click event for delete button so that to shift the focus on unit_edit_list.
$("#unit_delete").click(function(event) {
event.preventDefault();
$('.modal-backdrop').remove();
......@@ -238,9 +245,12 @@ $(document).ready(function() {
$("#delsuccess-alert").alert();
$("#delsuccess-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#delsuccess-alert").hide();
$("a[href ='#unit_edit']").click();
$("a[href ='#unit_edit']").click();
event.preventDefault();
$("#unit_edit_list").focus().select();
});
}
}
else {
$("#unit_edit_name").focus();
$("#subunit-alert").alert();
......@@ -249,10 +259,9 @@ $(document).ready(function() {
});
return false;
}
}
});
});
......
......@@ -1816,9 +1816,7 @@ $('#listofaccounts').click(function (e) {
$('#tallyimport').click(function (e) {// calls tally import page.
$("#info").load("/import?action=show");
});
});
$('#show_unbilled_deliveries').click(function (e) {
$('#show_unbilled_deliveries').click(function (e) {
//
$.ajax(
{
......@@ -1860,5 +1858,41 @@ $('#drcrnote').click(function (e) {// calls base drcrnote page.
$("#info").load("/drcrnote");
$("#drcrnote_div").show();
});
$(document).off('click' ,'#reportsearchspan').on('click' ,'#reportsearchspan',function(e) {
let searchtext = $("#reportsearch").val();
$("table tbody tr:not(:contains('" + searchtext + "'))").hide();
$("table tbody tr:contains('" + searchtext + "')").show();
});
$(document).off('keyup' ,'#reportsearch').on('keyup' ,'#reportsearch',function(e) {
//String to search for is stored in searchtext variable.
let searchtext = $("#reportsearch").val();
//When search field is blank the clear search button is hidden.
if (searchtext == "") {
$("#reportclearsearchspan").hide();
}
//When there is some text in the field clear search button is shown.
if (searchtext != "") {
$("#reportclearsearchspan").show();
}
//Table rows containing search text are shown and others hidden.
$("table tbody tr:not(:contains('" + searchtext + "'))").hide();
$("table tbody tr:contains('" + searchtext + "')").show();
//Pressing 'Esc' button clears search.
if (e.which == 27) {
$("#reportsearch").val("");
$("tr").show();
}
//Pressing Enter key shifts focus to first row.
if (e.which == 13) {
$("tbody tr:visible").first().find('a').focus();
}
});
$(document).off('click' ,'#reportclearsearchspan').on('click' ,'#reportclearsearchspan',function(e) {
$("#reportsearch").val("");
$("table tbody tr").show();
$("#reportclearsearchspan").hide();
$("tbody tr:visible").first().find('a').focus();
});
});
......@@ -73,9 +73,13 @@ $(document).ready(function() {
}
}
else if (event.which==39)
{
$('#incometbl tbody tr:eq('+pyindex+') td:first a').focus();
{
if ($('#incometbl tbody tr:eq('+pyindex+') td:first a').is(":visible")) {
$('#incometbl tbody tr:eq('+pyindex+') td:first a').focus();
}
else {
$('#incometbl tbody tr:visible').first().find('a').focus();
}
}
});
......@@ -219,9 +223,13 @@ $(document).ready(function() {
}
}
else if (event.which==37)
{
$('#expensetbl tbody tr:eq('+rcindex+') td:first a').focus();
{
if ($('#expensetbl tbody tr:eq('+rcindex+') td:first a').is(":visible")) {
$('#expensetbl tbody tr:eq('+rcindex+') td:first a').focus();
}
else {
$('#expensetbl tbody tr:visible').first().find('a').focus();
}
}
......@@ -323,52 +331,6 @@ $(document).ready(function() {
}
});
// Functions to clear search fields.
$('#plrclearfields').click(function(){
$(this).siblings(".bootstrap-table").find(".form-control").val("");
$("#plrclearfields").hide();
$(".search").children(".form-control").focus();
});
$('#pllclearfields').click(function(){
$(this).siblings(".bootstrap-table").find(".form-control").val("");
$("#pllclearfields").hide();
$(".search").children(".form-control").focus();
});
$(".search").children(".form-control").keyup(function(event){
if ($(this).parent(".search").hasClass("pull-right") && $(this).val() !="") {
$("#pllclearfields").show();
}
else {
$("#pllclearfields").hide();
}
if($(this).parent(".search").hasClass("pull-left")&& $(this).val() !="") {
$("#plrclearfields").show();
}
else {
$("#plrclearfields").hide();
}
if (event.keyCode == 27) {
if ($(this).parent(".search").hasClass("pull-right")) {
$(".rcaccname:visible").first().focus();
}
else if($(this).parent(".search").hasClass("pull-left")) {
$(".pyaccname:visible").first().focus();
}
$(this).val("");
$("#pllclearfields").hide();
$("#plrclearfields").hide();
}
else if (event.which == 13) {
if ($(this).parent(".search").hasClass("pull-right")) {
$(".rcaccname:visible").first().focus();
}
else if($(this).parent(".search").hasClass("pull-left")) {
$(".pyaccname:visible").first().focus();
}
}
});
$("#print").click(function(event){
// Function to serve spreadsheet of the report.
var todatearray = $("#ledtodate").val().split("-");
......@@ -401,14 +363,37 @@ $(document).ready(function() {
$('.group').show();
});
$("#printpnl").click(function(event) {
// Displays a printable version of the report.
$("#incometbl").unbind('dblclick');
$("#expensetbl").unbind('dblclick');
$('table a').contents().unwrap();
$("table").removeClass('fixed-table').addClass('table-striped');
$(".fixed-table-toolbar").remove();
$("#printpnl").hide();
$("#realprintpnl").show();
// Displays a printable version of the report.
$("#msspinmodal").modal("show");
var todatearray = $("#ledtodate").val().split("-");
var newtodate = todatearray[2]+"-"+todatearray[1]+"-"+todatearray[0];
$.ajax(
{
type: "POST",
url: "/showprofitlossreport?type=print",
global: false,
async: false,
datatype: "text/html",
data: {"financialstart":sessionStorage.yyyymmddyear1,"orgtype":sessionStorage.orgt,"calculateto":newtodate},
beforeSend: function(xhr)
{
xhr.setRequestHeader('gktoken',sessionStorage.gktoken );
}
})
.done(function(resp) {
$("#msspinmodal").modal("hide");
$('.modal-backdrop').remove();
$("#info").html(resp);
$('tr').show();
})
.fail(function() {
console.log("error");
})
.always(function() {
console.log("complete");
});
$("#printpnl").hide();
$("#realprintpnl").show();
});
$("#realprintpnl").click(function(event) {
window.print();
......
......@@ -86,19 +86,47 @@ $(document).ready(function() {
});
$('input:text:enabled,input:checkbox:enabled,select:enabled').keydown( function(e) { // function for shifting focus on enter and up arrow key.
$('select:enabled').keydown( function(e) { // function for shifting focus on enter and up arrow key.
var n = $("input:text:enabled,input:checkbox:enabled,select:enabled").length;
var f = $('input:text:enabled,input:checkbox:enabled,select:enabled');
if (e.which == 13)
{
if ($("#viewbankrecon_accname").val()==null) {
$("#account-blank-alert").alert();
$("#account-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#account-blank-alert").hide();
$('#viewbankrecon_accname').focus();
});
return false;
}
else {
var nextIndex = f.index(this) + 1;
if(nextIndex < n){
e.preventDefault();
f[nextIndex].focus();
f[nextIndex].select();
}
}
}
});
$('input:text:enabled,input:checkbox:enabled').keydown( function(e) { // function for shifting focus on enter and up arrow key.
var n = $("input:text:enabled,input:checkbox:enabled,select:enabled").length;
var f = $('input:text:enabled,input:checkbox:enabled,select:enabled');
if (e.which == 13)
{
var nextIndex = f.index(this) + 1;
if(nextIndex < n){
var nextIndex = f.index(this) + 1;
if(nextIndex < n){
e.preventDefault();
f[nextIndex].focus();
f[nextIndex].select();
}
}
}
if (e.which == 38 )
if (e.which == 38 )
{
var prevIndex = f.index(this) - 1;
if(prevIndex < n){
......@@ -110,14 +138,15 @@ $(document).ready(function() {
});
$("#viewbankrecon_nar").keydown(function(event) {
if (event.which==13) {
$("#viewbankrecon_submit").click();
$("#viewbankrecon_submit").focus();
return false;
}
});
$("#viewbankrecon_submit").click(function(event) {
// --------------------starting validations------------------
if ($("#viewbankrecon_accname").val()==null) {
if ($("#viewbankrecon_accname").val()==null) {
$("#account-blank-alert").alert();
$("#account-blank-alert").fadeTo(2250, 500).slideUp(500, function(){
$("#account-blank-alert").hide();
......
......@@ -405,6 +405,27 @@
</div>
</div>
<div class="col-md-6 row " id="bank" style="display: none">
<div class="alert alert-danger" id="accountno-blank-alert" aria-live="rude" role="alert" hidden>
{% trans %}Please enter an account number.{% endtrans %}
</div>
<div class="alert alert-danger" id="bankname-blank-alert" aria-live="rude" role="alert" hidden>
{% trans %}Please enter the Bank Name.{% endtrans %}
</div>
<div class="alert alert-danger" id="branch-blank-alert" aria-live="rude" role="alert" hidden>
{% trans %}Please enter the Branch Name.{% endtrans %}
</div>
<div class="alert alert-danger" id="accountno_bankname_branch-blank-alert" aria-live="rude" role="alert" hidden>
{% trans %}Please enter Account Number, Bank Name and the Branch Name.{% endtrans %}
</div>
<div class="alert alert-danger" id="bankname_branch-blank-alert" aria-live="rude" role="alert" hidden>
{% trans %}Please enter Bank Name and the Branch Name.{% endtrans %}
</div>
<div class="alert alert-danger" id="ifsc-blank-alert" aria-live="rude" role="alert" hidden>
{% trans %}Please enter an IFSC Code{% endtrans %}
</div>
<div class="alert alert-danger" id="allbank-blank-alert" aria-live="rude" role="alert" hidden>
{% trans %}Please fill all the fields of Bank Details.{% endtrans %}
</div>
<table class="table table-condensed table-bordered ">
<tbody>
<label>Bank Details :</label>
......@@ -536,7 +557,7 @@
<div class="container-fluid">
<button class="btn btn-success btn-sm" id="invoice_save" data-toggle="tooltip" data-placement="top" title="Press Insert to save">{% trans %}<i class="fa fa-floppy-o" aria-hidden="true" accesskey="s"></i> <u>S</u>ave{% endtrans %}</button>
<button id="invoice_reset" class="btn btn-warning btn-sm">{% trans %}<i class="fa fa-refresh" aria-hidden="true" accesskey="e"></i> R<u>e</u>set{% endtrans %}</button>
<button id="invoice_reset" class="btn btn-warning btn-sm" accesskey="e">{% trans %}<i class="fa fa-refresh" aria-hidden="true"></i> R<u>e</u>set{% endtrans %}</button>
<!-- <button id="invoice_saveprint" class="btn btn-primary btn-sm" >{% trans %}<i class="fa fa-print" aria-hidden="true"></i> Save & Print{% endtrans %}</button>-->
</div>
</div>
......
......@@ -79,7 +79,7 @@
<div class="row">
<div class="col-sm-12 form-group form-inline">
<div class="form-group form-inline col-sm-3">
<label class="col-sm-5 fsize" for="deliverychallan_challanno">{% trans %}Note No{% endtrans %} :</label>
<label class="col-sm-5 fsize" for="deliverychallan_challanno">{% trans %}Note No{% endtrans %} : <label for="deliverychallan_challanno" style="color:red;font-size:120%;">*</label></label>
<input class="form-control input-sm col-sm-7" size="15" id="deliverychallan_challanno" placeholder="{% trans %}Enter Deli. Note No.{% endtrans %}" value = "{{lastdelchaldata['dcno']}}">
</div>
<div class="form-group form-inline col-sm-4">
......@@ -112,7 +112,7 @@
<div class="row">
<div class="col-sm-12 form-group form-inline">
<div class="form-group form-inline col-sm-3">
<label for="deliverychallan_date" class="col-sm-5 fsize">{% trans %}Note Date{% endtrans %} :</label>
<label for="deliverychallan_date" class="col-sm-5 fsize">{% trans %}Note Date{% endtrans %} : <label for="deliverychallan_date" style="color:red;font-size:120%;">*</label></label>
<input type="text" class="form-control input-sm delchaldate" size="1" maxlength="2" placeholder="DD" id="deliverychallan_date" accesskey="v" value = "{{lastdelchaldata['dcdate'][0:2]}}">
<input type="text" class="form-control input-sm delchaldate" size="1" maxlength="2" placeholder="MM" id="deliverychallan_month" accesskey="v" value = "{{lastdelchaldata['dcdate'][3:5]}}">
<input type="text" class="form-control input-sm delchaldate" size="5" maxlength="4" placeholder="YYYY" id="deliverychallan_year" accesskey="v" value = "{{lastdelchaldata['dcdate'][6:]}}">
......@@ -120,16 +120,16 @@
{%if numberofgodowns > 0 %}
<div class="form-group form-inline col-sm-4">
<label class="col-sm-4 fsize" for="deliverychallan_godown">
{% if gkstatus=="in" %}
{% trans %}Received At{% endtrans %} :
{% else %}
{% trans %}Dispatch From{% endtrans %} :
{% endif %}
{% if gkstatus=="in" %}
{% trans %}Received At{% endtrans %} :
{% else %}
{% trans %}Dispatch From{% endtrans %} :
{% endif %}
</label>
<select class="form-control input-sm col-sm-6" id="deliverychallan_godown">
{% for godown in godowns %}
<option value="{{godown['goid']}}">{{godown["goname"]}} ({{godown["goaddr"]}})</option>
{% endfor %}
{% for godown in godowns %}
<option value="{{godown['goid']}}">{{godown["goname"]}} ({{godown["goaddr"]}})</option>
{% endfor %}
</select>
</div>
{% endif %}
......@@ -186,19 +186,19 @@
{% else %}
{% trans %}Customer{% endtrans %} :
{% endif %}
</label>
<select class="form-control input-sm col-sm-8 fsize" id="deliverychallan_customer" accesskey="">
<option value="" disabled hidden selected>
{% if gkstatus=="in" %}
{% trans %}Select Supplier{% endtrans %}
{% else %}
{% trans %}Select Customer{% endtrans %}
{% endif %}
</option>
{% for supplier in suppliers %}
<option value="{{supplier['custid']}}" name="{{supplier["custname"]}}">{{supplier["custname"]}}</option>
{% endfor %}
</select>
<label for="deliverychallan_customer" style="color:red;font-size:120%;">*</label> </label>
<select class="form-control input-sm col-sm-8 fsize" id="deliverychallan_customer" accesskey="">
<option value="" disabled hidden selected>
{% if gkstatus=="in" %}
{% trans %}Select Supplier{% endtrans %}
{% else %}
{% trans %}Select Customer{% endtrans %}
{% endif %}
</option>
{% for supplier in suppliers %}
<option value="{{supplier['custid']}}" name="{{supplier["custname"]}}">{{supplier["custname"]}}</option>
{% endfor %}
</select>
</div>
<div class="form-group form-inline">
<label for="deliverychallan_customerstate" class="col-sm-4 fsize">
......@@ -599,7 +599,7 @@
</div>
<div class="row col-sm-12">
<div class="form-group form-inline">
<label for="deliverychallan_noofpackages" class="col-sm-5">{% trans %}Number of Packages{% endtrans %} :</label>
<label for="deliverychallan_noofpackages" class="col-sm-5">{% trans %}Number of Packages{% endtrans %} : <label for="deliverychallan_noofpackages" style="color:red;font-size:120%;">*</label></label>
<input type="text" class="form-control input-sm text-right col-sm-7" id="deliverychallan_noofpackages" value=""></input>
</div>
</div>
......@@ -624,13 +624,13 @@
<div class="row col-sm-12">
<div class="form-group form-inline invoice_issuer" hidden>
<label class="col-sm-5" for="invoice_issuer_name">{% trans %}Issuer's Name{% endtrans %} :</label>
<label class="col-sm-5" for="invoice_issuer_name">{% trans %}Issuer's Name{% endtrans %} : <label for="invoice_issuer_name" style="color:red;font-size:120%;">*</label></label>
<input class="form-control input-sm col-sm-7" id="invoice_issuer_name" placeholder="{% trans %}Issuer's name{% endtrans %}" accesskey="a" aria-label="{% trans %}Issuer's Name{% endtrans %}">
</div>
</div>
<div class="row col-sm-12">
<div class="form-inline form-group invoice_issuer" hidden>
<label class="col-sm-5">{% trans %}Designation{% endtrans %} :</label>
<label class="col-sm-5">{% trans %}Designation{% endtrans %} : <label for="invoice_issuer_designation" style="color:red;font-size:120%;">*</label></label>
<input class="form-control input-sm col-sm-7" id="invoice_issuer_designation" aria-label="{% trans %}Designation{% endtrans %}" placeholder="{% trans %}Issuer's designation{% endtrans %}">
</div>
</div>
......
......@@ -100,7 +100,7 @@
<h4>{% trans %}Details of Debit Note: {% endtrans %}</h4>
{% endif %}
<div class="form-group form-inline" id="invoicerow">
<label class="col-sm-4 fsize" for="drcrnote_invoice">{% trans %}Invoice No.{% endtrans %} :</label>
<label class="col-sm-4 fsize" for="drcrnote_invoice">{% trans %}Invoice No.{% endtrans %} : <label for="drcrnote_invoice" style="color:red;font-size:120%;">*</label></label>
<!-- sale invoice select -->
<select class="form-control input-sm col-sm-8 selectfieldwidth" id="drcrnote_invoice">
<option value="" invoiceno = "" selected>Select Invoice</option>
......@@ -118,17 +118,17 @@
</div>
<div class="form-group form-inline">
{% if drcrflag == "3" %}
<label class="col-sm-4 fsize" for="crnote_no">{% trans %}Cr Note No.{% endtrans %} :</label>
<label class="col-sm-4 fsize" for="crnote_no">{% trans %}Cr Note No.{% endtrans %} : <label for="crnote_no" style="color:red;font-size:120%;">*</label></label>
{% else %}
<label class="col-sm-4 fsize" for="drnote_no">{% trans %}Dr Note No.{% endtrans %} :</label>
<label class="col-sm-4 fsize" for="drnote_no">{% trans %}Dr Note No.{% endtrans %} : <label for="drnote_no" style="color:red;font-size:120%;">*</label></label>
{% endif %}
<input class="form-control input-sm col-sm-8" size="15" id="drcrnote_no" >
</div>
<div class="form-group form-inline">
{% if drcrflag == "3" %}
<label for="crnote_date" class="col-sm-4 fsize">{% trans %}Cr Note Date{% endtrans %} :</label>
<label for="crnote_date" class="col-sm-4 fsize">{% trans %}Cr Note Date{% endtrans %} : <label for="crnote_date" style="color:red;font-size:120%;">*</label></label>
{% else %}
<label for="drnote_date" class="col-sm-4 fsize">{% trans %}Dr Note Date{% endtrans %} :</label>
<label for="drnote_date" class="col-sm-4 fsize">{% trans %}Dr Note Date{% endtrans %} : <label for="drnote_date" style="color:red;font-size:120%;">*</label></label>
{% endif %}
<input type="text" class="form-control input-sm drcrnotedate" size="2" maxlength="2" placeholder="DD" id="drcrnote_date" accesskey="v">
<input type="text" class="form-control input-sm drcrnotedate" size="2" maxlength="2" placeholder="MM" id="drcrnote_month" accesskey="v">
......@@ -144,18 +144,18 @@
</div>
<div class="form-group form-inline ref " hidden >
{% if drcrflag == "3" %}
<label class="col-sm-4 fsize" for="crnote_no" >{% trans %}Dr Note No.{% endtrans %} :</label>
<label class="col-sm-4 fsize" for="crnote_no" >{% trans %}Dr Note No.{% endtrans %} : <label for="crnote_no" style="color:red;font-size:120%;">*</label></label>
{% else %}
<label class="col-sm-4 fsize" for="drnote_no" >{% trans %}Cr Note No.{% endtrans %} :</label>
<label class="col-sm-4 fsize" for="drnote_no" >{% trans %}Cr Note No.{% endtrans %} : <label for="drnote_no" style="color:red;font-size:120%;">*</label></label>
{% endif %}
<input class="form-control input-sm col-sm-8" size="15" id="drcrnote_no_ref" >
</div>
<div class="form-group form-inline ref " hidden>
{% if drcrflag == "3" %}
<label for="crnote_date" class="col-sm-4 fsize" >{% trans %}Dr Note Date{% endtrans %} :</label>
<label for="crnote_date" class="col-sm-4 fsize" >{% trans %}Dr Note Date{% endtrans %} : <label for="crnote_date" style="color:red;font-size:120%;">*</label></label>
{% else %}
<label for="drnote_date" class="col-sm-4 fsize" >{% trans %}Cr Note Date{% endtrans %} :</label>
<label for="drnote_date" class="col-sm-4 fsize" >{% trans %}Cr Note Date{% endtrans %} : <label for="drnote_date" style="color:red;font-size:120%;">*</label></label>
{% endif %}
<input type="text" class="form-control input-sm drcrnotedate" size="2" maxlength="2" placeholder="DD" id="drcrnote_date_ref" accesskey="v" >
<input type="text" class="form-control input-sm drcrnotedate" size="2" maxlength="2" placeholder="MM" id="drcrnote_month_ref" accesskey="v">
......
......@@ -341,11 +341,16 @@
<div class="modal-body" style="text-align: justify; text-justify: inter-word;">
<p> <font color=" #566573"> {%trans%}
This module lets you add Products.
</br> If you have created Categories (at least one is highly recommended) you can select a suitable Category for a Product. When you select a Category the screen immediately changes and presents you the specifications list where you can enter the details pertaning to the product.
</br>Alternatively you may create a Product without a Category.
You can also create a Unit of Measurement. Note that you can choose a Unit of measurement previously created or create one. </br>
You can also enter the details of taxes for the product. {%endtrans %} </font>
This module is for creating Products and Services. </br>
First, we have to decide whether we wish to create a Product or a Service.</br>
For Product, we have to provide Product Name, HSN Code, Unit of Measurement and Tax. Note that you can choose a Unit of measurement previously created or create one. We can have products under categories. To use this feature create categories and then while creating products we can choose a category they will belong to. When you select a Category the screen immediately changes and presents you the specifications list where you can enter the details pertaning to the product.</br>
Products can have opening stock. If inventory is enabled for this organisation and we have godowns we can add them using a popup which can be activated by clicking Add Godown button. Godowns can also be added using the Create Godown Module.</br>
For Service, we must provide Service Name, ACS and Tax.
{%endtrans %} </font>
</p>
</div>
......
......@@ -277,11 +277,14 @@
<div class="modal-body" style="text-align: justify; text-justify: inter-word;">
<p> <font color=" #566573"> {%trans%}
This module lets you add Products.{% endtrans %}
</br> {% trans %}If you have created Categories (at least one is highly recommended) you can select a suitable Category for a Product. When you select a Category the screen immediately changes and presents you the specifications list where you can enter the details pertaning to the product.{% endtrans %}
</br>{% trans %}Alternatively you may create a Product without a Category and or Sub-Category with all its specifications.
You can also create a Unit of Measurement. Note that you can choose a Unit of measurement previously created or create one. </br>
you can also enter the details of taxes for the product. {%endtrans %} </font>
This module is for creating products. {% endtrans %}
</br> {% trans %}To create a Product, we have to provide Product Name, Unit of Measurement and Tax. We can have products under categories. To use this feature create categories and then while creating products we can choose a category they will belong to.
{% endtrans %}
</br>{% trans %}Alternatively you may create a Product without a Category and or Sub-Category with all its specifications.
You can also create a Unit of Measurement. Note that you can choose a Unit of measurement previously created or create one.
{%endtrans %} </br>
{% trans %}Products can have opening stock. If inventory is enabled for this organisation and we have godowns we can add them using a popup which can be activated by clicking Add Godown button. Godowns can also be added using the Create Godown Module.
{%endtrans %}</font>
</p>
</div>
......@@ -308,4 +311,7 @@
</div>
</div>
</div>
</div>
</div>
This diff is collapsed.
......@@ -79,11 +79,11 @@
<div class="col-md-12">
<div class="col-md-6 nopadding">
<div class="form-group form-inline">
<label class="fsize col-sm-4" for="salesorder_challanno">{% trans %}Order No{% endtrans %} :</label>
<label class="fsize col-sm-4" for="salesorder_challanno">{% trans %}Order No{% endtrans %} : <label for="salesorder_challanno" style="color:red;font-size:120%;">*</label></label>
<input class="form-control col-sm-8 input-sm" size="15" id="salesorder_challanno" maxlength="16" >
</div>
<div class="form-group form-inline">
<label for="salesorder_date" class="col-sm-4 fsize">{% trans %}Order Date{% endtrans %} :</label>
<label for="salesorder_date" class="col-sm-4 fsize">{% trans %}Order Date{% endtrans %} : <label for="salesorder_date" style="color:red;font-size:120%;">*</label></label>
<input type="text" class="form-control input-sm salesorderdate" size="2" maxlength="2" placeholder="DD" id="salesorder_date" accesskey="v">
<input type="text" class="form-control input-sm salesorderdate" size="2" maxlength="2" placeholder="MM" id="salesorder_month" accesskey="v">
<input type="text" class="form-control input-sm salesorderdate" size="4" maxlength="4" placeholder="YYYY" id="salesorder_year" accesskey="v">
......@@ -104,7 +104,7 @@
</div>
{% if status|int == 16 %}
<div class="form-group form-inline">
<label for="originaddress" class="fsize col-md-4">{% trans %}Address :{% endtrans %}</label>
<label for="originaddress" class="fsize col-md-4">{% trans %}Address :{% endtrans %} <label for="originaddress" style="color:red;font-size:120%;">*</label></label>
<input type="text" id="originaddress" class="form-control input-sm col-sm-8" name="originaddress" size="30"></input>
</div>
{% endif %}
......@@ -139,14 +139,14 @@
</div>
{% if status|int == 16 %}
<div class="form-group form-inline purchaseorder_issuer">
<label class="col-sm-4 fsize" for="purchaseorder_issuer_name">{% trans %}Issuer's Name{% endtrans %} :</label>
<label class="col-sm-4 fsize" for="purchaseorder_issuer_name">{% trans %}Issuer's Name{% endtrans %} : <label for="purchaseorder_issuer_name" style="color:red;font-size:120%;">*</label></label>
<input class="form-control input-sm col-sm-8" id="purchaseorder_issuer_name" placeholder="{% trans %}Issuer's name{% endtrans %}" accesskey="a" aria-label="{% trans %}Issuer's Name{% endtrans %}">
</div>
<div class="form-inline form-group purchaseorder_issuer">
<label class="col-sm-4 fsize">{% trans %}Designation{% endtrans %} :</label>
<label class="col-sm-4 fsize">{% trans %}Designation{% endtrans %} : <label for="purchaseorder_issuer_name" style="color:red;font-size:120%;">*</label></label>
<input class="form-control input-sm col-sm-8" id="purchaseorder_issuer_designation" aria-label="{% trans %}Designation{% endtrans %}" placeholder="{% trans %}Issuer's designation{% endtrans %}">
</div>
{% endif %}
{% endif %}
</div>
</div>
<div class="col-md-12 hborderdiv" style="margin-top:10px;">
......@@ -159,7 +159,7 @@
{% else %}
{% trans %}Customer{% endtrans %} :
{% endif %}
</label>
<label for="salesorder_customer" style="color:red;font-size:120%;">*</label></label>
<select class="form-control input-sm col-sm-8 fsize" id="salesorder_customer" accesskey="">
<option value="" disabled hidden selected>
{% if status|int == 16 %}
......@@ -591,26 +591,26 @@
<h4>&nbsp &nbspBank Details:</h4>
<div class="col-sm-12">
<div class="form-group form-inline">
<label for="accountno" class="col-sm-5">{% trans %}Account No.{% endtrans %} :</label>
<label for="accountno" class="col-sm-5">{% trans %}Account No.{% endtrans %} : <label for="accountno" style="color:red;font-size:120%;">*</label></label>
<input type="text" id="accountno" class="lastfield form-control input-sm col-sm-7"></input>
</div>
</div>
<div class="col-sm-12">
<div class="form-group form-inline">
<label for="bankname" class="col-sm-5">{% trans %}Bank Name{% endtrans %} :</label>
<label for="bankname" class="col-sm-5">{% trans %}Bank Name{% endtrans %} : <label for="bankname" style="color:red;font-size:120%;">*</label></label>
<input type="text" id="bankname" class="lastfield form-control input-sm col-sm-7" name="bankname" ></input>
</div>
</div>
<br>
<div class="col-sm-12">
<div class="form-group form-inline">
<label for="branch" class="col-sm-5">{% trans %}Branch Name{% endtrans %} :</label>
<label for="branch" class="col-sm-5">{% trans %}Branch Name{% endtrans %} : <label for="branch" style="color:red;font-size:120%;">*</label></label>
<input type="text" id="branch" class="lastfield form-control input-sm col-sm-7" ></input>
</div>
</div>
<div class="col-sm-12">
<div class="form-group form-inline">
<label for="ifsc" class="col-sm-5">{% trans %}IFSC code{% endtrans %} :</label>
<label for="ifsc" class="col-sm-5">{% trans %}IFSC code{% endtrans %} : <label for="ifsc" style="color:red;font-size:120%;">*</label></label>
<input type="text" id="ifsc" class="lastfield form-control input-sm col-sm-7" name="ifsc" ></input>
</div>
</div>
......
......@@ -159,8 +159,8 @@
<button class="btn btn-sm btn-primary" type="button" id="printstatement" accesskey="s">{% trans %}<i class="fa fa-print" aria-hidden="true"> </i> <u>S</u>tatement's Printable Version{% endtrans %}</button>
<button class="btn btn-sm btn-primary" type="button" id="printtransactions" accesskey="t">{% trans %}<i class="fa fa-print" aria-hidden="true"></i> <u>T</u>ransaction's Printable Version{% endtrans %}</button>
<button class="btn btn-sm btn-info" type="button" id="realprintbank" accesskey="t">{% trans %}<i class="fa fa-print" aria-hidden="true"></i> Prin<u>t</u>{% endtrans %}</button>
<button class="btn btn-sm btn-primary" type="button" id="back" accesskey="b">{% trans %}<i class="fa fa-arrow-left" aria-hidden="true"></i>
<u>B</u>ack{% endtrans %}</button>
<button class="btn btn-sm btn-primary" type="button" id="back" accesskey="k">{% trans %}<i class="fa fa-arrow-left" aria-hidden="true"></i>
Bac<u>k</u>{% endtrans %}</button>
</span>
<script type="text/javascript" src="{{request.static_url('gkwebapp:static/js/bootstrap-table.js')}}"></script>
<script type="text/javascript" src="{{request.static_url('gkwebapp:static/js/bankreconreport.js')}}"></script>
......
......@@ -71,7 +71,6 @@
</div>
<div class="col-sm-3 col-sm-offset-4" id="buttondiv">
<button type="button" class="btn btn-sm btn-danger pull-right" id="backbutton" accesskey="b" style="margin-left:10px;"><i class="fa fa-arrow-left" style="margin-right:5px;" aria-hidden="true"></i>{% trans %}<u>B</u>ack{% endtrans %}</button>
<button id="editbutton" class="btn btn-info btn-sm pull-right" accesskey="e" style="margin-left:10px;"><i class="fa fa-pencil-square-o" aria-hidden="true" style="margin-right:5px;"></i> {% trans %}<u>E</u>dit{% endtrans %}</button>
<button type="button" class="btn btn-sm btn-primary pull-right" id="printbutton" accesskey="t"><i class="fa fa-print" aria-hidden="true" style="margin-right:5px;"></i>{% trans %}Prin<u>t</u>{% endtrans %}</button>
</div>
</div>
......
......@@ -2,7 +2,6 @@
<html>
<head>
<link rel="stylesheet" type="text/css" media="screen" href="{{request.static_url('gkwebapp:static/css/bootstrap.min.css')}}" />
<link href="{{request.static_url('gkwebapp:static/css/mainshellstyle.css')}}" rel="stylesheet" type="text/css">
<style>
.content{ margin-top:4%
}
......
......@@ -6,7 +6,7 @@
<title>{% trans %}GNUKhata v4.50{% endtrans %}</title>
<link rel="stylesheet" type="text/css" media="screen" href="{{request.static_url('gkwebapp:static/css/bootstrap.min.css')}}">
<link rel="stylesheet" type="text/css" media="screen" href="{{request.static_url('gkwebapp:static/css/font-awesome.min.css')}}">
<link href="{{request.static_url('gkwebapp:static/css/mainshellstyle.css')}}" rel="stylesheet" type="text/css">
<style>
.content{ margin-top:4%
}
......@@ -157,8 +157,8 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href=""><img src="{{request.static_url('gkwebapp:static/images/icon.svg')}}" alt="GNUKhata Icon" style="width:42px;height:42px;margin-top: -11px" /></a>
<a class="navbar-brand">{% trans %}GNUKhata <em>v4.50</em>{% endtrans %}</a>
<a class="navbar-brand" href=""><img src="{{request.static_url('gkwebapp:static/images/icon.svg')}}" alt="GNUKhata Icon" style="width:24px;height:24px;margin-top: -11px" /></a>
<a class="navbar-brand" style="margin-top: -9px">{% trans %}GNUKhata <em>v4.50</em>{% endtrans %}</a>