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

All po,store ,mrir,igr issues fixed

Browse Source
This commit is contained in:
gandhimathi 2017-08-24 15:17:05 +05:30
parent 631777c7b2
commit 14ca5217cd
21 changed files with 113 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/purchaseorder.php
View File

@ -1823,7 +1823,7 @@ function addNewImportPurchaseOrder()
$PODate = $this->getDateformat($POdt); $PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier'); $SupplierID = $this->input->post('drpSupplier');
$DeliveryAddr = $this->input->post('DeliveryAddr'); $DeliveryAddr = $this->input->post('DeliveryAddr');
$dt = $this->input->post('Deliverydt'); $dt = $this->input->post('Deliverydate');
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange'); $PoRange = $this->input->post('txtPoRange');
@ -2046,7 +2046,7 @@ function addNewImportPurchaseOrder()
$PODate = $this->getDateformat($POdt); $PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier'); $SupplierID = $this->input->post('drpSupplier');
$DeliveryAddr = $this->input->post('DeliveryAddr'); $DeliveryAddr = $this->input->post('DeliveryAddr');
$dt = $this->input->post('Deliverydt'); $dt = $this->input->post('Deliverydate');
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange'); $PoRange = $this->input->post('txtPoRange');

33
application/models/mrir_model.php
View File

@ -61,21 +61,24 @@ class mrir_model extends CI_Model
function ViewDistributionList() function ViewDistributionList()
{ {
$subQuery = 'Select distinct ReqLine.MaterialCode, MR.PONO, REQ.ReqNo,MM.MaterialName,MM.UOM, $subQuery = 'Select distinct ReqLine.MaterialCode, MR.PONO, REQ.ReqNo,MM.MaterialName,MM.UOM,
EMP.FirstName,DD.DEPCode,DD.DepartmentName,ReqLine.Quantity as RequestedQty,POL.Quantity EMP.FirstName,DD.DEPCode,DD.DepartmentName,ReqLine.Quantity as RequestedQty,POL.Quantity
as OrderedQuantity ,(MD.ActualQuantityReceived) as ActualReceivedqty,(MD.QuantityAccepted) as as OrderedQuantity ,(MD.ActualQuantityReceived) as ActualReceivedqty,(MD.QuantityAccepted) as
AcceptedQty,REQ.ReqDate, ReqLine.Status as ReqStatus, AcceptedQty,REQ.ReqDate, ReqLine.Status as ReqStatus,
st.StatusCode as ReqStatus,st.StatusName, st.StatusCode as ReqStatus,st.StatusName,
ReqLine.Remarks ReqLine.Remarks
from T_Requestion_Details ReqLine join T_PurchaseOrder_LineItem POL on ReqLine.ReqNo = POL.ReqNo from T_Requestion_Details ReqLine join T_PurchaseOrder_LineItem POL
join T_Requestion_Master REQ on REQ.ReqNo = ReqLine.ReqNo on ReqLine.ReqNo = POL.ReqNo and ReqLine.MaterialCode = POL.MaterialCode
join T_PurchaseOrder_Master POMast on POMast.PONO=POL.PONO join T_Requestion_Master REQ on REQ.ReqNo = ReqLine.ReqNo
join T_Status st on ReqLine.Status = st.StatusCode join T_PurchaseOrder_Master POMast on POMast.PONO=POL.PONO
join T_MRIR_Master MR on MR.PONO = POL.PONO join T_MRIR_Details MD join T_Status st on ReqLine.Status = st.StatusCode
on MD.MRIRNO = MR.MRIRNO and ReqLine.MaterialCode = MD.MaterialCode join T_MaterialMaster MM on join T_MRIR_Master MR on MR.PONO = POL.PONO join T_MRIR_Details MD
MM.MaterialCode = ReqLine.MaterialCode join on MD.MRIRNO = MR.MRIRNO and ReqLine.MaterialCode = MD.MaterialCode join T_MaterialMaster MM on
T_Employee_Details EMP on EMP.EmpID = REQ.Requestedby join MM.MaterialCode = ReqLine.MaterialCode join
T_DepartmentDetails DD on DD.DEPCode = EMP.Departmentcode where T_Employee_Details EMP on EMP.EmpID = REQ.Requestedby join
POL.status in (?,?) and ReqLine.Status not in(?) and POMast.status not in(?) group by ReqLine.MaterialCode ,POL.PONO'; T_DepartmentDetails DD on DD.DEPCode = EMP.Departmentcode where
POL.status in (?,?)
and ReqLine.Status not in(?) and POMast.status not in(?)
group by ReqLine.MaterialCode ,POL.PONO';
$query = $this->db->query($subQuery,array(MRIR_APPROVED,PARTIAL_MRIRAPPROVED,REQITEM_NEW,PO_AMENDED)); $query = $this->db->query($subQuery,array(MRIR_APPROVED,PARTIAL_MRIRAPPROVED,REQITEM_NEW,PO_AMENDED));
//print_r($this->db->last_query()); //print_r($this->db->last_query());
return $query->result(); return $query->result();

10
application/views/Editmaterialinspectionreport.php
View File

@ -26,25 +26,25 @@ if(!empty($MRIRDetails))
$MRIRNO = $MRIR->MRIRNO; $MRIRNO = $MRIR->MRIRNO;
$MRIRDate=$MRIR->MRIRCreatedon; $MRIRDate=$MRIR->MRIRCreatedon;
$mrir_date = strtotime( $MRIRDate ); $mrir_date = strtotime( $MRIRDate );
$mrirdate = date( 'd/m/Y', $mrir_date ); $mrirdate = date( 'd-m-Y', $mrir_date );
$MRIRRasiedbyName=$MRIR->MRIRRasiedbyName; $MRIRRasiedbyName=$MRIR->MRIRRasiedbyName;
$IGRNO = $MRIR->IGRNO; $IGRNO = $MRIR->IGRNO;
$IGRDate = $MRIR->IGRCreated; $IGRDate = $MRIR->IGRCreated;
$igr_date = strtotime( $IGRDate ); $igr_date = strtotime( $IGRDate );
$igrdate = date( 'd/m/Y', $igr_date ); $igrdate = date( 'd-m-Y', $igr_date );
$IGRRasiedbyName=$MRIR->IGRRasiedbyName; $IGRRasiedbyName=$MRIR->IGRRasiedbyName;
$PONO = $MRIR->PONO; $PONO = $MRIR->PONO;
$PODate=$MRIR->PODate; $PODate=$MRIR->PODate;
$PORasiedbyName=$MRIR->PORasiedbyName; $PORasiedbyName=$MRIR->PORasiedbyName;
$po_date = strtotime( $PODate ); $po_date = strtotime( $PODate );
$podate = date( 'd/m/Y', $po_date ); $podate = date( 'd-m-Y', $po_date );
$VehicleNo = $MRIR->VehicleNo; $VehicleNo = $MRIR->VehicleNo;
$CourierNo= $MRIR->CourierNo; $CourierNo= $MRIR->CourierNo;
$DeliveryChellanOrInvoiceNo=$MRIR->DeliveryChellanOrInvoiceNo; $DeliveryChellanOrInvoiceNo=$MRIR->DeliveryChellanOrInvoiceNo;
$SupplierName=$MRIR->SupplierName; $SupplierName=$MRIR->SupplierName;
$DeliveryChellanDate=$MRIR->DeliveryChellanDate; $DeliveryChellanDate=$MRIR->DeliveryChellanDate;
$dc_date = strtotime( $DeliveryChellanDate ); $dc_date = strtotime( $DeliveryChellanDate );
$dcdate = date( 'd/m/Y', $dc_date ); $dcdate = date( 'd-m-Y', $dc_date );
$Address=$MRIR->Address; $Address=$MRIR->Address;
//$CreatedBy=$MRIR->CreatedBy; //$CreatedBy=$MRIR->CreatedBy;
$ServiceDescription=$MRIR->ServiceDescription; $ServiceDescription=$MRIR->ServiceDescription;
@ -287,7 +287,7 @@ if(!empty($MRIRDetails))
<input type="hidden" name="<?php echo 'QuantityAccepted'.$SNo ?>" id="<?php echo 'QuantityAccepted'.$SNo ?>" /> <input type="hidden" name="<?php echo 'QuantityAccepted'.$SNo ?>" id="<?php echo 'QuantityAccepted'.$SNo ?>" />
<td><input type="text" id="<?php echo 'RejectQuantity'.$SNo;?>" name="<?php echo 'RejectQuantity'.$SNo;?>" onchange="setreject('<?php echo $SNo;?>');" value="<?php echo $record->QuantityRejected?>"></td> <td><input type="text" id="<?php echo 'RejectQuantity'.$SNo;?>" name="<?php echo 'RejectQuantity'.$SNo;?>" onchange="setreject('<?php echo $SNo;?>');" value="<?php echo $record->QuantityRejected?>"></td>
<input type="hidden" name="<?php echo 'QuantityRejected'.$SNo ?>" id="<?php echo 'QuantityRejected'.$SNo ?>" /> <input type="hidden" name="<?php echo 'QuantityRejected'.$SNo ?>" id="<?php echo 'QuantityRejected'.$SNo ?>" />
<td><input type="text" id="<?php echo 'Remark'.$SNo ?>" name="<?php echo 'Remark'.$SNo ?>" onchange="setremark('<?php echo $SNo;?>');"></td> <td><input type="text" id="<?php echo 'Remark'.$SNo ?>" name="<?php echo 'Remark'.$SNo ?>" onchange="setremark('<?php echo $SNo;?>');" value="<?php echo $record->Remarks?>"></td>
<input type="hidden" name="<?php echo 'Remarks1'.$SNo ?>" id="<?php echo 'Remarks1'.$SNo ?>" /> <input type="hidden" name="<?php echo 'Remarks1'.$SNo ?>" id="<?php echo 'Remarks1'.$SNo ?>" />
</tr> </tr>
<?php <?php

2
application/views/EditservicePurchaseorder.php
View File

@ -1811,7 +1811,7 @@ $(document).ready(function () {
if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?> if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
<a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <a class="btn btn-primary Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php }else {?> <?php }else {?>
<a class="btn btn-primary" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <?php } ?> <a class="btn btn-primary" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <?php } ?>
</div> </div>

1
application/views/MaterialIssueList.php
View File

@ -263,3 +263,4 @@
}); });
}); });
</script> </script>

10
application/views/addstorerequisitionslip.php
View File

@ -1,6 +1,6 @@
<?php <?php
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('d-m-y'); $CurrentDate = $dt->format('d-m-Y');
// print_r($cost);die(); // print_r($cost);die();
?> ?>
@ -19,7 +19,7 @@ $(function() {
$("#Date").datepicker({ $("#Date").datepicker({
// minDate : 'now', // minDate : 'now',
maxDate : 'now', maxDate : 'now',
dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
@ -137,7 +137,7 @@ $(function() {
<label>Material Code</label> <label>Material Code</label>
<div > <div >
<?php <?php
$options = array("-1"=>'Material Code'); $options = array("-1"=>'Select Material Code');
//print_r( $options); //print_r( $options);
if(!empty($MaterialList)) if(!empty($MaterialList))
@ -514,7 +514,7 @@ function openmodal()
function clear() function clear()
{ {
$('#MaterialCode').val('');
$('#Description').val(''); $('#Description').val('');
$('#UOM').val(''); $('#UOM').val('');
$('#Quantity').val(''); $('#Quantity').val('');
@ -672,7 +672,7 @@ else
else else
{ {
console.log($('.requistion').serialize());
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({

9
application/views/alterpurchaseorder.php
View File

@ -4877,7 +4877,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- <a class="btn btn-primary Save" ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> --> <!-- <a class="btn btn-primary Save" ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-primary Submit" ID="Submit" onclick="RevenueSave(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit" onclick="RevenueSave(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary"> <a class="btn btn-primary Save" ID="Cancel" href="<?php echo base_url().'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div> </div>
@ -4959,7 +4959,7 @@ function populateValueMainFormForDeleteItem(rowid)
<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" > <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" >
<a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary"> <a class="btn btn-primary Save" ID="Cancel" href="<?php echo base_url().'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div><br/> </div><br/>
</div> </div>
</div> </div>
@ -7045,8 +7045,8 @@ function calculateTotalValue()
$('#txtTotalOrderValue').val(tot); $('#txtTotalOrderValue').val(tot);
validateExceedLimit(); // validateExceedLimit();
ExceedQuantityCheck(); // ExceedQuantityCheck();
} }
$("#ScheduleType").change(function(){ $("#ScheduleType").change(function(){
@ -7166,3 +7166,4 @@ $("#PaymentMethod").change(function() {
} }
</script> </script>

10
application/views/capitalpurchaseorder.php
View File

@ -1926,7 +1926,7 @@ function vaildateBeforeOpenModal()
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div> </div>
<br/> <br/>
@ -2005,11 +2005,11 @@ function vaildateBeforeOpenModal()
$("#PODate").datepicker({ $("#PODate").datepicker({
minDate : d, minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
$("#Deliverydate").datepicker({ $("#Deliverydate").datepicker({
minDate : 'now', minDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
}); });
@ -4461,8 +4461,12 @@ $("#PaymentMethod").change(function() {
} }
function Reset(){
location.reload();
}
</script> </script>

5
application/views/createPOfromRequistion.php
View File

@ -399,13 +399,14 @@ $("#myModal").on("shown.bs.modal", function(e) {
url:"<?php echo base_url() ?>requisitionform/ViewRequest", url:"<?php echo base_url() ?>requisitionform/ViewRequest",
success:function(json) { success:function(json) {
$('#content').loader('hide'); $('#content').loader('hide');
//alert(json.Requist[0]['ReqDate']); var getAvalAmt = json.AvilBudAmount;
getAvalAmt = getAvalAmt.replace(/\,/g,'');
$("#ReqType").val(json.Requist[0]['ReqType']); $("#ReqType").val(json.Requist[0]['ReqType']);
$("#ReqBy").val(json.Requist[0]['FirstName']); $("#ReqBy").val(json.Requist[0]['FirstName']);
$("#RequistionDate").val(json.Requist[0]['ReqDate']); $("#RequistionDate").val(json.Requist[0]['ReqDate']);
$("#Desigination").val(json.Requist[0]['Designation']); $("#Desigination").val(json.Requist[0]['Designation']);
$("#CostCenter").val(json.Requist[0]['CostCenterCode']); $("#CostCenter").val(json.Requist[0]['CostCenterCode']);
$("#AvlBudgetAmount").val(json.AvilBudAmount); $("#AvlBudgetAmount").val(parseFloat(getAvalAmt).toFixed(2));
$("#tbleAppend").empty(); $("#tbleAppend").empty();
$("#tbleAppend").append(json.Items); $("#tbleAppend").append(json.Items);

17
application/views/editCapitalPo.php
View File

@ -183,6 +183,7 @@ if(!empty($AvlBudAmt))
var DelOpt = '<?php echo $DeliverOption; ?>'; var DelOpt = '<?php echo $DeliverOption; ?>';
var SchName = <?php echo json_encode($DeliverSchedule); ?>; var SchName = <?php echo json_encode($DeliverSchedule); ?>;
var DelDt = '<?php echo $Deliverydt; ?>'; var DelDt = '<?php echo $Deliverydt; ?>';
$(document).ready(function () { $(document).ready(function () {
$("#PaymentTerms").select2(); $("#PaymentTerms").select2();
@ -190,7 +191,7 @@ $(document).ready(function () {
$('#Deliverydtdiv').hide(); $('#Deliverydtdiv').hide();
$('#Schedulediv').hide(); $('#Schedulediv').hide();
$('#deliverydateby').show(); $('#deliverydateby').show();
$('#Deliverydt').val(DelDt); $('#Deliverydate').val(DelDt);
} }
else if(DelOpt=="1"){ else if(DelOpt=="1"){
@ -300,6 +301,11 @@ $("#PaymentMethod").select2();
$('#Deliverydtdiv').show(); $('#Deliverydtdiv').show();
$('#deliverydateby').hide(); $('#deliverydateby').hide();
}); });
$("#Deliverydate").datepicker({
minDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$('#Schedule').click(function () { $('#Schedule').click(function () {
//for schedule range selection //for schedule range selection
$('#Deliverydtdiv').hide(); $('#Deliverydtdiv').hide();
@ -1318,7 +1324,7 @@ $("#PaymentMethod").select2();
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<center> <label>Cost of the product Per KG</label></center> <center> <label>Cost of the product Per UOM</label></center>
<hr/> <hr/>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -1906,7 +1912,7 @@ $("#PaymentMethod").select2();
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<center> <label>Cost of the product Per KG</label></center> <center> <label>Cost of the product Per UOM</label></center>
<hr/> <hr/>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -2492,7 +2498,7 @@ $("#PaymentMethod").select2();
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<center> <label>Cost of the product Per KG</label></center> <center> <label>Cost of the product Per UOM</label></center>
<hr/> <hr/>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -2770,7 +2776,8 @@ $("#PaymentMethod").select2();
if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?> if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
<a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"/> <a class="btn btn-primary Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php }else {?> <?php }else {?>
<a class="btn btn-primary" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <?php } ?> <a class="btn btn-primary" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <?php } ?>

10
application/views/editRevenuepurchaseorder.php
View File

@ -1811,8 +1811,8 @@ function validateEditExceedLimit()
var tot = parseFloat(totvalue).toFixed(2); var tot = parseFloat(totvalue).toFixed(2);
$('#txtEditTotalOrderValue').val(tot); $('#txtEditTotalOrderValue').val(tot);
validateEditExceedLimit(); //validateEditExceedLimit();
ExceedEditQuantityCheck(); //ExceedEditQuantityCheck();
} }
function calculateEditTaxValue() function calculateEditTaxValue()
{ {
@ -3438,7 +3438,7 @@ function calculateEditTaxValue()
if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?> if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
<a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <a class="btn btn-primary Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php }else {?> <?php }else {?>
<a class="btn btn-primary" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <?php } ?> <a class="btn btn-primary" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <?php } ?>
@ -4255,8 +4255,8 @@ function calculateTotalValue()
$('#txtTotalOrderValue').val(tot); $('#txtTotalOrderValue').val(tot);
validateExceedLimit(); //validateExceedLimit();
ExceedQuantityCheck(); // ExceedQuantityCheck();
} }
function calculateTaxValue() function calculateTaxValue()
{ {

2
application/views/importpo.php
View File

@ -1790,7 +1790,7 @@ function vaildateBeforeOpenModal()
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <input type="reset" class="btn btn-primary" value="Reset" onclick="window.location.reload()">
</div> </div>
<br/> <br/>

12
application/views/purchaseorder.php
View File

@ -1917,7 +1917,7 @@ function validateEditExceedLimit()
var tot = parseFloat(totvalue).toFixed(2); var tot = parseFloat(totvalue).toFixed(2);
$('#txtEditTotalOrderValue').val(tot); $('#txtEditTotalOrderValue').val(tot);
validateEditExceedLimit(); // validateEditExceedLimit();
} }
function calculateEditTaxValue() function calculateEditTaxValue()
{ {
@ -3129,7 +3129,7 @@ function calculateEditTaxValue()
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
@ -3907,8 +3907,8 @@ function calculateTotalValue()
$('#txtTotalOrderValue').val(tot); $('#txtTotalOrderValue').val(tot);
validateExceedLimit(); //validateExceedLimit();
ExceedQuantityCheck(); //ExceedQuantityCheck();
} }
function calculateCgstTax(varBasicValue,Cgst,discount) function calculateCgstTax(varBasicValue,Cgst,discount)
@ -4002,7 +4002,11 @@ $("#PaymentTerms").change(function() {
$('#txtTotalOrderValueSummary').val(''); $('#txtTotalOrderValueSummary').val('');
} }
function Reset(){
location.reload();
}
</script> </script>

2
application/views/requisitionlisting.php
View File

@ -114,7 +114,7 @@ span.highlight {
<td><?php echo $record->StatusName ?></td> <td><?php echo $record->StatusName ?></td>
<td><?php $Pdt = new DateTime($record->CreatedDate ); <td><?php $Pdt = new DateTime($record->CreatedDate );
$PODate = $Pdt->format('Y-m-d'); $PODate = $Pdt->format('d-m-Y');
echo $PODate echo $PODate
?></td> ?></td>
<td> <a data-toggle="tooltip" href="<?php echo base_url().'EditRequisition?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?> - Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )" ><span class="glyphicon glyphicon-trash" title="<?php echo $record->ReqNo; ?> - Click here to Delete Requisition details"></span></a> </td> <td> <a data-toggle="tooltip" href="<?php echo base_url().'EditRequisition?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?> - Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )" ><span class="glyphicon glyphicon-trash" title="<?php echo $record->ReqNo; ?> - Click here to Delete Requisition details"></span></a> </td>

8
application/views/servicePurchaseorder.php
View File

@ -1390,7 +1390,7 @@ function clearEditTaxField()
<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" > <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" >
<a class="btn btn-primary Save" ID="Save"onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-primary Save" ID="Save"onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit"onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit"onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary"> <a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div><br/> </div><br/>
</div> </div>
</div> </div>
@ -2210,4 +2210,10 @@ $("#PaymentTerms").change(function() {
} }
}); });
function Reset(){
location.reload();
}
</script> </script>

21
application/views/storestatus.php
View File

@ -326,9 +326,9 @@
} echo $St ; ?></td> } echo $St ; ?></td>
<td align="right"><?php <td align="right"><?php
$dt = new DateTime($record->updatedOn ); $dt = new DateTime($record->updatedOn );
$updatedOn = $dt->format('d-m-y'); $updatedOn = $dt->format('d-m-Y');
echo $updatedOn ; ?></td> echo $updatedOn ; ?></td>
<td><?php echo $record->storeremarks ; ?> <td><?php echo $record->storeremarks ; ?>
</td> </td>
@ -371,6 +371,7 @@ $("#UOM").val('');
type:"POST", type:"POST",
url:"<?php echo base_url();?>requisitionform/getMaterialDetails", url:"<?php echo base_url();?>requisitionform/getMaterialDetails",
success:function(json) { success:function(json) {
$('#content').loader('hide'); $('#content').loader('hide');
$("#Description").val(json.MatDetail[0]['MaterialName']); $("#Description").val(json.MatDetail[0]['MaterialName']);
@ -455,6 +456,7 @@ $("#UOM").val('');
function AddStock() function AddStock()
{ {
id= $('#MaterialCode').val(); id= $('#MaterialCode').val();
if(validate()) if(validate())
{ {
@ -536,19 +538,20 @@ function cancel()
} }
function clearLineitemData() function clearLineitemData()
{ {
$('#MaterialCode').val('');
$('#Description').val(''); $('#Description').val('');
$('#UOM').val(''); $('#UOM').val('');
$('#StockAvail').val('YES');
$('#AddAvailableStock').val(''); $('#AddAvailableStock').val('');
$('#Remarks').val(''); $('#Remarks').val('');
} }
function validate() function validate()
{ {
if($("option:selected", $("#MaterialCode")).val() == '-1')
if($("option:selected", $("#MaterialCode")).val() == '-1' || $("#MaterialCode").val() == '0')
{ {
alert('Please Select MaterialCode Names'); alert('Please Select MaterialCode');
$("#MaterialCode").focus(); $("#MaterialCode").focus();
return false; return false;
} }
@ -595,8 +598,8 @@ function validate()
</script><script type="text/javascript"> </script><script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$("#MaterialCode").select2(); $("#MaterialCode").select2();
$("#StockAvail").select2(); //$("#StockAvail").select2();
$("#EditStockAvail").select2(); //$("#EditStockAvail").select2();
}); });
</script> </script>

2
application/views/viewinwardgateregister.php
View File

@ -244,7 +244,7 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
//alert(item.DeliveryChellanDate); //alert(item.DeliveryChellanDate);
var dcd = new Date(item.DeliveryChellanDate); var dcd = new Date(item.DeliveryChellanDate);
//alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear()); //alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear());
var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear()); var dcd2 = (dcd.getDate()+ '-' + (dcd.getMonth() + 1)+ '-' + dcd.getFullYear());
$("#Invoice_Date").val(dcd2); $("#Invoice_Date").val(dcd2);
$("#ser").val(item.ServiceDescription); $("#ser").val(item.ServiceDescription);