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

reorder level po bug

Browse Source
This commit is contained in:
gandhimathi 2018-06-06 10:18:28 +05:30
parent 931a6c2349
commit 0372efa232
8 changed files with 245 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
application/models/cashbook_model.php
View File

@ -276,15 +276,11 @@ function bankstatement($fdate,$tdate,$fa,$aa){
} }
function clearedbalance(){ function clearedbalance(){
$sql = 'SELECT SUM(cbalancetocleared) as credit,SUM(Balancetocleared) as debit FROM T_bankreport'; $sql = 'SELECT SUM(cbalancetocleared) as credit,SUM(Balancetocleared) as debit FROM T_bankreport';
// $sql = 'SELECT SUM(Clearbalance) - SUM(CClearbalance) as creditdebit FROM T_bankreport';
$query = $this->db->query($sql);
return $query->result();
// $row = mysql_fetch_array($sql);
// $sum = $row['total'];
$query = $this->db->query($sql);
return $query->result();
// print_r($sum);
// die();
} }
@ -306,18 +302,24 @@ $query = $this->db->query($sql);
$this->db->join('T_PurchaseOrder_AdvanceRequest PUADV','POM.PONO=PUADV.PONO','left'); $this->db->join('T_PurchaseOrder_AdvanceRequest PUADV','POM.PONO=PUADV.PONO','left');
$this->db->join ('T_Bankporeport BR','BR.PONO = POM.PONO','left'); $this->db->join ('T_Bankporeport BR','BR.PONO = POM.PONO','left');
$this->db->where_in('POM.Status',[ST044,ST056]); // $this->db->where_in('POM.Status',[ST044,ST056]);
$this->db->where('POM.Paymentstatus !=','ST057'); // $this->db->where('POM.Paymentstatus !=','ST057');
//$this->db->or_where('POM.Status',ST056);
if ($fdate and $tdate != ''){
$fromdate= date("Y-m-d",strtotime($fdate));
$todate=date("Y-m-d",strtotime($tdate));
$date = "date(igr.CreatedDate) >= '".$fromdate."'
and date(igr.CreatedDate) <= '".$todate."'";
$this->db->where($date);
}
if ($Supplierid != ''){
$this->db->where('supp.SupplierID',$Supplierid);
}
$this->db->where_in('POM.Status',[ST044,ST056]);
$this->db->group_by('POM.PONO');
$this->db->where('POM.PODate BETWEEN "'. date('Y-m-d', strtotime($fdate)). '" and "'. date('Y-m-d', strtotime($tdate)).'"'); $query = $this->db->get();
$this->db->or_where('supp.SupplierID',$Supplierid); return $query->result();
$this->db->group_by('POM.PONO');
$query = $this->db->get();
return $query->result();
} }
function bankinvoice($Customer,$fdate,$tdate) function bankinvoice($Customer,$fdate,$tdate)
@ -332,10 +334,16 @@ $query = $this->db->query($sql);
//$this->db->where('iva.receivedstatus !=','ST065'); //$this->db->where('iva.receivedstatus !=','ST065');
$this->db->where('iv.invoice_status_id','2'); $this->db->where('iv.invoice_status_id','2');
$this->db->where('iv.receivedstatus !=','ST065'); $this->db->where('iv.receivedstatus !=','ST065');
if ($fdate and $tdate != ''){
$fromdate= date("Y-m-d",strtotime($fdate));
$todate=date("Y-m-d",strtotime($tdate));
$date = "date(iv.invoice_date_created) >= '".$fromdate."'
and date(iv.invoice_date_created) <= '".$todate."'";
$this->db->where($date);
}
if ($Customer != ''){
$this->db->where('ic.client_id',$Customer); $this->db->where('ic.client_id',$Customer);
$this->db->or_where('iv.invoice_date_created BETWEEN "'. date('Y-m-d', strtotime($fdate)). '" and "'. date('Y-m-d', strtotime($tdate)).'"'); }
$this->db->group_by('iva.invoice_id'); $this->db->group_by('iva.invoice_id');
//$this->db->where('inc.type','PAYMENT'); //$this->db->where('inc.type','PAYMENT');
$query = $this->db->get(); $query = $this->db->get();

93
application/views/BatchcardMaintListing.php
View File

@ -1,18 +1,29 @@
<head> <head>
<!-- <link rel="stylesheet" href=" https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> --> <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
<link rel="stylesheet" href=" https://cdn.datatables.net/buttons/1.5.1/css/buttons.dataTables.min.css">
<style> <style>
.dataTables_wrapper .dt-buttons { .dataTables_wrapper .dt-buttons {
float:none; float:none;
text-align:right; text-align:right;
margin:3px;
} }
.dataTables_filter { .dataTables_filter {
text-align: right !important; text-align: right !important;
} }
button.dt-button, div.dt-button, a.dt-button{
border: 1px solid blue;
border-radius: 2px;
background-color:orange;
color:black;
font-size:13px;
}
</style> </style>
</head> </head>
@ -76,7 +87,7 @@ text-align: right !important;
<input type="submit" class="btn btn-success" name="btn_submit" <input type="submit" class="btn btn-success" name="btn_submit"
value="View Report"> value="View Report">
</div> </div>
</div> </div>
</form> </form>
@ -91,7 +102,7 @@ text-align: right !important;
<div class="col-xs-12 col-md-12"> <div class="col-xs-12 col-md-12">
<table id="mnttable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" > <table id="mnttable" class="table table-hover table-bordered" width="100%" style="background-color:#fff;font-size:12px;" >
<thead style="background-color:#ddf"> <thead style="background-color:#ddf">
<tr> <tr>
<th colspan="4"><center>Maintenance Details</center></th> <th colspan="4"><center>Maintenance Details</center></th>
@ -120,6 +131,7 @@ text-align: right !important;
{ {
//, Type, , , , , , , //, Type, , , , , , ,
?> ?>
<tr>
<td><?php if($ml->Type == 0){ echo "MAINTENANCES"; }else{echo "BREAKDOWN";} ?></td> <td><?php if($ml->Type == 0){ echo "MAINTENANCES"; }else{echo "BREAKDOWN";} ?></td>
<!-- <td><?php echo $ml->Maint_Date ?></td> <!-- <td><?php echo $ml->Maint_Date ?></td>
@ -140,39 +152,48 @@ text-align: right !important;
?> ?>
</tbody> </tbody>
</table> </table>
</div>
</div>
</div>
</div> </form>
</div> </div>
</div>
</div>
</form> </section>
</div>
</section>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(document).ready(function() {
table = $('#mnttable').DataTable( {
$('#mnttable').DataTable({ "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
dom: 'lBfrtip', "<'row'<'col-md-6'><'col-md-6'>>" +
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
buttons: [ buttons: [
'pdf'
],
"paging": true,
"lengthChange": true,
"searching": true,
"ordering": true,
"info": true,
"autoWidth": true,
{
extend: 'pdf',
customize: function(doc) {
doc.content[1].margin = [ -25, 0, -25, 0 ] //left, top, right, bottom
},
}); text: 'Save pdf',
}); // footer: 'true',
// messageTop: $('h3').text(),
title: 'Maintenance/Breakdown Report',
exportOptions: {
columns: ':visible'
}
},
// 'colvis'
]
} );
} );
</script> </script>
<script> <script>
@ -215,13 +236,9 @@ $( function() {
} }
} ); } );
</script> </script>
<!-- <!-- <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
<script src=" https://code.jquery.com/jquery-3.3.1.js"></script> --> <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
<!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> --> <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.5.1/js/dataTables.buttons.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.5.1/js/buttons.flash.min.js"></script> --> <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.5.1/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.5.1/js/buttons.print.min.js"></script>

6
application/views/bankdebit.php
View File

@ -130,7 +130,7 @@ foreach($financialyear as $item)
<th>Supplier Name</th> <th>Supplier Name</th>
<th>Total PO Amount (&#8377;)</th> <th>Total PO Amount (&#8377;)</th>
<th>Balance payable (&#8377;)</th> <th>Balance payable (&#8377;)</th>
<th>Balance Paid (&#8377;)</th> <th>Amount Paid (&#8377;)</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -218,6 +218,8 @@ foreach($financialyear as $item)
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -241,7 +243,7 @@ foreach($financialyear as $item)
$('#bankid').val(bid); $('#bankid').val(bid);
document.getElementById("bid").innerHTML='Payment ID:' +bid; document.getElementById("bid").innerHTML='Payment ID:' +bid;
});/** foreach closed */ });/** foreach closed */
$.fn.dataTable.moment( 'DD-MM-YYYY' );
table = $('#req').DataTable( { table = $('#req').DataTable( {
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
"<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-6'><'col-md-6'>>" +

4
application/views/bankinvoice.php
View File

@ -229,6 +229,8 @@ foreach($financialyear as $item)
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -250,7 +252,7 @@ foreach($financialyear as $item)
document.getElementById("bid").innerHTML='Payment ID:' +bid; document.getElementById("bid").innerHTML='Payment ID:' +bid;
});/** foreach closed */ });/** foreach closed */
$.fn.datatable.moment('DD-MM-YYYY');
table = $('#req').DataTable( { table = $('#req').DataTable( {
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
"<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-6'><'col-md-6'>>" +

178
application/views/bankstatement.php
View File

@ -32,20 +32,13 @@ $finyear = $item->financial_year;
<!--<div class="row">
<div class="col-md-12">
<div id="container"></div>
</div>
</div>-->
<div class="content-wrapper"> <div class="content-wrapper">
<section class="content" style="font-size: 12px;"> <section class="content" style="font-size: 12px;">
<div id="content"></div> <div id="content"></div>
<!-- Left col -->
<!-- <div class="col-md-12"> -->
<!-- TABLE: LATEST ORDERS --> <!-- TABLE: LATEST ORDERS -->
<div class="box box-info"> <div class="box box-info">
<!--<div class="box-header with-border">--> <!--<div class="box-header with-border">-->
@ -63,8 +56,8 @@ $finyear = $item->financial_year;
// echo form_open($this->config->base_url().'/cashbook/bankdebitdata/',$attributes); ?> // echo form_open($this->config->base_url().'/cashbook/bankdebitdata/',$attributes); ?>
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>"> <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
<div class="row">
<div class="modal" id="myModal" role="dialog"> <div class="modal" id="myModaldebit" role="dialog">
<div class="modal-dialog modal-sm"> <div class="modal-dialog modal-sm">
<!-- Modal content--> <!-- Modal content-->
@ -76,15 +69,19 @@ $finyear = $item->financial_year;
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"> <div class="col-md-12">
<select name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" title="Select Your Option"> <div title="Select Your Option">
<option value="-1" style="color:#FFF;">Select Option</option> <!-- <option value="-1" style="color:#FFF;">Select Option</option>
<option value="1">Sales Receipts</option> <option value="1">Sales Receipts</option>
<option value="2">Purchase Payments</option> <option value="2">Purchase Payments</option>
<option value="3">Income/Expense</option> <option value="3">Income/Expense</option> -->
<!-- <input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="1"> <label for="contactChoice2">Sales Receipts</label><br>-->
<input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="2"> <label for="contactChoice2">Purchase Payments</label><br>
<input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="3"> <label for="contactChoice2">Income/Expense</label><br>
</select> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<input type="hidden" name="Rowid" id="Rowid"> <input type="hidden" name="Rowid" id="Rowid">
@ -98,7 +95,7 @@ $finyear = $item->financial_year;
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" id="myCheckBoxCancel" class="btn btn-default" data-dismiss="modal">Close</button> <button type="button" id="myCheckBoxCanceldebit" class="btn btn-default" data-dismiss="modal">Close</button>
</div> </div>
</div> </div>
@ -107,6 +104,63 @@ $finyear = $item->financial_year;
</div> </div>
<div class="row">
<div class="modal" id="myModalcredit" role="dialog">
<div class="modal-dialog modal-sm">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<!-- <button type="button" class="close" data-dismiss="modal">&times;</button> -->
</div>
<div class="modal-body">
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<div title="Select Your Option">
<!-- <option value="-1" style="color:#FFF;">Select Option</option>
<option value="1">Sales Receipts</option>
<option value="2">Purchase Payments</option>
<option value="3">Income/Expense</option> -->
<input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="1"> <label for="contactChoice2">Sales Receipts</label><br>
<!--<input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="2"> <label for="contactChoice2">Purchase Payments</label><br>-->
<input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="3"> <label for="contactChoice2">Income/Expense</label><br>
</div>
</div>
<div class="col-md-2">
<input type="hidden" name="Rowid" id="Rowid">
</div>
<div class="col-md-2">
<input type="hidden" id="addvalue" name="addvalue">
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" id="myCheckBoxCancelcredit" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-2"> <div class="col-md-2">
@ -168,7 +222,7 @@ $finyear = $item->financial_year;
value="View Report"> value="View Report">
</div> </div>
</div>
</form> </form>
@ -292,7 +346,8 @@ $finyear = $item->financial_year;
<td align="left"><span><?php echo $t->Status?></span></td> <!-- <td align="left"><span><?php echo $t->Status?></span></td> -->
<td align="left" id="dsta<?php echo $i ?>"><span><?php echo $t->Status?></span></td>
@ -309,8 +364,9 @@ $finyear = $item->financial_year;
<td align="left" id="credited<?php echo $i ?>"><span><?php echo ($t->Credit)-($t->cclearbalance);?></span></td> <td align="left" id="credited<?php echo $i ?>"><span><?php echo ($t->Credit)-($t->cclearbalance);?></span></td>
<td align="left" id="csta<?php echo $i ?>"><span><?php echo $t->cstatus?></span></td>
<td><?php echo $t->cstatus;?></td> <!-- <td><?php echo $t->cstatus;?></td> -->
<td><?php echo $t->Balance;?></td> <td><?php echo $t->Balance;?></td>
@ -335,6 +391,7 @@ $finyear = $item->financial_year;
<input type="hidden" name="bankid1" id="bankid1"> <input type="hidden" name="bankid1" id="bankid1">
</div> </div>
</div> </div>
</div>
</section> </section>
</div> </div>
@ -368,39 +425,66 @@ var tcpaid='';
// } // }
function checkamount(type,ide) function checkamount(type,ide)
{ {
//alert(type);
//$('#addvalue').val('0.00'); //$('#addvalue').val('0.00');
// alert(ide); // alert(ide);
globalModelValue = ide; globalModelValue = ide;
// var val = '#checkboxcheckbox'+globalModelValue;
var checkInput = document.getElementById("checkboxcheckbox"+ide); var checkInput = document.getElementById("checkboxcheckbox"+ide);
// console.log(checkInput.id);
// $('#checkboxcheckbox'+ide).on('change', function () {
if ($(checkInput).is(':checked')) { var id=$('#dsta'+ide).text();
$("#myModal").modal({ var idc=$('#csta'+ide).text();
if ($(checkInput).is(':checked'))
{
if(type==1 && id!= "CLOSE" )
{
//alert(type)
//alert("debit");
$("#myModaldebit").modal({
backdrop: 'static', backdrop: 'static',
eyboard: false eyboard: false
}); });
}
else if(type==0 && idc!= "CLOSE")
{
//alert(type)
//alert("credit");
$("#myModalcredit").modal({
backdrop: 'static',
eyboard: false
});
}
else
{
// alert('status is ddd closed');
}
} }
// });
// $('#myCheckBoxCancel').click(function() { $('#myCheckBoxCanceldebit').click(function() {
// $('#checkboxcheckbox'+globalModelValue).attr('checked', false);
// });
$('#myCheckBoxCancel').click(function() {
overalltype = undefined; //overalltype = undefined;
$('#checkboxcheckbox'+globalModelValue).attr('checked', false);
location.reload();
});
$('#myCheckBoxCancelcredit').click(function() {
//overalltype = undefined;
$('#checkboxcheckbox'+globalModelValue).attr('checked', false); $('#checkboxcheckbox'+globalModelValue).attr('checked', false);
location.reload(); location.reload();
}); });
var value=ide; var value=ide;
//alert('row id'+value); //alert('row id'+value);
i1=value; i1=value;
//alert(i1)
type2= type; type2= type;
amounttype=type2; amounttype=type2;
//alert(amounttype);
//alert('Type of row'+type2+'-'+amounttype);
var totalpaid= document.getElementById("totalpaid"+value).innerText; var totalpaid= document.getElementById("totalpaid"+value).innerText;
tpaid=totalpaid; tpaid=totalpaid;
//alert('Paid Amount'+tpaid); //alert('Paid Amount'+tpaid);
@ -442,14 +526,7 @@ if (x==true)
total=parseFloat(debit)+parseFloat(total); total=parseFloat(debit)+parseFloat(total);
$('#addvalue').val(parseFloat(total).toFixed(2)); $('#addvalue').val(parseFloat(total).toFixed(2));
}); });
//tot11=0;
//tot11=parseFloat(tot11);
//alert('tot11'+tot11);
//tot11=parseFloat(tot11)+parseFloat(debit)
//alert('afetr add tot11'+tot11);
//alert(tot11+'checkvalue');
//$('#addvalue').val(parseFloat(tot11));
if(debit==0) if(debit==0)
{ {
alert('status is closed'); alert('status is closed');
@ -461,12 +538,9 @@ if (x==true)
overalltype = 0; overalltype = 0;
var id=document.getElementById ("bankid"+value).innerText; var id=document.getElementById ("bankid"+value).innerText;
//alert('value of current row id'+value);
// var amount=document.getElementById ("credited"+value).innerText;
// alert(amount+'rk');
var tempid = "credited"+value; var tempid = "credited"+value;
// alert(tempid+'creditlatest');
//alert('Tempid ='+tempid)
var credit=parseFloat(document.getElementById(tempid).innerText); var credit=parseFloat(document.getElementById(tempid).innerText);
//alert(credit+'credit'); //alert(credit+'credit');
credit1=credit; credit1=credit;
@ -481,18 +555,12 @@ if (x==true)
var bankidc=credited[0]; var bankidc=credited[0];
var creditc=credited[1]; var creditc=credited[1];
// alert(creditc+'if');
totalcredit=parseFloat(creditc)+parseFloat(totalcredit); totalcredit=parseFloat(creditc)+parseFloat(totalcredit);
// alert(totalc+'add');
$('#addvalue').val(parseFloat(totalcredit).toFixed(2)); $('#addvalue').val(parseFloat(totalcredit).toFixed(2));
}); });
// tot11=parseFloat(tot11);
// tot11=0;
// //alert('tot11-'+tot11);
// tot11=parseFloat(tot11)+parseFloat(credit)
// //alert('afetr add tot11-'+tot11);
// $('#addvalue').val(tot11);
} }
@ -563,11 +631,6 @@ if (x==true)
} }
//$('#addvalue').val('');
//$('#addvalue').val('0.00');
// $('#addvalue').val(parseFloat(afterdeltot).toFixed(2));
} }
} }
@ -576,7 +639,6 @@ if (x==true)
function checkscreen() function checkscreen()
{ {

10
application/views/editOldRawmaterial.php
View File

@ -61,8 +61,16 @@ if(!empty($currentstock))
} }
} }
?> ?>
<?php
if($currentstock <= $reorder){
echo '<script type="text/javascript">alert("Current Stock Low ");</script>';
}
?>
<script> <script>

16
application/views/includes/header.php
View File

@ -121,9 +121,9 @@ $(function() {
height: 600px; height: 600px;
overflow: auto; overflow: auto;
} }
::-webkit-scrollbar { /* ::-webkit-scrollbar {
display: none; display: none;
} } */
</style> </style>
@ -1892,11 +1892,13 @@ else{
<?php }?> <?php }?>
<?php } <?php }
else{?>
else{?>
<?php $check =0;?>
<?php foreach($DepAccesslist as $dep){ <?php foreach($DepAccesslist as $dep){
$assd= $dep->AssDep;?> $assd= $dep->AssDep;?>
<?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){?> <?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){$check = $check+1;?>
<li class="treeview"> <li class="treeview">
<a href="<?php echo base_url(); ?>reports"> <a href="<?php echo base_url(); ?>reports">
<i class="fa fa-dashboard"></i> <span>ReportList</span> <i class="fa fa-dashboard"></i> <span>ReportList</span>
@ -1905,7 +1907,7 @@ else{
<?php }?> <?php }?>
<?php }?> <?php if($check ==1){break;} }?>
<?php }?> <?php }?>
@ -1927,7 +1929,7 @@ else{
<li> <li>
<a href="<?php echo base_url(); ?>attendance"> <a href="<?php echo base_url(); ?>attendance">
<i class="fa fa-refresh fa-spin "></i> <i class="fa fa-clock-o "></i>
<span>Monthly Attendance</span> <span>Monthly Attendance</span>
</a> </a>
</li> </li>
@ -1959,7 +1961,7 @@ else{
<ul class="treeview-menu"> <ul class="treeview-menu">
<li> <li>
<a href="<?php echo base_url(); ?>attendance"> <a href="<?php echo base_url(); ?>attendance">
<i class="fa fa-refresh fa-spin "></i> <i class="fa fa-clock-o "></i>
<span>Monthly Attendance</span> <span>Monthly Attendance</span>
</a> </a>
</li> </li>

1
application/views/materialadjustment.php
View File

@ -282,6 +282,7 @@ $('.getdetails').click(function()
addqty = obj.Addqty; addqty = obj.Addqty;
reduceqty = obj.ReduceQty; reduceqty = obj.ReduceQty;
if(addqty == null) if(addqty == null)
{ {
adjustQty =0; adjustQty =0;