From 0505148606ab20efefb31e7151428e35b12b47ed Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 9 Jun 2018 11:35:06 +0530 Subject: [PATCH] sia-Inward report issues fixes --- application/models/dahsboard_model.php | 10 +- application/views/Report_attach_inward.php | 105 ++++++------------- application/views/Report_purchase_inward.php | 56 ++++------ 3 files changed, 60 insertions(+), 111 deletions(-) diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 4fcb14e7..a41f5676 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -2473,7 +2473,7 @@ $sql.="group by doc_no,material_name,supplier_name"; } function report_inwardcashbook($cname,$fa,$aa,$m,$frm,$t,$cat){ - $sql="select tinex.account_code as AccountCode,date_format(tinex.date,'%d-%m-%Y') as Date,ac.name as AccountName, + $sql="select tinex.account_code as AccountCode,date_format(tinex.date,'%d-%m-%Y') as Date,ac.name as AccountName,date_format(tinex.created_on,'%d-%m-%Y') as CreatedDate, tinex.type as type,tinex.cashtype as category ,tinex.merchant as merchantname,tinex.Supplier_id as Supplierid,sup.SupplierName as Suppliername, tinex.sgst as sgst, tinex.value_before_gst as Value,tinex.cgst as cgst,tinex.igst as igst,tinex.document as cashbookfile, tinex.total as Total @@ -2488,17 +2488,17 @@ $sql.="group by doc_no,material_name,supplier_name"; } if ($fa and $aa != ''){ - $sql.=" and (tinex.created_on >= '".$fa."-04-01' and tinex.created_on <= '".$aa."-03-31')"; + $sql.=" and (tinex.date >= '".$fa."-04-01' and tinex.date <= '".$aa."-03-31')"; } if ($m!= ''){ - $sql.="and monthname(tinex.created_on) = '".$m."'"; + $sql.="and monthname(tinex.date) = '".$m."'"; } if ($frm and $t != ''){ $fromd= date("Y-m-d",strtotime($frm)); $tod=date("Y-m-d",strtotime($t)); - $sql.="and date(tinex.created_on) >= '".$fromd."' - and date(tinex.created_on) <= '".$tod."'"; + $sql.="and date(tinex.date) >= '".$fromd."' + and date(tinex.date) <= '".$tod."'"; } if ($cat!= ''){ $sql.=" and tinex.type = '".$cat."' "; diff --git a/application/views/Report_attach_inward.php b/application/views/Report_attach_inward.php index 14e95483..3c61b916 100755 --- a/application/views/Report_attach_inward.php +++ b/application/views/Report_attach_inward.php @@ -1,49 +1,35 @@ - - - - - - - -
+ +
@@ -186,20 +172,17 @@ if(!empty($mms))
- + -