From 9cd467adaeade67813f6ff3df2fa817412a3b024 Mon Sep 17 00:00:00 2001 From: Kilian Saffran Date: Tue, 2 Oct 2018 08:34:48 +0200 Subject: [PATCH] Accounting Table correction --- .../modules/accounting/js/accountingchild.js | 11 ++++++++++- app_v3/defaults/profile/creorga.sqlite | Bin 71680 -> 71680 bytes 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app_v3/chrome/content/modules/accounting/js/accountingchild.js b/app_v3/chrome/content/modules/accounting/js/accountingchild.js index 827f149..68c4a81 100644 --- a/app_v3/chrome/content/modules/accounting/js/accountingchild.js +++ b/app_v3/chrome/content/modules/accounting/js/accountingchild.js @@ -372,12 +372,14 @@ function newinvoice(){ function save_accounting(){ var sql1 = new Array(); var sql2 = new Array(); - + // var cntnum = "01"; var type = $("#frmeditaccounting #action").val(); if (type == 'ins'){ sql1.push('childuuid'); sql2.push("'"+ pconfig.accchild +"'"); + } + $("#frmeditaccounting :input").each(function(){ var input = $(this); if (input.attr("id") ){ @@ -398,7 +400,11 @@ function save_accounting(){ sql2.push(ival); if (input.attr("id") == 'invoicedate'){ sql1.push('"accmonth"'); + var newaccmonth = ival.replace(/'/g,""); + // var cntx = appdb.dbquery("select count(accmonth)+1 as cnt from accounting where childuuid = '"+ pconfig.accchild +"' and accmonth between date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01') and date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01','+1 month','-1 day'); "); + // cntnum = cntx.sqldata[0].cntx; + // if (cntnum < 10){ cntnum = "0" + cntnum;} sql2.push('\'' + newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7) +"-01'"); } }else { @@ -417,6 +423,9 @@ function save_accounting(){ sql2.push('"' + input.attr("id") +'"='+ ival); if (input.attr("id") == 'invoicedate'){ var newaccmonth = ival.replace(/'/g,""); + // var cntx = appdb.dbquery("select count(accmonth)+1 as cnt from accounting where childuuid = '"+ pconfig.accchild +"' and accmonth between date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01') and date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01','+1 month','-1 day'); "); + // cntnum = cntx.sqldata[0].cntx; + // if (cntnum < 10){ cntnum = "0" + cntnum;} sql2.push('"accmonth"=\'' + newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7) +"-01'"); } diff --git a/app_v3/defaults/profile/creorga.sqlite b/app_v3/defaults/profile/creorga.sqlite index be1ff6e6d1a1dd9665258645cdc7e8fbbc99543e..6a8476ac4c9cf895d6ef3c00dd8384483091db89 100644 GIT binary patch delta 664 zcmZqJz|ydRWrDPz1p@H83>*H7w&`JSDEE$k-OSnLo9W zQBXlCFF!dWH95ODwWusJIaO)$18K?03(`c{fTozbD^51NA~E@0ia4942%EUCI*7aZ za+)shqyRQXt?ld_jK7#SGgdJ7@Gvv>GBAfTg#)Q|KzkN4-rv57h0&jxpQ(d^g(01R z@gbuvLprk@P%eCXIuD}?6XUe$dK`?Crpxg&>P+_%X522tEXTmiaDahHoG}GRi8KEI zx`BZKD7tdHv;ZSBGYgRSXu6Ux<24aBFOUO)UIt<&#`!?28Ru^nWSPv!)okj;4)&qx zWd2msWL_=>g~a6K-2A+f3-8%}Y(oEWs*>;wGR0sTCzfiO7NqAY)OZ rTfx&W#MRw3h?h&VQO%QGT2qpvNwj3Tk^tkpX)KH^+gU^y|1bjpRu-;) delta 300 zcmZqJz|ydRWrDPz2?GOz8xX^Q$wVDv9uo#Vg_*2CAwlNV6SLJP3$jFPe6@#3Bt%Dn zO93d%%MK)5T!4hL!{%MgUI{|13>O%fk1~B=+R6xGE@W5;)YLusVv{x(P?e>z7@N4e z;$*`s5|ihpiE}mUin5CKF*fYmH?c7KGqVBBXJL4-nZ4u}Ge1)Yke$xJ z?8W$y(Uu_{s5E?gItQZ)6XT)DdL@&l%W*U6Ox7ydCd~`f#mXSgz%0ik&X~e*0LTP^ YMm10N?b1Aq%*-IAkGC_5F#cx-0M|B0tN;K2 -- 2.39.5