diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 854cce79..95d2d60c 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -1412,7 +1412,7 @@ group by supplier_name,material_name"; 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, + $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, round(ifnull(if(POType = 'REVENUE', sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst, diff --git a/application/views/Report_attach_inward.php b/application/views/Report_attach_inward.php index e12c66de..e1975a49 100755 --- a/application/views/Report_attach_inward.php +++ b/application/views/Report_attach_inward.php @@ -252,6 +252,7 @@ if(!empty($mms)) Total     +   tr > td.sorting { PO No - Date + IGR Created Date Time + Material Received Date Material Name Category Supplier Name @@ -273,6 +274,7 @@ table.dataTable thead > tr > td.sorting { created_date;?> created_time;?> + materialrcvddate;?> material_name;?> category;?> supplier_name;?> @@ -334,6 +336,7 @@ table.dataTable thead > tr > td.sorting { AccountCode;?> Date;?> + AccountName;?> type.'-'.$cb->category;?> Suppliername;?> @@ -386,6 +389,7 @@ table.dataTable thead > tr > td.sorting {       +