diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 0aef6fa8..76e8a74e 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -1903,32 +1903,32 @@ if ($cname!= ''){ function ireport_consolidate($cname,$fa,$aa){ - $sql="select sid,mid,supplier_name,material_name, -SUM(IF(month(dat) = 4, quantity, 0)) AS April, -SUM(IF(month(dat) = 5, quantity, 0)) AS May, -SUM(IF(month(dat) = 6, quantity, 0)) AS June, -SUM(IF(month(dat) = 7, quantity, 0)) AS July, -SUM(IF(month(dat) = 8, quantity, 0)) AS August, -SUM(IF(month(dat) = 9, quantity, 0)) AS September, -SUM(IF(month(dat) = 10, quantity, 0)) AS October, -SUM(IF(month(dat) = 11, quantity, 0)) AS November, -SUM(IF(month(dat) = 12, quantity, 0)) AS December, -SUM(IF(month(dat) = 1, quantity, 0)) AS January, -SUM(IF(month(dat) = 2, quantity, 0)) AS February, -SUM(IF(month(dat) = 3, quantity, 0)) AS March, + $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(dat) = 4, value, 0)) AS vApril, -SUM(IF(month(dat) = 5, value, 0)) AS vMay, -SUM(IF(month(dat) = 6, value, 0)) AS vJune, -SUM(IF(month(dat) = 7, value, 0)) AS vJuly, -SUM(IF(month(dat) = 8, value, 0)) AS vAugust, -SUM(IF(month(dat) = 9, value, 0)) AS vSeptember, -SUM(IF(month(dat) = 10, value, 0)) AS vOctober, -SUM(IF(month(dat) = 11, value, 0)) AS vNovember, -SUM(IF(month(dat) = 12, value, 0)) AS vDecember, -SUM(IF(month(dat) = 1, value, 0)) AS vJanuary, -SUM(IF(month(dat) = 2, value, 0)) AS vFebruary, -SUM(IF(month(dat) = 3, value, 0)) AS vMarch, +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' "; @@ -2137,31 +2137,31 @@ group by supplier_name,material_name"; $sql="select sid,mid,category,supplier_name,material_name, -SUM(IF(month(dat) = 4, quantity, 0)) AS April, -SUM(IF(month(dat) = 5, quantity, 0)) AS May, -SUM(IF(month(dat) = 6, quantity, 0)) AS June, -SUM(IF(month(dat) = 7, quantity, 0)) AS July, -SUM(IF(month(dat) = 8, quantity, 0)) AS August, -SUM(IF(month(dat) = 9, quantity, 0)) AS September, -SUM(IF(month(dat) = 10, quantity, 0)) AS October, -SUM(IF(month(dat) = 11, quantity, 0)) AS November, -SUM(IF(month(dat) = 12, quantity, 0)) AS December, -SUM(IF(month(dat) = 1, quantity, 0)) AS January, -SUM(IF(month(dat) = 2, quantity, 0)) AS February, -SUM(IF(month(dat) = 3, quantity, 0)) AS March, +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(dat) = 4, value, 0)) AS vApril, -SUM(IF(month(dat) = 5, value, 0)) AS vMay, -SUM(IF(month(dat) = 6, value, 0)) AS vJune, -SUM(IF(month(dat) = 7, value, 0)) AS vJuly, -SUM(IF(month(dat) = 8, value, 0)) AS vAugust, -SUM(IF(month(dat) = 9, value, 0)) AS vSeptember, -SUM(IF(month(dat) = 10, value, 0)) AS vOctober, -SUM(IF(month(dat) = 11, value, 0)) AS vNovember, -SUM(IF(month(dat) = 12, value, 0)) AS vDecember, -SUM(IF(month(dat) = 1, value, 0)) AS vJanuary, -SUM(IF(month(dat) = 2, value, 0)) AS vFebruary, -SUM(IF(month(dat) = 3, value, 0)) AS vMarch, +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' "; diff --git a/application/views/Report_cumulative_month_inward.php b/application/views/Report_cumulative_month_inward.php index 9f0179ea..cfc4d6d7 100755 --- a/application/views/Report_cumulative_month_inward.php +++ b/application/views/Report_cumulative_month_inward.php @@ -68,7 +68,7 @@ ?>