SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inward detail-report material received date changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-05-28 10:20:36 +05:30
parent 0921920911
commit fa148a7570
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/dahsboard_model.php
View File

@ -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,

1
application/views/Report_attach_inward.php
View File

@ -252,6 +252,7 @@ if(!empty($mms))
<td style="text-align:center;"><strong>Total</strong></td>
<td><strong>&nbsp</strong></td>
<td><strong>&nbsp</strong></td>
<td><strong>&nbsp</strong></td>
<td class="amount" style="text-align:right">
<strong>
<?php

6
application/views/Report_purchase_inward.php
View File

@ -229,8 +229,9 @@ table.dataTable thead > tr > td.sorting {
<thead>
<tr>
<th>PO No</th>
<th>Date</th>
<th>IGR Created Date</th>
<th>Time</th>
<th>Material Received Date</th>
<th>Material Name</th>
<th>Category</th>
<th>Supplier Name</th>
@ -273,6 +274,7 @@ table.dataTable thead > tr > td.sorting {
</span></td>
<td style="text-align:center"><span><?php echo $rel->created_date;?></span></td>
<td style="text-align:right"><span><?php echo $rel->created_time;?></span></td>
<td style="text-align:center"><span><?php echo $rel->materialrcvddate;?></span></td>
<td><span><?php echo $rel->material_name;?></span></td>
<td><span><?php echo $rel->category;?></span></td>
<td><span><?php echo $rel->supplier_name;?></span></td>
@ -334,6 +336,7 @@ table.dataTable thead > tr > td.sorting {
<td style="text-align:left"><span><?php echo $cb->AccountCode;?></span></td>
<td style="text-align:center"><span><?php echo $cb->Date;?></span></td>
<td style="text-align:right"><span><?php echo '-';?></span></td>
<td style="text-align:right"><span><?php echo '-';?></span></td>
<td><span><?php echo $cb->AccountName;?></span></td>
<td><span><?php echo $cb->type.'-'.$cb->category;?></span></td>
<td><span><?php echo $cb->Suppliername;?></span></td>
@ -386,6 +389,7 @@ table.dataTable thead > tr > td.sorting {
<td><strong>&nbsp</strong></td>
<td><strong>&nbsp</strong></td>
<td><strong>&nbsp</strong></td>
<td><strong>&nbsp</strong></td>
<td class="amount" style="text-align:right"><strong>
<?php echo $tot_qty; ?>