SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-11-28 16:20:15 +05:30
parent ded6f7cee6
commit 43acff29e6
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
application/models/batchcard_model.php
View File

@ -1356,6 +1356,8 @@ where MaterialCode = ? and SupplierID=?';
$tdate = $search['to_date']; $tdate = $search['to_date'];
$todate = date("Y-m-d", strtotime($tdate) ); $todate = date("Y-m-d", strtotime($tdate) );
$currentyr = date("Y");
//echo $todate;die(); //echo $todate;die();
$finyear = $search['year']; $finyear = $search['year'];
@ -1417,6 +1419,20 @@ GROUP BY pq.MaterialCode
} }
else if($search['month']!='' && $startyr =='' && $endyr =='')
{
$subquery.=" left join (select StockId,pq.MaterialCode mc,
SUM((IF(pq.Transaction_type='Add',Quantity,0))-(IF(pq.Transaction_type='Reduce',Quantity,0)))
AS OpeningStock
FROM T_Material_stock_history AS pq
where date(pq.CreatedOn) < '".$currentyr.'-'.$search['month']."-01'
GROUP BY pq.MaterialCode
) as opens on opens.mc = p.MaterialCode";
}
else if($search['month']=='' && $startyr !='' && $endyr !='' ) else if($search['month']=='' && $startyr !='' && $endyr !='' )
{ {
@ -1461,10 +1477,12 @@ if($search['month']=='' && $startyr =='' && $endyr =='')
else else
{ {
// if($search['month']!='' && $startyr !='' && $endyr !='') if($search['month']!='' && $startyr =='' && $endyr =='')
// { {
// $subquery.=" where month(p.CreatedOn)= '".$search['month']."'"; $subquery.=" where date(p.CreatedOn)>= '".$currentyr.'-'.$search['month']."-01' and
// }
date(p.CreatedOn)<='".$currentyr.'-'.$search['month']."-31'";
}
if($search['month']!='' && $startyr !='' && $endyr !='') if($search['month']!='' && $startyr !='' && $endyr !='')

24
application/views/materialStockReport.php
View File

@ -307,21 +307,21 @@ $(function() {
} }
} }
else if($data2 == $curyear) // else if($data2 == $curyear)
{ // {
if($stockmonth>'3') // if($stockmonth>'3')
{ // {
$OpeningTotalStock = $ge->OpeningStock+$ge->stock; // $OpeningTotalStock = $ge->OpeningStock+$ge->stock;
//$dat ='else if if'; // //$dat ='else if if';
} // }
else // else
{ // {
$OpeningTotalStock = $ge->OpeningStock; // $OpeningTotalStock = $ge->OpeningStock;
} // }
} // }
else else
{ {