From 2927edf79823be5a5f7d576cced4b7af0f6b09d6 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 27 Jun 2018 15:39:59 +0530 Subject: [PATCH] inward report query changes --- application/models/dahsboard_model.php | 1126 +++++++++-------- application/views/Report_consolidate.php | 52 +- .../views/Report_consolidate_inward.php | 52 +- application/views/Report_consolidate_raw.php | 52 +- application/views/Report_cumulative.php | 12 +- .../views/Report_cumulative_inward.php | 12 +- application/views/Report_cumulative_raw.php | 12 +- 7 files changed, 666 insertions(+), 652 deletions(-) diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index b84b20f0..cf988303 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -1428,49 +1428,50 @@ group by supplier_name,material_name"; $query = $this->db->query($sql); return $query->result(); } - function ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat){ + +function ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat){ - $sql="select im.IGRNO as igrn,pm.POType as potype,im.PONO as pono,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, sum(id.QuantityAsPerInvoice) as quantity,pl.Rate as rate,round(sum(id.QuantityAsPerInvoice) * pl.Rate,2) as value,if(POType = 'IMPORT' or POType = 'CAPITAL',sum(pm.ExchangeRate),0) as exchange_rate,date_format(im.MaterialRcvdDate,'%d-%m-%Y') as materialrcvddate, + $sql="select im.IGRNO as igrn,pm.POType as potype,im.PONO as pono,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, id.QuantityAsPerInvoice as quantity,pl.Rate as rate,round(id.QuantityAsPerInvoice * pl.Rate,2) as value,if(POType = 'IMPORT' or POType = 'CAPITAL',pm.ExchangeRate,0) as exchange_rate,date_format(im.MaterialRcvdDate,'%d-%m-%Y') as materialrcvddate, round(ifnull(if(POType = 'REVENUE', -sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), -sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst, +(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), +(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst, round(ifnull(if(POType = 'REVENUE', -sum(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), -sum(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) as cgst, +(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), +(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) as cgst, round(ifnull(if(POType = 'REVENUE', -sum(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), -sum(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) as igst, +(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), +(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) as igst, round(ifnull(if(POType = 'REVENUE', -sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), -sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2) as discount, +(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), +(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2) as discount, round(ifnull(if(POType = 'REVENUE', -sum(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), -sum(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) as freight, +(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), +(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) as freight, round(ifnull(if(POType = 'REVENUE', -sum(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) as Package, +(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) as Package, round(( -if(POType = 'IMPORT',sum(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)), -if(POType = 'CAPITAL' && CapitalRange = 0,sum(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)), -ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0))) +if(POType = 'IMPORT',(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)), +if(POType = 'CAPITAL' && CapitalRange = 0,(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)), +ifnull((id.QuantityAsPerInvoice * pl.Rate),0))) + round(ifnull(if(POType = 'REVENUE', - sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), - sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) + (id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), + (id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', - sum(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), - sum(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) + (id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), + (id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', - sum(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), - sum(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) + (id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), + (id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', - sum(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), - sum(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) + (id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), + (id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', - sum(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) + (id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) - round(ifnull(if(POType = 'REVENUE', - sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), - sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, + (id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), + (id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, im.file as ifile,pb.FilePath as file from T_IGR_Master im left join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO @@ -1532,28 +1533,61 @@ $sql.="group by pono,material_name,category,supplier_name,id.IGRItemNo"; $query = $this->db->query($sql); return $query->result(); } - function ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat,$da,$po){ + function ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat,$da,$po){ - - $sql ="select im.IGRNO as igrn,pm.POType as potype,im.PONO as pono,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, id.QuantityAsPerInvoice as quantity,pl.Rate as rate,round(id.QuantityAsPerInvoice * pl.Rate,2) as value,if(POType = 'IMPORT' or POType = 'CAPITAL',pm.ExchangeRate,0) as exchange_rate,date_format(im.MaterialRcvdDate,'%d-%m-%Y') as materialrcvddate, - round(ifnull(if(POType = 'REVENUE', - (id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), - (id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst, round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), - (id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) as cgst, round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), - (id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) as igst, round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), - (id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2) as discount, - round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), - (id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) as freight, - round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) as Package, - - round(( if(POType = 'IMPORT',(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)), - if(POType = 'CAPITAL' && CapitalRange = 0,(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)), - ifnull((id.QuantityAsPerInvoice * pl.Rate),0))) + round(ifnull(if(POType = 'REVENUE', - (id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), - (id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), (id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), (id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), (id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) - round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), (id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, im.file as ifile,pb.FilePath as file from T_IGR_Master im join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo left join T_PurchaseOrder_BillUpload pb on pb.IGRNO=im.IGRNO - - where pm.Status != 'ST030' "; - + + $sql ="select im.IGRNO as igrn,pm.POType as potype,im.PONO as pono,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, id.QuantityAsPerInvoice as quantity,pl.Rate as rate,round(id.QuantityAsPerInvoice * pl.Rate,2) as value,if(POType = 'IMPORT' or POType = 'CAPITAL',pm.ExchangeRate,0) as exchange_rate,date_format(im.MaterialRcvdDate,'%d-%m-%Y') as materialrcvddate, +round(ifnull(if(POType = 'REVENUE', +(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), +(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst, +round(ifnull(if(POType = 'REVENUE', +(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), +(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) as cgst, +round(ifnull(if(POType = 'REVENUE', +(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), +(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) as igst, +round(ifnull(if(POType = 'REVENUE', +(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), +(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2) as discount, +round(ifnull(if(POType = 'REVENUE', +(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), +(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) as freight, +round(ifnull(if(POType = 'REVENUE', +(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) as Package, + +round(( +if(POType = 'IMPORT',(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)), +if(POType = 'CAPITAL' && CapitalRange = 0,(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)), +ifnull((id.QuantityAsPerInvoice * pl.Rate),0))) ++ round(ifnull(if(POType = 'REVENUE', + (id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), + (id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) ++ round(ifnull(if(POType = 'REVENUE', + (id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), + (id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) ++ round(ifnull(if(POType = 'REVENUE', + (id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), + (id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) ++ round(ifnull(if(POType = 'REVENUE', + (id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), + (id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) ++ round(ifnull(if(POType = 'REVENUE', + (id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) +- round(ifnull(if(POType = 'REVENUE', + (id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), + (id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, + im.file as ifile,pb.FilePath as file +from T_IGR_Master im +left join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO +join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode +join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO +left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode +left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID +left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo +left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo +left join T_PurchaseOrder_BillUpload pb on pb.IGRNO=im.IGRNO +where pm.Status != 'ST030' "; + if ($cname!= ''){ $sql.="and sd.SupplierName = '".$cname."'"; @@ -1634,534 +1668,514 @@ $sql.="group by pono,material_name,category,supplier_name,id.IGRItemNo"; $query = $this->db->query($sql); return $query->result(); } - - function ireport_attachment($cname,$fa,$aa,$m,$frm,$t){ - - - /** $sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,date_format(materialrcvddate,'%d-%m-%Y') as materialrcvddate,supplier_name, - sum(total) as total,file,ifile - from igr - where status != 'ST030' + function ireport_attachment($cname,$fa,$aa,$m,$frm,$t){ + + + $sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,date_format(materialrcvddate,'%d-%m-%Y') as materialrcvddate,supplier_name, +sum(total) as total,file,ifile +from igr +where status != 'ST030' "; if ($cname!= ''){ + + $sql.="and supplier_name = '".$cname."'"; - $sql.="and supplier_name = '".$cname."'"; - - }**/ - - $sql="select pm.Status AS status,sd.SupplierID AS sid,im.file AS ifile,pb.FilePath AS file,im.IGRNO AS igrn,pm.POType AS potype,im.PONO AS pono,date_format(im.CreatedDate,'%d-%m-%Y') AS created_date,time_format(im.CreatedDate,'%l:%i %p') AS created_time,mm.MaterialName AS material_name, -date_format(im.MaterialRcvdDate,'%d-%m-%Y') as materialrcvddate,sd.SupplierName AS supplier_name,sum(id.QuantityAsPerInvoice) AS quantity, -round(((((((if((pm.POType = 'IMPORT'),sum((pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate))),if(((pm.POType = 'CAPITAL') and (pm.CapitalRange = 0)),sum((pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate))),ifnull(sum((id.QuantityAsPerInvoice * pl.Rate)),0))) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterSGST) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.After_SGST) / pl.Quantity))),0),2)) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterCGST) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.After_CGST) / pl.Quantity))),0),2)) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterIGST) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.After_IGST) / pl.Quantity))),0),2)) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterFreightValue) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.AfterFreightValue) / pl.Quantity))),0),2)) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterPackagingValue) / pl.Quantity)),0),0),2)) - round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterDiscount) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.Afterdiscountval) / pl.Quantity))),0),2)),2) AS total -from ((((((((T_IGR_Master im join T_PurchaseOrder_LineItem pl on((pl.PONO = im.PONO))) join T_IGR_Details id on(((id.IGRNO = im.IGRNO) and (id.MaterialCode = pl.MaterialCode)))) join T_PurchaseOrder_Master pm on((pm.PONO = pl.PONO))) -left join T_MaterialMaster mm on((mm.MaterialCode = pl.MaterialCode))) -left join T_SupplierDetailsN sd on((sd.SupplierID = pm.SupplierID))) -left join T_Service_Tax st on((st.LineItemNo = pl.LineItemNo))) -left join T_Revenue_Tax rt on((rt.LineItemNo = pl.LineItemNo))) -left join T_PurchaseOrder_BillUpload pb on((pb.PONO = im.PONO))) -where (pm.Status <> 'ST030') "; + } + + if ($fa and $aa != ''){ + + //$sql.=" and (created_date >= '".$fa."-04-01' and created_date <= '".$aa."-03-31')"; + $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; + + } + if ($m!= ''){ + + //$sql.="and monthname(created_date) = '".$m."'"; + $sql.="and monthname(materialrcvddate) = '".$m."'"; + + } + + if ($frm and $t != ''){ + $fromd= date("Y-m-d",strtotime($frm)); + $tod=date("Y-m-d",strtotime($t)); + + // $sql.="and date(created_date) >= '".$fromd."' + // and date(created_date) <= '".$tod."'"; + $sql.="and date(materialrcvddate) >= '".$fromd."' + and date(materialrcvddate) <= '".$tod."'"; + + } + + $sql.="group by pono,igrn"; +// echo $m; +// echo $sid; +//echo $sql; + $query = $this->db->query($sql); + return $query->result(); + } + +function ireport_year_wise($a,$b){ + + +// $sql="select dat as CreatedDate,sum(quantity)as quantity,sum(value) as value, materialrcvddate +// from year_inward +// where status != 'ST030' and date(dat) >= '$a-04-01' and date(dat) <= '$b-03-31' +// group by month(CreatedDate) +// "; +//echo $sql; + $sql="select materialrcvddate,sum(quantity)as quantity,sum(value) as value + from igr + where status != 'ST030' and date(materialrcvddate) >= '$a-04-01' and date(materialrcvddate) <= '$b-03-31' + group by month(materialrcvddate)"; + $query = $this->db->query($sql); + return $query->result(); + + + + } + + function ireport_month_wise($mont){ + $month= date("m",strtotime($mont)); + $year = date("Y",strtotime($mont)); + + // $sql="select sid,mid,supplier_name,material_name,sum(quantity)as quantity,sum(value) as total + // from year_inward + // where status != 'ST030' and month(dat)= ? and year(dat) = ? + // group by material_name,supplier_name"; + $sql="select sid,mid,supplier_name,material_name,sum(quantity)as quantity,sum(value) as total,materialrcvddate + from igr + where status != 'ST030' and month(materialrcvddate)= ? and year(materialrcvddate) = ? + group by material_name,supplier_name"; + $query = $this->db->query($sql,array($month,$year)); + return $query->result(); + } + function ireport_year_wise_total($a,$b){ + +// $sql="select sid,mid,supplier_name,material_name,sum(quantity)as quantity,sum(value) as total +// from year_inward +// where status != 'ST030' and date(dat) >= '$a-04-01' and date(dat) <= '$b-03-31' +// group by material_name,supplier_name"; + $sql="select sid,mid,supplier_name,material_name,sum(quantity)as quantity,sum(value) as total,materialrcvddate + from igr + where status != 'ST030' and date(materialrcvddate) >= '$a-04-01' and date(materialrcvddate) <= '$b-03-31' + group by material_name,supplier_name"; + $query = $this->db->query($sql,array()); + return $query->result(); + } + +function ireport_supplier($cname,$fa,$aa,$m,$frm,$t){ + + + $sql="SELECT sd.SupplierID as sid,sd.SupplierName as supplier_name,count(im.PONO) as counts,ifnull(sum(id.QuantityAsPerInvoice),0) as quantity,round(ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0),2) as value, + +case pm.POType +when 'IMPORT' +then ifnull((sum((id.QuantityAsPerInvoice * pl.Rate) * pm.ExchangeRate) ++ ifnull(rt.Insurance,0) + +),0) +when 'CAPITAL' +then sum( if(pm.CapitalRange=0,(( id.QuantityAsPerInvoice * pl.Rate) * pm.ExchangeRate),( id.QuantityAsPerInvoice * pl.Rate) +- st.Afterdiscountval)) ++ ifnull(sum(st.After_SGST),0) ++ ifnull(sum(st.After_CGST),0) ++ ifnull(sum(st.After_IGST),0) ++ ifnull(sum(st.AfterFreightValue),0) ++ ifnull(rt.Insurance,0) - if ($cname!= ''){ +when 'SERVICE' +then ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0) ++ ifnull(sum(st.After_SGST),0) ++ ifnull(sum(st.After_CGST),0) ++ ifnull(sum(st.After_IGST),0) ++ ifnull(sum(st.AfterFreightValue),0) ++ ifnull(rt.Insurance,0) +- ifnull(sum(st.Afterdiscountval),0) + +when 'REVENUE' +then ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0) +- ifnull(sum(rt.AfterDiscount),0) ++ ifnull(sum(rt.AfterSGST),0) ++ ifnull(sum(rt.AfterCGST),0) ++ ifnull(sum(rt.AfterIGST),0) ++ ifnull(sum(rt.AfterFreightValue),0) ++ ifnull(sum(rt.AfterPackagingValue),0) ++ ifnull(rt.Insurance,0) + +end +as total,im.MaterialRcvdDate +from T_IGR_Master im +left join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO +join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode +join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO +left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode +left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID +left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo +left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo +where pm.Status != 'ST030'"; + +if ($cname!= ''){ $sql.="and sd.SupplierName = '".$cname."'"; } - - if ($fa and $aa != ''){ + + + + if ($fa and $aa != ''){ - //$sql.=" and (created_date >= '".$fa."-04-01' and created_date <= '".$aa."-03-31')"; - $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; - - } - if ($m!= ''){ - - //$sql.="and monthname(created_date) = '".$m."'"; - $sql.="and monthname(materialrcvddate) = '".$m."'"; - - } - - if ($frm and $t != ''){ - $fromd= date("Y-m-d",strtotime($frm)); - $tod=date("Y-m-d",strtotime($t)); - - // $sql.="and date(created_date) >= '".$fromd."' - // and date(created_date) <= '".$tod."'"; - $sql.="and date(materialrcvddate) >= '".$fromd."' - and date(materialrcvddate) <= '".$tod."'"; - - } - - $sql.="group by pono,igrn"; - // echo $m; - // echo $sid; - //echo $sql; - $query = $this->db->query($sql); - return $query->result(); - } - - function ireport_year_wise($a,$b){ + //$sql.=" and (im.CreatedDate >= '".$fa."-04-01' and im.CreatedDate <= '".$aa."-03-31')"; + $sql.=" and (im.MaterialRcvdDate >= '".$fa."-04-01' and im.MaterialRcvdDate <= '".$aa."-03-31')"; + } + if ($m!= ''){ + + //$sql.="and monthname(im.CreatedDate) = '".$m."'"; + $sql.="and monthname(im.MaterialRcvdDate) = '".$m."'"; - // $sql="select dat as CreatedDate,sum(quantity)as quantity,sum(value) as value, materialrcvddate - // from year_inward - // where status != 'ST030' and date(dat) >= '$a-04-01' and date(dat) <= '$b-03-31' - // group by month(CreatedDate) - // "; + } + + if ($frm and $t != ''){ + $fromd= date("Y-m-d",strtotime($frm)); + $tod=date("Y-m-d",strtotime($t)); + + // $sql.="and date(im.CreatedDate) >= '".$fromd."' + // and date(im.CreatedDate) <= '".$tod."'"; + $sql.="and date(im.MaterialRcvdDate) >= '".$fromd."' + and date(im.MaterialRcvdDate) <= '".$tod."'"; + + } + $sql.= "group by supplier_name"; //echo $sql; - $sql="select materialrcvddate,sum(quantity)as quantity,sum(value) as value,materialrcvddate - from year_inward - where status != 'ST030' and date(materialrcvddate) >= '$a-04-01' and date(materialrcvddate) <= '$b-03-31' - group by month(materialrcvddate)"; - $query = $this->db->query($sql); - return $query->result(); - - - - } + $query = $this->db->query($sql); + return $query->result(); - function ireport_month_wise($mont){ - $month= date("m",strtotime($mont)); - $year = date("Y",strtotime($mont)); + } +function ireport_consolidate($cname,$fa,$aa){ + + + $sql="select sid,mid,supplier_name,material_name, +SUM(IF(month(materialrcvddate) = 4, quantity, 0)) AS April, +SUM(IF(month(materialrcvddate) = 5, quantity, 0)) AS May, +SUM(IF(month(materialrcvddate) = 6, quantity, 0)) AS June, +SUM(IF(month(materialrcvddate) = 7, quantity, 0)) AS July, +SUM(IF(month(materialrcvddate) = 8, quantity, 0)) AS August, +SUM(IF(month(materialrcvddate) = 9, quantity, 0)) AS September, +SUM(IF(month(materialrcvddate) = 10, quantity, 0)) AS October, +SUM(IF(month(materialrcvddate) = 11, quantity, 0)) AS November, +SUM(IF(month(materialrcvddate) = 12, quantity, 0)) AS December, +SUM(IF(month(materialrcvddate) = 1, quantity, 0)) AS January, +SUM(IF(month(materialrcvddate) = 2, quantity, 0)) AS February, +SUM(IF(month(materialrcvddate) = 3, quantity, 0)) AS March, +sum(quantity) as qtotal, +SUM(IF(month(materialrcvddate) = 4, value, 0)) AS vApril, +SUM(IF(month(materialrcvddate) = 5, value, 0)) AS vMay, +SUM(IF(month(materialrcvddate) = 6, value, 0)) AS vJune, +SUM(IF(month(materialrcvddate) = 7, value, 0)) AS vJuly, +SUM(IF(month(materialrcvddate) = 8, value, 0)) AS vAugust, +SUM(IF(month(materialrcvddate) = 9, value, 0)) AS vSeptember, +SUM(IF(month(materialrcvddate) = 10, value, 0)) AS vOctober, +SUM(IF(month(materialrcvddate) = 11, value, 0)) AS vNovember, +SUM(IF(month(materialrcvddate) = 12, value, 0)) AS vDecember, +SUM(IF(month(materialrcvddate) = 1, value, 0)) AS vJanuary, +SUM(IF(month(materialrcvddate) = 2, value, 0)) AS vFebruary, +SUM(IF(month(materialrcvddate) = 3, value, 0)) AS vMarch, +sum(value) as vtotal +FROM igr +where status != 'ST030' "; + +if ($cname!= ''){ + + $sql.="and supplier_name = '".$cname."'"; + + } + + + + if ($fa and $aa != ''){ + + // $sql.=" and (dat >= '".$fa."-04-01' and dat <= '".$aa."-03-31')"; + $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; + + } + + $sql.= "group by supplier_name,material_name"; + // echo $sql; + $query = $this->db->query($sql); + return $query->result(); - // $sql="select sid,mid,supplier_name,material_name,sum(quantity)as quantity,sum(value) as total - // from year_inward - // where status != 'ST030' and month(dat)= ? and year(dat) = ? - // group by material_name,supplier_name"; - $sql="select sid,mid,supplier_name,material_name,sum(quantity)as quantity,sum(value) as total,materialrcvddate - from year_inward - where status != 'ST030' and month(materialrcvddate)= ? and year(materialrcvddate) = ? - group by material_name,supplier_name"; - $query = $this->db->query($sql,array($month,$year)); - return $query->result(); - } - function ireport_year_wise_total($a,$b){ - - // $sql="select sid,mid,supplier_name,material_name,sum(quantity)as quantity,sum(value) as total - // from year_inward - // where status != 'ST030' and date(dat) >= '$a-04-01' and date(dat) <= '$b-03-31' - // group by material_name,supplier_name"; - $sql="select sid,mid,supplier_name,material_name,sum(quantity)as quantity,sum(value) as total,materialrcvddate - from year_inward - where status != 'ST030' and date(materialrcvddate) >= '$a-04-01' and date(materialrcvddate) <= '$b-03-31' - group by material_name,supplier_name"; - $query = $this->db->query($sql,array()); - return $query->result(); - } - - function ireport_supplier($cname,$fa,$aa,$m,$frm,$t){ - - - $sql="SELECT sd.SupplierID as sid,sd.SupplierName as supplier_name,count(im.PONO) as counts,ifnull(sum(id.QuantityAsPerInvoice),0) as quantity,round(ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0),2) as value, - - case pm.POType - when 'IMPORT' - then ifnull((sum((id.QuantityAsPerInvoice * pl.Rate) * pm.ExchangeRate) - + ifnull(rt.Insurance,0) - - ),0) - when 'CAPITAL' - then sum( if(pm.CapitalRange=0,(( id.QuantityAsPerInvoice * pl.Rate) * pm.ExchangeRate),( id.QuantityAsPerInvoice * pl.Rate) - - st.Afterdiscountval)) - + ifnull(sum(st.After_SGST),0) - + ifnull(sum(st.After_CGST),0) - + ifnull(sum(st.After_IGST),0) - + ifnull(sum(st.AfterFreightValue),0) - + ifnull(rt.Insurance,0) - - - when 'SERVICE' - then ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0) - + ifnull(sum(st.After_SGST),0) - + ifnull(sum(st.After_CGST),0) - + ifnull(sum(st.After_IGST),0) - + ifnull(sum(st.AfterFreightValue),0) - + ifnull(rt.Insurance,0) - - ifnull(sum(st.Afterdiscountval),0) - - when 'REVENUE' - then ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0) - - ifnull(sum(rt.AfterDiscount),0) - + ifnull(sum(rt.AfterSGST),0) - + ifnull(sum(rt.AfterCGST),0) - + ifnull(sum(rt.AfterIGST),0) - + ifnull(sum(rt.AfterFreightValue),0) - + ifnull(sum(rt.AfterPackagingValue),0) - + ifnull(rt.Insurance,0) - - end - as total,im.MaterialRcvdDate - from T_IGR_Master im - join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO - join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode - join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO - left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode - left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID - left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo - left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo - left join T_PurchaseOrder_BillUpload pb on pb.IGRNO=im.IGRNO - where pm.Status != 'ST030'"; - - if ($cname!= ''){ - - $sql.="and sd.SupplierName = '".$cname."'"; - - } - - - - if ($fa and $aa != ''){ - - //$sql.=" and (im.CreatedDate >= '".$fa."-04-01' and im.CreatedDate <= '".$aa."-03-31')"; - $sql.=" and (im.MaterialRcvdDate >= '".$fa."-04-01' and im.MaterialRcvdDate <= '".$aa."-03-31')"; - - } - if ($m!= ''){ - - //$sql.="and monthname(im.CreatedDate) = '".$m."'"; - $sql.="and monthname(im.MaterialRcvdDate) = '".$m."'"; - - } - - if ($frm and $t != ''){ - $fromd= date("Y-m-d",strtotime($frm)); - $tod=date("Y-m-d",strtotime($t)); - - // $sql.="and date(im.CreatedDate) >= '".$fromd."' - // and date(im.CreatedDate) <= '".$tod."'"; - $sql.="and date(im.MaterialRcvdDate) >= '".$fromd."' - and date(im.MaterialRcvdDate) <= '".$tod."'"; - - } - $sql.= "group by supplier_name"; - //echo $sql; - $query = $this->db->query($sql); - return $query->result(); - + } +function i_consolidate_month($m=null,$sid=null,$mid=null,$fa=null,$aa=null){ + + $sql="select sid,mid,supplier_name,material_name,sum(quantity) as quantity,sum(value) as total +from igr +where status != 'ST030' and +monthname(materialrcvddate) = '".$m."' and sid = '".$sid."' and mid = '".$mid."' "; +if ($fa and $aa != ''){ + + //$sql.=" and (dat >= '".$fa."-04-01' and dat <= '".$aa."-03-31')"; + $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; + + } + $sql.= "group by supplier_name,material_name"; + $query = $this->db->query($sql); + //echo $sql; + return $query->result(); } - function ireport_consolidate($cname,$fa,$aa){ - - - $sql="select sid,mid,supplier_name,material_name, - SUM(IF(month(materialrcvddate) = 4, quantity, 0)) AS April, - SUM(IF(month(materialrcvddate) = 5, quantity, 0)) AS May, - SUM(IF(month(materialrcvddate) = 6, quantity, 0)) AS June, - SUM(IF(month(materialrcvddate) = 7, quantity, 0)) AS July, - SUM(IF(month(materialrcvddate) = 8, quantity, 0)) AS August, - SUM(IF(month(materialrcvddate) = 9, quantity, 0)) AS September, - SUM(IF(month(materialrcvddate) = 10, quantity, 0)) AS October, - SUM(IF(month(materialrcvddate) = 11, quantity, 0)) AS November, - SUM(IF(month(materialrcvddate) = 12, quantity, 0)) AS December, - SUM(IF(month(materialrcvddate) = 1, quantity, 0)) AS January, - SUM(IF(month(materialrcvddate) = 2, quantity, 0)) AS February, - SUM(IF(month(materialrcvddate) = 3, quantity, 0)) AS March, - sum(quantity) as qtotal, - SUM(IF(month(materialrcvddate) = 4, value, 0)) AS vApril, - SUM(IF(month(materialrcvddate) = 5, value, 0)) AS vMay, - SUM(IF(month(materialrcvddate) = 6, value, 0)) AS vJune, - SUM(IF(month(materialrcvddate) = 7, value, 0)) AS vJuly, - SUM(IF(month(materialrcvddate) = 8, value, 0)) AS vAugust, - SUM(IF(month(materialrcvddate) = 9, value, 0)) AS vSeptember, - SUM(IF(month(materialrcvddate) = 10, value, 0)) AS vOctober, - SUM(IF(month(materialrcvddate) = 11, value, 0)) AS vNovember, - SUM(IF(month(materialrcvddate) = 12, value, 0)) AS vDecember, - SUM(IF(month(materialrcvddate) = 1, value, 0)) AS vJanuary, - SUM(IF(month(materialrcvddate) = 2, value, 0)) AS vFebruary, - SUM(IF(month(materialrcvddate) = 3, value, 0)) AS vMarch, - sum(value) as vtotal - FROM year_inward - where status != 'ST030' "; - - if ($cname!= ''){ - - $sql.="and supplier_name = '".$cname."'"; - - } - - - - if ($fa and $aa != ''){ - - // $sql.=" and (dat >= '".$fa."-04-01' and dat <= '".$aa."-03-31')"; - $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; - - } - - $sql.= "group by supplier_name,material_name"; - // echo $sql; - $query = $this->db->query($sql); - return $query->result(); - + function i_consolidate_year($sid=null,$mid=null,$fa=null,$aa=null){ + + $sql="select sid,mid,supplier_name,material_name,sum(quantity) as quantity,sum(value) as total +from igr +where status != 'ST030' and sid = '".$sid."' and mid = '".$mid."' "; +if ($fa and $aa != ''){ + + //$sql.=" and (dat >= '".$fa."-04-01' and dat <= '".$aa."-03-31')"; + $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; + + } + $sql.= "group by supplier_name,material_name"; + $query = $this->db->query($sql); + //echo $sql; + return $query->result(); } - function i_consolidate_month($m=null,$sid=null,$mid=null,$fa=null,$aa=null){ - - $sql="select sid,mid,supplier_name,material_name,sum(quantity) as quantity,sum(value) as total - from year_inward - where status != 'ST030' and - monthname(dat) = '".$m."' and sid = '".$sid."' and mid = '".$mid."' "; - if ($fa and $aa != ''){ - - //$sql.=" and (dat >= '".$fa."-04-01' and dat <= '".$aa."-03-31')"; - $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; - - } - $sql.= "group by supplier_name,material_name"; - $query = $this->db->query($sql); - //echo $sql; - return $query->result(); - } - function i_consolidate_year($sid=null,$mid=null,$fa=null,$aa=null){ - - $sql="select sid,mid,supplier_name,material_name,sum(quantity) as quantity,sum(value) as total - from year_inward - where status != 'ST030' and sid = '".$sid."' and mid = '".$mid."' "; - if ($fa and $aa != ''){ - - //$sql.=" and (dat >= '".$fa."-04-01' and dat <= '".$aa."-03-31')"; - $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; - - } - $sql.= "group by supplier_name,material_name"; - $query = $this->db->query($sql); - //echo $sql; - return $query->result(); - } - function ireport_cumulative(){ - if (date('m') >= 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - $fa=substr($ab,0,-5); - $aa=substr($ab,5,5); - $sql="SELECT year.sid as sid,year.mid as mid,year.supplier_name as supplier_name,year.material_name as material_name,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal - FROM (SELECT sid,mid,supplier_name,material_name,sum(Quantity) as quantity,sum(value) as total,materialrcvddate - FROM year_inward - where status != 'ST030' and - (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31') - group by supplier_name,material_name - ) as year left join - (SELECT sid,mid,supplier_name,material_name,sum(Quantity) as mquantity,sum(value) as mtotal - FROM year_inward - where status != 'ST030' and - month(materialrcvddate) = month(current_date()) - group by supplier_name,material_name - ) as month on month.supplier_name=year.supplier_name and month.material_name=year.material_name - left join - (SELECT sid,mid,supplier_name,material_name,sum(Quantity) as tquantity,sum(value) as ttotal - FROM year_inward - where status != 'ST030' and - date(materialrcvddate) = current_date() - group by supplier_name,material_name - ) as today on today.supplier_name=month.supplier_name and today.material_name=month.material_name - group by supplier_name,material_name - "; - $query = $this->db->query($sql); - return $query->result(); - } - function ireport_cum_month($sup=null,$mat=null){ - - $sql="SELECT sid,mid,supplier_name,material_name,sum(Quantity) as tquantity,sum(value) as ttotal - FROM year_inward - where status != 'ST030' and - month(materialrcvddate) = month(current_date()) and sid = '".$sup."' and mid = '".$mat."' - group by supplier_name,material_name"; - $query = $this->db->query($sql); - return $query->result(); - } - function ireport_cum_year($sup=null,$mat=null){ - if (date('m') >= 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - $fa=substr($ab,0,-5); - $aa=substr($ab,5,5); - $sql="SELECT sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal - FROM year_inward - where status != 'ST030' and - (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31') - and sid = '".$sup."' and mid= '".$mat."' - group by supplier_name,material_name - "; - $query = $this->db->query($sql); - return $query->result(); - } - function ireport_cum_day($sup=null,$mat=null){ - - $sql="SELECT sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal - FROM year_inward - where status != 'ST030' and - date(materialrcvddate) = current_date() and sid = '".$sup."' and mid = '".$mat."' - group by supplier_name,material_name"; - $query = $this->db->query($sql); - return $query->result(); - } - function rawi_report_cumulative(){ - if (date('m') >= 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - $fa=substr($ab,0,-5); - $aa=substr($ab,5,5); - $sql="SELECT year.category as category,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal - FROM (SELECT category,sum(Quantity) as quantity,sum(value) as total - FROM year_inward - where status != 'ST030' and - (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31') - group by category - ) as year left join - (SELECT category,sum(Quantity) as mquantity,sum(value) as mtotal - FROM year_inward - where status != 'ST030' and - month(materialrcvddate) = month(current_date()) - group by category - ) as month on month.category=year.category - left join - (SELECT category,sum(Quantity) as tquantity,sum(value) as ttotal - FROM year_inward - where status != 'ST030' and - date(materialrcvddate) = current_date() - group by category - ) as today on today.category=month.category - group by category "; - $query = $this->db->query($sql); - return $query->result(); - } - function rawi_report_cum_year($cat=null){ - if (date('m') >= 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - $fa=substr($ab,0,-5); - $aa=substr($ab,5,5); - $sql="SELECT category,sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal - FROM year_inward - where status != 'ST030' and - (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31') - and category = '".$cat."' - group by supplier_name,material_name"; - $query = $this->db->query($sql); - //echo $sql; - return $query->result(); - } - function rawi_report_cum_month($cat=null){ - - $sql="SELECT category,sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal - FROM year_inward - where status != 'ST030' and - month(materialrcvddate) = month(current_date()) and category = '".$cat."' - group by supplier_name,material_name"; - $query = $this->db->query($sql); - return $query->result(); - } - function rawi_report_cum_day($cat=null){ - - $sql="SELECT category,sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal - FROM year_inward - where status != 'ST030' and - date(materialrcvddate) = current_date() and category = '".$cat."' - group by supplier_name,material_name"; - $query = $this->db->query($sql); - //echo $sql; - return $query->result(); - } - function rawi_report_consolidate($cname,$fa,$aa){ - - - $sql="select sid,mid,category,supplier_name,material_name, - SUM(IF(month(materialrcvddate) = 4, quantity, 0)) AS April, - SUM(IF(month(materialrcvddate) = 5, quantity, 0)) AS May, - SUM(IF(month(materialrcvddate) = 6, quantity, 0)) AS June, - SUM(IF(month(materialrcvddate) = 7, quantity, 0)) AS July, - SUM(IF(month(materialrcvddate) = 8, quantity, 0)) AS August, - SUM(IF(month(materialrcvddate) = 9, quantity, 0)) AS September, - SUM(IF(month(materialrcvddate) = 10, quantity, 0)) AS October, - SUM(IF(month(materialrcvddate) = 11, quantity, 0)) AS November, - SUM(IF(month(materialrcvddate) = 12, quantity, 0)) AS December, - SUM(IF(month(materialrcvddate) = 1, quantity, 0)) AS January, - SUM(IF(month(materialrcvddate) = 2, quantity, 0)) AS February, - SUM(IF(month(materialrcvddate) = 3, quantity, 0)) AS March, - sum(quantity) as qtotal, - SUM(IF(month(materialrcvddate) = 4, value, 0)) AS vApril, - SUM(IF(month(materialrcvddate) = 5, value, 0)) AS vMay, - SUM(IF(month(materialrcvddate) = 6, value, 0)) AS vJune, - SUM(IF(month(materialrcvddate) = 7, value, 0)) AS vJuly, - SUM(IF(month(materialrcvddate) = 8, value, 0)) AS vAugust, - SUM(IF(month(materialrcvddate) = 9, value, 0)) AS vSeptember, - SUM(IF(month(materialrcvddate) = 10, value, 0)) AS vOctober, - SUM(IF(month(materialrcvddate) = 11, value, 0)) AS vNovember, - SUM(IF(month(materialrcvddate) = 12, value, 0)) AS vDecember, - SUM(IF(month(materialrcvddate) = 1, value, 0)) AS vJanuary, - SUM(IF(month(materialrcvddate) = 2, value, 0)) AS vFebruary, - SUM(IF(month(materialrcvddate) = 3, value, 0)) AS vMarch, - sum(value) as vtotal - FROM year_inward - where status != 'ST030' "; - - if ($cname!= ''){ - - $sql.="and Category = '".$cname."'"; - - } - - - - if ($fa and $aa != ''){ - - //$sql.=" and (dat >= '".$fa."-04-01' and dat <= '".$aa."-03-31')"; - $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; - - } - - $sql.= "group by category"; - //echo $sql; - $query = $this->db->query($sql); - return $query->result(); - + function ireport_cumulative(){ + if (date('m') >= 4) { + $yearl = date('Y').'-'.(date('Y')+1); + } else { + $yearl = (date('Y')-1).'-'.date('Y'); + } + $ab=$yearl; + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + $sql="SELECT year.sid as sid,year.mid as mid,year.supplier_name as supplier_name,year.material_name as material_name,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal +FROM (SELECT sid,mid,supplier_name,material_name,sum(Quantity) as quantity,sum(value) as total,materialrcvddate +FROM igr +where status != 'ST030' and +(materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31') +group by supplier_name,material_name +) as year left join +(SELECT sid,mid,supplier_name,material_name,sum(Quantity) as mquantity,sum(value) as mtotal +FROM igr +where status != 'ST030' and +month(materialrcvddate) = month(current_date()) +group by supplier_name,material_name +) as month on month.supplier_name=year.supplier_name and month.material_name=year.material_name +left join +(SELECT sid,mid,supplier_name,material_name,sum(Quantity) as tquantity,sum(value) as ttotal +FROM igr +where status != 'ST030' and +date(materialrcvddate) = current_date() +group by supplier_name,material_name +) as today on today.supplier_name=month.supplier_name and today.material_name=month.material_name +group by supplier_name,material_name +"; + $query = $this->db->query($sql); + return $query->result(); } - function rawi_consolidate_month($m=null,$cat=null,$sup=null,$fa=null,$aa=null){ + function ireport_cum_month($sup=null,$mat=null){ + + $sql="SELECT sid,mid,supplier_name,material_name,sum(Quantity) as tquantity,sum(value) as ttotal +FROM igr +where status != 'ST030' and +month(materialrcvddate) = month(current_date()) and sid = '".$sup."' and mid = '".$mat."' +group by supplier_name,material_name"; + $query = $this->db->query($sql); + return $query->result(); + } + function ireport_cum_year($sup=null,$mat=null){ + if (date('m') >= 4) { + $yearl = date('Y').'-'.(date('Y')+1); + } else { + $yearl = (date('Y')-1).'-'.date('Y'); + } + $ab=$yearl; + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + $sql="SELECT sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal +FROM igr +where status != 'ST030' and +(materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31') +and sid = '".$sup."' and mid= '".$mat."' +group by supplier_name,material_name +"; + $query = $this->db->query($sql); + return $query->result(); + } + function ireport_cum_day($sup=null,$mat=null){ + + $sql="SELECT sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal +FROM igr +where status != 'ST030' and +date(materialrcvddate) = current_date() and sid = '".$sup."' and mid = '".$mat."' +group by supplier_name,material_name"; + $query = $this->db->query($sql); + return $query->result(); + } + function rawi_report_cumulative(){ + if (date('m') >= 4) { + $yearl = date('Y').'-'.(date('Y')+1); + } else { + $yearl = (date('Y')-1).'-'.date('Y'); + } + $ab=$yearl; + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + $sql="SELECT year.category as category,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal +FROM (SELECT category,sum(Quantity) as quantity,sum(value) as total +FROM igr +where status != 'ST030' and +(materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31') +group by category +) as year left join +(SELECT category,sum(Quantity) as mquantity,sum(value) as mtotal +FROM igr +where status != 'ST030' and +month(materialrcvddate) = month(current_date()) +group by category +) as month on month.category=year.category +left join +(SELECT category,sum(Quantity) as tquantity,sum(value) as ttotal +FROM igr +where status != 'ST030' and +date(materialrcvddate) = current_date() +group by category +) as today on today.category=month.category +group by category "; + $query = $this->db->query($sql); + return $query->result(); + } + function rawi_report_cum_year($cat=null){ + if (date('m') >= 4) { + $yearl = date('Y').'-'.(date('Y')+1); + } else { + $yearl = (date('Y')-1).'-'.date('Y'); + } + $ab=$yearl; + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + $sql="SELECT category,sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal +FROM igr +where status != 'ST030' and +(materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31') +and category = '".$cat."' +group by supplier_name,material_name"; + $query = $this->db->query($sql); + //echo $sql; + return $query->result(); + } + function rawi_report_cum_month($cat=null){ + + $sql="SELECT category,sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal +FROM igr +where status != 'ST030' and +month(materialrcvddate) = month(current_date()) and category = '".$cat."' +group by supplier_name,material_name"; + $query = $this->db->query($sql); + return $query->result(); + } + function rawi_report_cum_day($cat=null){ + + $sql="SELECT category,sid,mid,supplier_name,material_name,IF(Quantity IS NULL or Quantity = '', 0, sum(Quantity)) as tquantity,sum(value) as ttotal +FROM igr +where status != 'ST030' and +date(materialrcvddate) = current_date() and category = '".$cat."' +group by supplier_name,material_name"; + $query = $this->db->query($sql); + //echo $sql; + return $query->result(); + } + function rawi_report_consolidate($cname,$fa,$aa){ + + + $sql="select sid,mid,category,supplier_name,material_name, +SUM(IF(month(materialrcvddate) = 4, quantity, 0)) AS April, +SUM(IF(month(materialrcvddate) = 5, quantity, 0)) AS May, +SUM(IF(month(materialrcvddate) = 6, quantity, 0)) AS June, +SUM(IF(month(materialrcvddate) = 7, quantity, 0)) AS July, +SUM(IF(month(materialrcvddate) = 8, quantity, 0)) AS August, +SUM(IF(month(materialrcvddate) = 9, quantity, 0)) AS September, +SUM(IF(month(materialrcvddate) = 10, quantity, 0)) AS October, +SUM(IF(month(materialrcvddate) = 11, quantity, 0)) AS November, +SUM(IF(month(materialrcvddate) = 12, quantity, 0)) AS December, +SUM(IF(month(materialrcvddate) = 1, quantity, 0)) AS January, +SUM(IF(month(materialrcvddate) = 2, quantity, 0)) AS February, +SUM(IF(month(materialrcvddate) = 3, quantity, 0)) AS March, +sum(quantity) as qtotal, +SUM(IF(month(materialrcvddate) = 4, value, 0)) AS vApril, +SUM(IF(month(materialrcvddate) = 5, value, 0)) AS vMay, +SUM(IF(month(materialrcvddate) = 6, value, 0)) AS vJune, +SUM(IF(month(materialrcvddate) = 7, value, 0)) AS vJuly, +SUM(IF(month(materialrcvddate) = 8, value, 0)) AS vAugust, +SUM(IF(month(materialrcvddate) = 9, value, 0)) AS vSeptember, +SUM(IF(month(materialrcvddate) = 10, value, 0)) AS vOctober, +SUM(IF(month(materialrcvddate) = 11, value, 0)) AS vNovember, +SUM(IF(month(materialrcvddate) = 12, value, 0)) AS vDecember, +SUM(IF(month(materialrcvddate) = 1, value, 0)) AS vJanuary, +SUM(IF(month(materialrcvddate) = 2, value, 0)) AS vFebruary, +SUM(IF(month(materialrcvddate) = 3, value, 0)) AS vMarch, +sum(value) as vtotal +FROM igr +where status != 'ST030' "; + +if ($cname!= ''){ + + $sql.="and Category = '".$cname."'"; + + } + + + + if ($fa and $aa != ''){ + + //$sql.=" and (dat >= '".$fa."-04-01' and dat <= '".$aa."-03-31')"; + $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; + + } + + $sql.= "group by category"; + //echo $sql; + $query = $this->db->query($sql); + return $query->result(); - $sql="select category,sid,supplier_name,mid,material_name, - sum(Quantity) as quantity, - sum(value) as total - FROM year_inward - where status != 'ST030' and - monthname(materialrcvddate) = '".$m."' and category = '".$cat."' "; - if ($fa and $aa != ''){ - - $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; - - } - $sql.= "group by category,supplier_name,material_name"; - $query = $this->db->query($sql); - //echo $sql; - return $query->result(); - } - function rawi_consolidate_year($cat=null,$sup=null,$fa=null,$aa=null){ - - $sql="select category,sid,supplier_name,mid,material_name, - sum(Quantity) as quantity, - sum(value) as total - FROM year_inward - where status != 'ST030' and - category = '".$cat."' "; - if ($fa and $aa != ''){ - - $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; - - } - $sql.= "group by category,supplier_name,material_name"; - $query = $this->db->query($sql); - //echo $sql; - return $query->result(); - } + } +function rawi_consolidate_month($m=null,$cat=null,$sup=null,$fa=null,$aa=null){ + + $sql="select category,sid,supplier_name,mid,material_name, +sum(Quantity) as quantity, +sum(value) as total +FROM igr +where status != 'ST030' and +monthname(materialrcvddate) = '".$m."' and category = '".$cat."' "; +if ($fa and $aa != ''){ + + $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; + + } + $sql.= "group by category,supplier_name,material_name"; + $query = $this->db->query($sql); + //echo $sql; + return $query->result(); + } + function rawi_consolidate_year($cat=null,$sup=null,$fa=null,$aa=null){ + + $sql="select category,sid,supplier_name,mid,material_name, +sum(Quantity) as quantity, +sum(value) as total +FROM igr +where status != 'ST030' and +category = '".$cat."' "; +if ($fa and $aa != ''){ + + $sql.=" and (materialrcvddate >= '".$fa."-04-01' and materialrcvddate <= '".$aa."-03-31')"; + + } + $sql.= "group by category,supplier_name,material_name"; + $query = $this->db->query($sql); + //echo $sql; + return $query->result(); + } function pending_purchase($cname,$prod,$fa,$aa,$m,$frm,$t){ $sql="select po.PONO as po,date_format(po.PODate,'%d-%m-%Y') as pdate,sup.SupplierName as supplier,mm.MaterialName as material,mm.Category as category,pl.Quantity as quantity,pl.ReceivedQuantity as received, (pl.Quantity - pl.ReceivedQuantity) as pending diff --git a/application/views/Report_consolidate.php b/application/views/Report_consolidate.php index 6797a2bf..1164fe65 100755 --- a/application/views/Report_consolidate.php +++ b/application/views/Report_consolidate.php @@ -773,19 +773,19 @@ $(document).ready(function() { var api = this.api(), data; - var Final_april_total =parseInt(april_sum); - var Final_may_total = parseInt(may_sum); - var Final_june_total = parseInt(june_sum); - var Final_july_total = parseInt(july_sum); - var Final_aug_total = parseInt(aug_sum); - var Final_sep_total = parseInt(sep_sum); - var Final_oct_total = parseInt(oct_sum); - var Final_nov_total = parseInt(nov_sum); - var Final_dec_total = parseInt(dec_sum); - var Final_jan_total = parseInt(jan_sum); - var Final_feb_total = parseInt(feb_sum); - var Final_mar_total = parseInt(mar_sum); - var Final_tot = parseInt(total_sum); + var Final_april_total = parseFloat(april_sum); + var Final_may_total = parseFloat(may_sum); + var Final_june_total = parseFloat(june_sum); + var Final_july_total = parseFloat(july_sum); + var Final_aug_total = parseFloat(aug_sum); + var Final_sep_total = parseFloat(sep_sum); + var Final_oct_total = parseFloat(oct_sum); + var Final_nov_total = parseFloat(nov_sum); + var Final_dec_total = parseFloat(dec_sum); + var Final_jan_total = parseFloat(jan_sum); + var Final_feb_total = parseFloat(feb_sum); + var Final_mar_total = parseFloat(mar_sum); + var Final_tot = parseFloat(total_sum); $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() ); $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() ); @@ -883,19 +883,19 @@ $(document).ready(function() { var api = this.api(), data; - var Final_april_total =parseInt(aprilval_sum); - var Final_may_total = parseInt(mayval_sum); - var Final_june_total = parseInt(juneval_sum); - var Final_july_total = parseInt(julyval_sum); - var Final_aug_total = parseInt(augval_sum); - var Final_sep_total = parseInt(sepval_sum); - var Final_oct_total = parseInt(octval_sum); - var Final_nov_total = parseInt(novval_sum); - var Final_dec_total = parseInt(decval_sum); - var Final_jan_total = parseInt(janval_sum); - var Final_feb_total = parseInt(febval_sum); - var Final_mar_total = parseInt(marval_sum); - var Final_tot = parseInt(totalval_sum); + var Final_april_total = parseFloat(aprilval_sum); + var Final_may_total = parseFloat(mayval_sum); + var Final_june_total = parseFloat(juneval_sum); + var Final_july_total = parseFloat(julyval_sum); + var Final_aug_total = parseFloat(augval_sum); + var Final_sep_total = parseFloat(sepval_sum); + var Final_oct_total = parseFloat(octval_sum); + var Final_nov_total = parseFloat(novval_sum); + var Final_dec_total = parseFloat(decval_sum); + var Final_jan_total = parseFloat(janval_sum); + var Final_feb_total = parseFloat(febval_sum); + var Final_mar_total = parseFloat(marval_sum); + var Final_tot = parseFloat(totalval_sum); $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() ); $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() ); diff --git a/application/views/Report_consolidate_inward.php b/application/views/Report_consolidate_inward.php index 39320ac9..7a62d1e6 100755 --- a/application/views/Report_consolidate_inward.php +++ b/application/views/Report_consolidate_inward.php @@ -755,19 +755,19 @@ $(document).ready(function () { $("#client_name").select2(); }); var api = this.api(), data; - var Final_april_total =parseInt(april_sum); - var Final_may_total = parseInt(may_sum); - var Final_june_total = parseInt(june_sum); - var Final_july_total = parseInt(july_sum); - var Final_aug_total = parseInt(aug_sum); - var Final_sep_total = parseInt(sep_sum); - var Final_oct_total = parseInt(oct_sum); - var Final_nov_total = parseInt(nov_sum); - var Final_dec_total = parseInt(dec_sum); - var Final_jan_total = parseInt(jan_sum); - var Final_feb_total = parseInt(feb_sum); - var Final_mar_total = parseInt(mar_sum); - var Final_tot = parseInt(total_sum); + var Final_april_total = parseFloat(april_sum); + var Final_may_total = parseFloat(may_sum); + var Final_june_total = parseFloat(june_sum); + var Final_july_total = parseFloat(july_sum); + var Final_aug_total = parseFloat(aug_sum); + var Final_sep_total = parseFloat(sep_sum); + var Final_oct_total = parseFloat(oct_sum); + var Final_nov_total = parseFloat(nov_sum); + var Final_dec_total = parseFloat(dec_sum); + var Final_jan_total = parseFloat(jan_sum); + var Final_feb_total = parseFloat(feb_sum); + var Final_mar_total = parseFloat(mar_sum); + var Final_tot = parseFloat(total_sum); $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() ); $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() ); @@ -868,19 +868,19 @@ $(document).ready(function () { $("#client_name").select2(); }); var api = this.api(), data; - var Final_april_total =parseInt(aprilval_sum); - var Final_may_total = parseInt(mayval_sum); - var Final_june_total = parseInt(juneval_sum); - var Final_july_total = parseInt(julyval_sum); - var Final_aug_total = parseInt(augval_sum); - var Final_sep_total = parseInt(sepval_sum); - var Final_oct_total = parseInt(octval_sum); - var Final_nov_total = parseInt(novval_sum); - var Final_dec_total = parseInt(decval_sum); - var Final_jan_total = parseInt(janval_sum); - var Final_feb_total = parseInt(febval_sum); - var Final_mar_total = parseInt(marval_sum); - var Final_tot = parseInt(totalval_sum); + var Final_april_total = parseFloat(aprilval_sum); + var Final_may_total = parseFloat(mayval_sum); + var Final_june_total = parseFloat(juneval_sum); + var Final_july_total = parseFloat(julyval_sum); + var Final_aug_total = parseFloat(augval_sum); + var Final_sep_total = parseFloat(sepval_sum); + var Final_oct_total = parseFloat(octval_sum); + var Final_nov_total = parseFloat(novval_sum); + var Final_dec_total = parseFloat(decval_sum); + var Final_jan_total = parseFloat(janval_sum); + var Final_feb_total = parseFloat(febval_sum); + var Final_mar_total = parseFloat(marval_sum); + var Final_tot = parseFloat(totalval_sum); $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() ); $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() ); diff --git a/application/views/Report_consolidate_raw.php b/application/views/Report_consolidate_raw.php index f1f80153..b11e3150 100755 --- a/application/views/Report_consolidate_raw.php +++ b/application/views/Report_consolidate_raw.php @@ -774,19 +774,19 @@ table.dataTable thead > tr > td.sorting { var api = this.api(), data; - var Final_april_total =parseInt(april_sum); - var Final_may_total = parseInt(may_sum); - var Final_june_total = parseInt(june_sum); - var Final_july_total = parseInt(july_sum); - var Final_aug_total = parseInt(aug_sum); - var Final_sep_total = parseInt(sep_sum); - var Final_oct_total = parseInt(oct_sum); - var Final_nov_total = parseInt(nov_sum); - var Final_dec_total = parseInt(dec_sum); - var Final_jan_total = parseInt(jan_sum); - var Final_feb_total = parseInt(feb_sum); - var Final_mar_total = parseInt(mar_sum); - var Final_tot = parseInt(total_sum); + var Final_april_total = parseFloat(april_sum); + var Final_may_total = parseFloat(may_sum); + var Final_june_total = parseFloat(june_sum); + var Final_july_total = parseFloat(july_sum); + var Final_aug_total = parseFloat(aug_sum); + var Final_sep_total = parseFloat(sep_sum); + var Final_oct_total = parseFloat(oct_sum); + var Final_nov_total = parseFloat(nov_sum); + var Final_dec_total = parseFloat(dec_sum); + var Final_jan_total = parseFloat(jan_sum); + var Final_feb_total = parseFloat(feb_sum); + var Final_mar_total = parseFloat(mar_sum); + var Final_tot = parseFloat(total_sum); // console.log(Final_jan_total); @@ -886,19 +886,19 @@ table.dataTable thead > tr > td.sorting { var api = this.api(), data; - var Final_april_total =parseInt(aprilval_sum); - var Final_may_total = parseInt(mayval_sum); - var Final_june_total = parseInt(juneval_sum); - var Final_july_total = parseInt(julyval_sum); - var Final_aug_total = parseInt(augval_sum); - var Final_sep_total = parseInt(sepval_sum); - var Final_oct_total = parseInt(octval_sum); - var Final_nov_total = parseInt(novval_sum); - var Final_dec_total = parseInt(decval_sum); - var Final_jan_total = parseInt(janval_sum); - var Final_feb_total = parseInt(febval_sum); - var Final_mar_total = parseInt(marval_sum); - var Final_tot = parseInt(totalval_sum); + var Final_april_total = parseFloat(aprilval_sum); + var Final_may_total = parseFloat(mayval_sum); + var Final_june_total = parseFloat(juneval_sum); + var Final_july_total = parseFloat(julyval_sum); + var Final_aug_total = parseFloat(augval_sum); + var Final_sep_total = parseFloat(sepval_sum); + var Final_oct_total = parseFloat(octval_sum); + var Final_nov_total = parseFloat(novval_sum); + var Final_dec_total = parseFloat(decval_sum); + var Final_jan_total = parseFloat(janval_sum); + var Final_feb_total = parseFloat(febval_sum); + var Final_mar_total = parseFloat(marval_sum); + var Final_tot = parseFloat(totalval_sum); $( api.column( 1 ).footer() ).html( Final_april_total.toFixed(2).bold() ); $( api.column( 2 ).footer() ).html( Final_may_total.toFixed(2).bold() ); diff --git a/application/views/Report_cumulative.php b/application/views/Report_cumulative.php index 9b1ec0ed..5adbf2a4 100755 --- a/application/views/Report_cumulative.php +++ b/application/views/Report_cumulative.php @@ -287,12 +287,12 @@ year_value += +y_value; } var api = this.api(), data; -var FinalTotal =parseInt(m_qsum); -var DailyFinalToatal=parseInt(d_qsum); -var DailyvalueFinalTotal=parseInt(d_valuesum); -var MonthlyValueFinal = parseInt(m_valuesum); -var yearlyFinalQty = parseInt(y_quty); -var yearlyValueFinal = parseInt(year_value); +var FinalTotal = parseFloat(m_qsum); +var DailyFinalToatal= parseFloat(d_qsum); +var DailyvalueFinalTotal= parseFloat(d_valuesum); +var MonthlyValueFinal = parseFloat(m_valuesum); +var yearlyFinalQty = parseFloat(y_quty); +var yearlyValueFinal = parseFloat(year_value); $( api.column( 2 ).footer() ).html( DailyFinalToatal.toFixed(2).bold() ); diff --git a/application/views/Report_cumulative_inward.php b/application/views/Report_cumulative_inward.php index 10d36148..d61882ee 100755 --- a/application/views/Report_cumulative_inward.php +++ b/application/views/Report_cumulative_inward.php @@ -285,12 +285,12 @@ $(document).ready(function() { year_value += +y_value; } - var DailyFinalToatal=parseInt(d_qsum); - var DailyvalueFinalTotal=parseInt(d_valuesum); - var FinalTotal =parseInt(m_qsum); - var MonthlyValueFinal = parseInt(m_valuesum); - var yearlyFinalQty = parseInt(y_quty); - var yearlyValueFinal = parseInt(year_value); + var DailyFinalToatal= parseFloat(d_qsum); + var DailyvalueFinalTotal= parseFloat(d_valuesum); + var FinalTotal = parseFloat(m_qsum); + var MonthlyValueFinal = parseFloat(m_valuesum); + var yearlyFinalQty = parseFloat(y_quty); + var yearlyValueFinal = parseFloat(year_value); var api = this.api(), data; diff --git a/application/views/Report_cumulative_raw.php b/application/views/Report_cumulative_raw.php index f5e19343..91d93ab0 100755 --- a/application/views/Report_cumulative_raw.php +++ b/application/views/Report_cumulative_raw.php @@ -290,12 +290,12 @@ $(document).ready(function() { year_value += +y_value; } var api = this.api(), data; - var FinalTotal =parseInt(m_qsum); - var DailyFinalToatal=parseInt(d_qsum); - var DailyvalueFinalTotal=parseInt(d_valuesum); - var MonthlyValueFinal = parseInt(m_valuesum); - var yearlyFinalQty = parseInt(y_quty); - var yearlyValueFinal = parseInt(year_value); + var FinalTotal = parseFloat(m_qsum); + var DailyFinalToatal= parseFloat(d_qsum); + var DailyvalueFinalTotal= parseFloat(d_valuesum); + var MonthlyValueFinal = parseFloat(m_valuesum); + var yearlyFinalQty = parseFloat(y_quty); + var yearlyValueFinal = parseFloat(year_value); $( api.column( 1 ).footer() ).html( DailyFinalToatal.toFixed(2).bold() ); $( api.column( 2 ).footer() ).html( DailyvalueFinalTotal.toFixed(2).bold() );