RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issues fixes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-07-11 15:00:52 +05:30
parent 91b9b5ffdc
commit 27e4508e78
17 changed files with 152 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
application/controllers/inwardgateregister.php
View File

@ -78,28 +78,12 @@ class inwardgateregister extends BaseController
$PO = $this->input->post('id');
$CreatedBy = $this->session->userdata('userId');
$ordqty ='';
$recqty ='';
$qty = $this->inwardgateregister_model->getpolineqty($PO);
$ordqty = $qty[0]->Qty;
$recqty = $qty[0]->rec;
if($ordqty == $recqty)
{
$Newstatus = array('Status'=>IGR_CREATED);
$this->inwardgateregister_model-> POLineItemsupdatestatus($PO,$Newstatus);
$Newstat = array('Status'=>IGR_CREATED);
$this->inwardgateregister_model->pomasterupdatestatus($PO,$Newstat);
}
$this->inwardgateregister_model->UpdatePOMaster($PO,$CreatedBy);
$data = $this->inwardgateregister_model->viewpurchaseorder($PO);
echo json_encode($data);
}
/**
* To upload IGR files
*/
@ -138,8 +122,7 @@ class inwardgateregister extends BaseController
*/
function addNewigr()
{
$PONO = $this->input->post('PONO');
$DeliveryChellanOrInvoiceNo = $this->input->post('InvoiceNo');
@ -185,12 +168,13 @@ class inwardgateregister extends BaseController
$igr = array();
$igr = array('PONO'=>$PONO,'VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'MaterialRcvdDate'=>$MaterialRcvdDt,'CourierNo'=>$CourierNo,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt,'file'=>$document);
//print_r($igr);
//echo"** IGR master **";
$igrM = $this->inwardgateregister_model->addigrM($igr);
$OGRStatus=IGR_CREATED;
$check_OGRPO= $this->inwardgateregister_model->update_OGR($PONO,$OGRStatus);
//$IGRNO = 'IGRNO0008';
$OGRStatus=IGR_CREATED;
$check_OGRPO= $this->inwardgateregister_model->update_OGR($PONO,$OGRStatus);
$IGRNO = '';
if(count($igrM)>0)
@ -202,6 +186,7 @@ class inwardgateregister extends BaseController
$IGRItemStatus = REQITEM_NEW;
$TotalPendingQty = '';
for ($i = 1; $i <= $RowCount; $i++)
@ -211,7 +196,11 @@ class inwardgateregister extends BaseController
$OrderedQuantity = trim($this->input->post('OrderedQuantity'.$i));
$ReceivedQty = trim($this->input->post('txtReceivedQuantity'.$i));
$PendingQty = $this->input->post('txtPendingQty'.$i);
//echo $PendingQty;
$TotalPendingQty = $TotalPendingQty + $PendingQty;
//echo $TotalPendingQty;
if(strlen($QuantityAsPerInvoice)>0 && $QuantityAsPerInvoice != '0')
{
$Remarks = $this->input->post('txtRemarks'.$i);
@ -244,7 +233,7 @@ class inwardgateregister extends BaseController
$itemvalue='';
$SupplierId='';
$polineitemvalue = $this->inwardgateregister_model->getitemvalue($PONO,$MaterialCode);
$polineitemvalue = $this->inwardgateregister_model->getitemvalue($PONO,$MaterialCode);
foreach($polineitemvalue as $it)
{
@ -273,10 +262,21 @@ class inwardgateregister extends BaseController
}
}
$this->inwardgateregister_model->UpdatePOMaster($PONO,$CreatedBy);
}
$this->inwardgateregister_model->UpdatePOMaster($PONO,$CreatedBy);
if($TotalPendingQty == 0.00){
$Newstatus = array('Status'=>IGR_CREATED);
$this->inwardgateregister_model->POLineItemsupdatestatus($PONO,$Newstatus);
$this->inwardgateregister_model->pomasterupdatestatus($PONO,$Newstatus);
}
else{ /*echo 'error' ;*/ }
echo "<script>alert('Successfully Created IGR Number:$IGRNO'); window.location.href='viewIGRDetails';</script>";
echo "<script>alert('Successfully Created IGR Number:$IGRNO'); window.location.href='viewIGRDetails';</script>";
}
/**

37
application/models/purchaseorder_model.php
View File

@ -955,24 +955,27 @@ function GetServicePurchaseOrderDetailsforPdf($PONO = '')
// This Method to get the Revenue PO Child Details for Edit the Item
function GetRevenuePurchaseOrderDetails($PONO = '')
{
{
$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,
Mat.UOM,Quantity,Per,ServiceMaterialDescription,ReceivedQuantity,Rate,
Req.Status,(Quantity *Rate) as BasicValue ,
(( AfterSGST + AfterCGST + AfterIGST )) as Taxamount ,TotalValue,Tax.*,
Req.CostCenterCode,Dept.DepartmentName
FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on Req.RequestedDept = Dept.DEPCode
where LineItem.PONO =?';
$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,Per,ServiceMaterialDescription,ReceivedQuantity,Rate,Req.Status,(Quantity *Rate) as BasicValue , (( AfterSGST + AfterCGST +
AfterIGST )) as Taxamount ,TotalValue,Tax.*,Req.CostCenterCode,Dept.DepartmentName
FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on Req.RequestedDept = Dept.DEPCode
where LineItem.PONO =?';
$query = $this->db->query($subQuery,array($PONO));
return $query->result();
}
$query = $this->db->query($subQuery,array($PONO));
return $query->result();
}
// This Method to get the Revenue PO Child Details for Edit the Item
function GetRevenuePurchaseOrderDetailsForPDF($PONO = '')

32
application/views/AmendPOlist.php
View File

@ -1,5 +1,4 @@
<!-- In this purchase order listing , datatable is used for sorting , pagination and etc.. , new design is used for table fro the theme-->
<style>
.pagination {
margin:0px !important;
@ -11,20 +10,21 @@
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<!-- <center><h3 class="box-title"> Resico Industries - Amendment Purchase Order List </h3></center> -->
<center><h3 class="box-title"><?php echo $pageTitle?></h3></center>
<!-- <center><h3 class="box-title">Resico Industries - Purchase Order List</h3></center> -->
<center><h3 class="box-title"><?php echo $pageTitle; ?></h3></center>
</div>
<div class="row">
<div class="col-xs-12">
<!-- /.box-header -->
<div class="box-body" >
<table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
<thead>
<tr style="background-color:#ad9271">
<!-- <th>#</th> -->
<th>PONO#</th>
<div class="box-body">
<table class="table table-bordered table-hover editableTable" id="example1" style="background-color:#fff;font-size:12px" >
<thead style="background-color:#ddf">
<!-- <tr style="background-color:#ad9271"> -->
<tr>
<th>PONO#</th>
<th>PO Type</th>
<th>PO Date</th>
<th>Supplier Name</th>
@ -103,18 +103,16 @@
<!-- /.content -->
</div>
<!-- /.content-wrapper -->
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
<script>
<script>
$(function () {
$.fn.dataTable.moment( 'DD-MM-YYYY' );
$('#example1').DataTable({
"paging": true,
"lengthChange": true,
"searching": true,
"ordering": true,
"info": true,
"autoWidth": false,
"aaSorting": [[ 2, "desc" ]],
"autoWidth": false
});
});
</script>

12
application/views/POlist.php
View File

@ -10,18 +10,20 @@
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<!-- <center><h3 class="box-title">Resico Industries - Purchase Order List</h3></center> -->
<center><h3 class="box-title"><?php echo $pageTitle; ?></h3></center>
</div>
<div class="row">
<div class="col-xs-12">
<!-- /.box-header -->
<div class="box-body">
<table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
<thead>
<tr style="background-color:#ad9271">
<table class="table table-bordered table-hover editableTable" id="example1" style="background-color:#fff;font-size:12px" >
<thead style="background-color:#ddf">
<!-- <tr style="background-color:#ad9271"> -->
<tr>
<th>#</th>
<th>PONO#</th>
<th>PO Type</th>

9
application/views/Report_attach_inward.php
View File

@ -26,8 +26,13 @@
.btn-success {
background-color: #5d0411;
border-color: #5d0411;
}
}
.btn-sm {background-color: #5d0411 !important;
border: 2px solid #5d0411 !important;}
/* .btn-sm:visited { background: red; }
.btn-sm:focused { background: red; }
.btn-sm:hover { background: red; }
.btn-sm:active { background: red; } */
</style>
<div class="content-wrapper">
<section class="content"><br/>

2
application/views/Report_purchase_inward.php
View File

@ -30,6 +30,8 @@
background-color: #5d0411;
border-color: #5d0411;
}
.btn-sm {background-color: #5d0411 !important;
border: 2px solid #5d0411 !important;}
th, td { white-space: nowrap; }
.dataTable > thead > tr > th[class*="sort"]:after{
content: "" !important;

2
application/views/addstorerequisitionslip.php
View File

@ -1467,7 +1467,7 @@ function validate()
$(function () {
$('#Items').DataTable({
$('#mytable').DataTable({
"paging": false,

2
application/views/approvalstorerequisitionslip.php
View File

@ -8,7 +8,7 @@
<section class="content">
<div class="box">
<div class="box-header">
<!-- <center><h3 class="box-title">Resico Industries - Store Requisition Approval List</h3></center> -->
<!--<center><h3 class="box-title">Resico Industries - Store Requisition Approval List</h3></center>-->
<center><h3 class="box-title"><?php echo $pageTitle; ?></h3></center>
</div>

24
application/views/configlisting.php
View File

@ -1,13 +1,13 @@
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<section class="content">
<div class="box">
<div class="box-header">
<!-- <center>Resico Industries - Configuration Details</center> -->
<CENTER><h3 class="box-title"><?php echo $pageTitle?></h3></CENTER>
</h1>
</section>
<section class="content">
</div>
<div class="container-fluid">
<div class="row">
<div class="col-xs-12 text-right">
<div class="form-group">
@ -55,13 +55,13 @@
}
?>
</tbody>
</table>
</div>
</div>
</section>
</div>
</table>
</div>
</div>
</div>
</div>
</section>
</div>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
<script type="text/javascript">

16
application/views/editRevenueAmendPO.php
View File

@ -45,7 +45,7 @@ foreach ($PaymentTerms as $TER)
$totBasicAmt = 0;
$totDiscountAmt = 0.0;
$totPackagingAmt = 0.0;
$totExciseAmt = 0.0;
//$totExciseAmt = 0.0;
$totVATAmt = 0.0; //FOR SGST
$totCSTAmt = 0.0;//FOR CGST
$totGSTAmt = 0.0;//FOR IGST
@ -989,9 +989,9 @@ function calculateEditTaxValue()
<section class="content">
<div style="border:2px solid #333">
<!-- <div><center><b><h2>Resico Industries - Amendment Revenue Purchase Order- <?php echo $PONO;?></h2></b></center></div> -->
<div><center><b><h2><?php echo $pageTitle. '-'.$PONO; ?></h2></b></center></div>
<div><center><b><h2><?php echo $pageTitle. '-'.$PONO; ?></h2></b></center></div>
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
@ -1519,7 +1519,7 @@ function calculateEditTaxValue()
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1055px;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<center><h4>Edit Revenue Purchase Order Line Item </h4></center>
</div>
<div align="left">
@ -1926,7 +1926,7 @@ function calculateEditTaxValue()
foreach($POItem as $record)
{
//print_r($POItem);
$index = $index + 1;
?>
<tr id="<?php echo $index ; ?>">
@ -1968,7 +1968,7 @@ function calculateEditTaxValue()
<input type="hidden" name="<?php echo 'beforePackVal'.$index ?>" id="<?php echo 'beforePackVal'.$index ?>" value="<?php echo $record->PackagingValue ; ?>" />
<input type="hidden" name="<?php echo 'AfterPackVal'.$index ?>" id="<?php echo 'AfterPackVal'.$index ?>" value="<?php echo $record->AfterPackagingValue ; ?>" />
<input type="hidden" name="<?php echo 'beforeAfterPackVal'.$index ?>" id="<?php echo 'beforeAfterPackVal'.$index ?>" value="<?php echo $record->AfterPackagingValue ; ?>" />
<input type="hidden" name="<?php echo 'VatOption'.$index ?>" id="<?php echo 'VatOption'.$index ?>" value="<?php echo $record->VatCalulatedOn ; ?>" />
<!-- <input type="hidden" name="<?php //echo 'VatOption'.$index ?>" id="<?php //echo 'VatOption'.$index ?>" value="<?php //echo $record->VatCalulatedOn ; ?>" /> -->
<input type="hidden" name="<?php echo 'VatVal'.$index ?>" id="<?php echo 'VatVal'.$index ?>" value="<?php echo $record->SGST ; ?>" /> <!-- SGST-->
<input type="hidden" name="<?php echo 'beforeVatVal'.$index ?>" id="<?php echo 'beforeVatVal'.$index ?>" value="<?php echo $record->SGST ; ?>" /><!-- SGST-->
<input type="hidden" name="<?php echo 'AfterVatVal'.$index ?>" id="<?php echo 'AfterVatVal'.$index ?>" value="<?php echo $record->AfterSGST ; ?>" /><!-- SGST-->
@ -2011,7 +2011,7 @@ function calculateEditTaxValue()
$totBasicAmt = $totBasicAmt + $record->BasicValue;
$totDiscountAmt = $totDiscountAmt + $record->AfterDiscount;
$totPackagingAmt = $totPackagingAmt + $record->AfterPackagingValue;
$totExciseAmt = $totExciseAmt + $record->AfterExciseDuty;
//$totExciseAmt = $totExciseAmt + $record->AfterExciseDuty;
$totVATAmt = $totVATAmt + $record->AfterSGST;
//$totCSTAmt = $totCSTAmt + $record->AfterCST;
$totGSTAmt = $totGSTAmt +$record->AfterCGST;

10
application/views/inwardgateregister.php
View File

@ -466,6 +466,15 @@ function validate()
value:item.PendingQty
}).appendTo('form');
// $.ajax({
// data:{PO:id},
// type:"POST",
// url:"<?php echo base_url() ?>inwardgateregister/UpdateStatus",
// success:function(data) {
// }});
if(item.PendingQty == 0.00)
{
$('#QuantityAsPerInvoice'+i).attr('readonly', 'true');
@ -474,7 +483,6 @@ function validate()
}else{
if(JSON.parse(data).length == 1 && item.PendingQty == 0){
$("#IGRLink").hide();
alert('The Order is completed!!');
}
}
});

44
application/views/serviceporeport.php
View File

@ -1,3 +1,4 @@
<?php
$color='';
$Adv='';
@ -16,29 +17,29 @@ $Adv='';
</style>
</style>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<!-- <center><h3 class="box-title"> Service Purchase Order Report</h3></center> -->
<center><h3 class="box-title"><?php echo $pageTitle; ?> Report</h3></center>
<span class="highlight">The PONO Shown In Green Colour Are Paid Advance Amount</span>
<!-- <center><h3 class="box-title">Resico Industries - Purchase Order List</h3></center> -->
<center><h3 class="box-title"><?php echo $pageTitle; ?></h3></center>
<span class="highlight">The PONO Shown In Green Colour Are Paid Advance Amount</span>
</div>
<div class="box-body">
<table id="example1" class="table table-bordered table-hover editableTable" style="font-size:11px !important;">
<thead style="background-color:#ddf">
<tr>
<!-- <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:11px !important;">
<thead>
<tr style="background-color:#ddf"> -->
<th>SNO#</th>
<div class="row">
<div class="col-xs-12">
<!-- /.box-header -->
<div class="box-body">
<table id="example1" class="table table-bordered table-hover editableTable" style="background-color:#fff;font-size:11px !important;" >
<thead style="background-color:#ddf">
<!-- <tr style="background-color:#ad9271"> -->
<tr>
<th>SNO#</th>
<th>PONO#</th>
<th>Advance Amount Paid</th>
<th>SupplierName</th>
@ -54,11 +55,10 @@ $Adv='';
<th>PO Date</th>
<th>Remarks</th>
</tr>
</tr>
</thead>
<tbody>
<?php $SNo = 0;
<tbody>
<?php $SNo = 0;
if(!empty($Billing))
@ -118,8 +118,10 @@ $Adv='';
}
}
?>
</tbody>
</table>
</tbody>
</table>
</div>
<!-- /.box-body -->
</div>

46
application/views/storerequisition.php
View File

@ -54,26 +54,21 @@ span.highlight {
<div class="content-wrapper">
<section class="content">
<div class="box">
<div class="box-header">
<CENTER><h3 class="box-title"><?php echo $pageTitle?></h3></CENTER>
</div>
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class=" container-fluid">
<div class="box-header">
<!-- <CENTER><h3 class="box-title">Resico Industries - Requisition Listing</h3></CENTER> -->
<CENTER><h3 class="box-title"><?php echo $pageTitle?></h3></CENTER>
</div>
<?php if($DraftCount > 0 ) { ?><p>
@ -199,21 +194,13 @@ span.highlight {
?>
</table>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
<script>
@ -287,8 +274,9 @@ span.highlight {
</script>
<script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
<script type="text/javascript">
$(function () {

2
application/views/storerequisitionlisting.php
View File

@ -62,7 +62,7 @@ span.highlight {
<div class="modal-content">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<!-- <center><h4> Store Requisition Number Details </h4></center> -->
<!-- <center><h4> Store Requisition Number Details </h4></center>-->
<center><h4><?php echo $PageTitle; ?></h4></center>
</div>
<div align="left">

2
application/views/viewmaterialinspectionreport.php
View File

@ -46,7 +46,7 @@
<div class="col-md-12 table-responsive !important">
<!-- <div style="overflow-x:auto;"> -->
<table id="MRIRtable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<table id="MRIRtable" class="table table-bordered table-hover" style="background-color:#fff;font-size:11px !important;" >
<thead style="background-color:#ddf">
<tr>
<th>S.No</th>

BIN
assets/dist/img/RI_logo.png vendored Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
uploads/cashbook/1.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB