service po and pending po reports

This commit is contained in:
VE10-Sanjeev 2025-03-28 13:01:06 +00:00
parent d85b7058cf
commit a8ccd0137f
9 changed files with 179 additions and 204 deletions

View File

@ -984,14 +984,19 @@ class Report extends BaseController
if ($this->request->getMethod(true) === 'POST' && $this->request->getPost('btn_submit')) {
$cname = $this->request->getPost('client_name');
$data['client_name'] = $cname;
$prod = $this->request->getPost('item_name');
$data['item_name'] = $prod;
$frm = $this->request->getPost('from_date');
$data['from_date'] = $frm;
$t = $this->request->getPost('to_date');
$data['to_date'] = $t;
$m = $this->request->getPost('month');
$data['month'] = $m;
$purchaseorder_number = $this->request->getPost('purchaseorder_number');
$data['purchaseorder_number'] = $purchaseorder_number;
$ab = $this->request->getPost('financialyear');
$data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);

View File

@ -1301,8 +1301,8 @@ if (!empty($getlogpodtl)) {
</td>
<td style="text-align:left !important;"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td>
<td style="text-align:right !important;"><?php echo $record->Rate ?></td>
<td style="text-align:right !important;"><?php echo number_format($record->Rate, 2); ?></td>
<td style="text-align:right !important;"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
@ -1612,98 +1612,80 @@ if (!empty($getlogpodtl)) {
</table>
</div>
</div>--> <?php } else {} ?>
<!-- ends here -->
<div class="form-row">
<div class="form-group col-md-12 px-4">
<!-- f i l e c h o o s e n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
<?php if ($PrePOFile) { ?>
<div id="deletePreviousPurchaseOrderFileDiv">
<div class="form-group col-md-12 px-4">
<div class="col-md-12">
<label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
</div>
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
</div>
<?php } ?>
</div>
</div>
<!-- ends here -->
<div class="form-group col-md-12 px-4">
<div align="right"><br />
<div>
</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
echo $index;
} ?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<!-- /. f i l e c h o o s e n -->
<br/>
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo isset($index) ? $index : ''; ?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
</div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-5 text-left">
<label>Request On:</label> <?php echo isset($Reqon) ? $Reqon : ''; ?><br />
<?php if (!empty($RequesterName)) { ?>
<label>Request By:</label> <?php echo $RequesterName; ?><br />
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<!-- <a class="btn btn-success Save" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a> -->
<?php } ?>
</div>
</div>
<div class="form-group col-md-12 px-4">
<div align="left">
<label>Request On : </label><?php if (isset($Reqon)) {
echo $Reqon;
} ?><br />
<?php if (isset($RequesterName)) {
if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php
}
} ?>
<!-- <label>Status : </label><?php echo $StatusName; ?> -->
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($StatusName) && !empty($StatusName)) {
if (isset($statusMappings[$StatusName])) {
echo $statusMappings[$StatusName];
} else {
echo $StatusName;
}
} else {
echo "Status not provided";
}
?>
<label>Status:</label>
<?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
echo isset($StatusName) && !empty($StatusName) ? ($statusMappings[$StatusName] ?? $StatusName) : "Status not provided";
?>
</div>
<div class="col-md-7 text-right">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<!-- <a class="btn btn-success Save" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a> -->
<?php } ?>
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div>
</div> <!-- end card body-->
@ -1948,7 +1930,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a>
</div>
</form>
@ -2567,7 +2549,6 @@ if (!empty($getlogpodtl)) {
tinyMCE.triggerSave();
if (validateServiceTax()) {
// alert('inside Addservice');
var temp = parseInt(index) + 1;
var Reqnumber = $('#ReqNo').val();
var departmentName = $('#deptName').val();
@ -2656,7 +2637,7 @@ if (!empty($getlogpodtl)) {
} else {
rowHtml += `<td>-</td>`;
}
rowHtml += `<td align="right">${quantity}</td>
rowHtml += `<td align="left">${quantity}</td>
<td align="left">${uom}</td>
<td align="right">${itemRate}</td>
<td align="right">${basicval}</td>
@ -3478,7 +3459,9 @@ if (!empty($getlogpodtl)) {
$('#EditPer').val($('#per' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
$('#EditRate').val($('#itemRate' + userid).val());
RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2)
$('#EditRate').val(RateValue);
$('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val());
@ -3589,7 +3572,9 @@ if (!empty($getlogpodtl)) {
$('#ViewUOM').val($('#uom' + userid).val());
$('#ViewQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
$('#ViewRate').val($('#itemRate' + userid).val());
RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2)
$('#ViewRate').val(RateValue);
$('#txtViewBasicValue').val(cellval[8].innerHTML);
$('#ViewCgst').val($('#Cgst' + userid).val());
$('#ViewSgst').val($('#Sgst' + userid).val());

View File

@ -60,14 +60,6 @@
</div>
</div>
<?php if(isset($headline)) : if(!empty($headline)) : ?>
<div class="col-12">
<div class="page-title-right">
<span>Result filter by : </span><h4 class="page-title" style="display: inline;"><?php echo $headline; ?></h4>
</div>
</div>
<?php endif; endif; ?>
</div>
<div class="row">
<div class="col-12">
@ -87,7 +79,7 @@
<option value="">Select Supplier</option>
<?php
foreach ($cust as $item): { ?>
<option value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName; ?></option>
<option <?php if(isset($client_name) && ($client_name == $item->SupplierName)){ echo 'selected'; } ?> value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName; ?></option>
<?php }
endforeach; ?>
</select>
@ -100,7 +92,7 @@
<option value="">Select Material</option>
<?php
foreach ($material as $it): { ?>
<option value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName; ?></option>
<option <?php if(isset($item_name) && ($item_name == $it->MaterialName)){ echo 'selected'; } ?> value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName; ?></option>
<?php }
endforeach; ?>
</select>
@ -113,7 +105,7 @@
<option value="">Select Year</option>
<?php
foreach ($finyear as $item): { ?>
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
<option <?php if(isset($financialyear) && ($financialyear == $item->financial_year)){ echo 'selected'; } ?> value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
<?php }
endforeach; ?>
</select>
@ -125,18 +117,10 @@
<div class="input-group">
<select class="form-control" id="month" name="month">
<option value="">Select Month</option>
<option value="January">January</option>
<option value="February">February</option>
<option value="March">March</option>
<option value="April">April</option>
<option value="May">May</option>
<option value="June">June</option>
<option value="July">July</option>
<option value="August">August</option>
<option value="September">September</option>
<option value="October">October</option>
<option value="November">November</option>
<option value="December">December</option>
<?php $months = ["January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December"]; ?>
<?php foreach ($months as $m): { ?>
<option <?php if(isset($month) && ($month == $m)){ echo 'selected'; } ?> value="<?php echo $m; ?>"><?php echo $m; ?></option>
<?php } endforeach; ?>
</select>
</div>
</div>
@ -147,8 +131,7 @@
<?php echo 'From Date'; ?>
</label>
<div class="input-group">
<input name="from_date" id="max-date" class="form-control datepicker">
<input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($from_date)){ echo $from_date; } ?>">
</div>
</div>
<div class="col-2">
@ -156,7 +139,7 @@
<?php echo 'To Date'; ?>
</label>
<div class="input-group">
<input name="to_date" id="min-date" class="form-control datepicker">
<input type="date" class="form-control" name="to_date" id="min-date" value="<?php if(isset($to_date)){ echo $to_date; } ?>">
</div>
</div>
@ -168,7 +151,7 @@
<option value="">Select PO NO</option>
<?php
foreach ($pono as $po): { ?>
<option value="<?php echo $po->po; ?>"><?php echo $po->po.'-'.$po->type; ?></option>
<option <?php if(isset($purchaseorder_number) && ($purchaseorder_number == $po->po)){ echo 'selected'; } ?> value="<?php echo $po->po; ?>"><?php echo $po->po.'-'.$po->type; ?></option>
<?php }
endforeach; ?>
</select>

View File

@ -6719,7 +6719,6 @@ if (!empty($INRSYMBOL)) {
$('.AddService').click(function () {
tinyMCE.triggerSave();
if (validateServiceTax()) {
// alert('inside Addservice');
var temp = index;
console.log('temp = ' + temp);
var Reqnumber = $('#purpose').val();
@ -7741,7 +7740,6 @@ return;
tinyMCE.triggerSave();
if (validateEditRevenueTax()) {
//alert('inside Add');
var CostCode = $("#EditRevenueCostCenter").val();
var AvilBudget = $('#EditRevenueAvlBudAmt').val();
var editMaterialCode = $("#EditRevenueMaterialCode").val();

View File

@ -4611,7 +4611,6 @@ if (!empty($getlogpodtl)) {
tinyMCE.triggerSave();
if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) {
//alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();

View File

@ -1147,7 +1147,7 @@ foreach ($PaymentTerms as $TER) {
</td>
<td style="text-align:right !important"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td>
<td style="text-align:right !important"><?php echo $record->Rate ?></td>
<td style="text-align:right !important"><?php echo number_format($record->Rate, 2); ?></td>
<td style="text-align:right !important"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
<td style="text-align:right !important"><?php echo $record->Taxamount ?></td>
<td style="text-align:right !important"><?php echo $record->TotalValue ?></td>
@ -1353,66 +1353,52 @@ foreach ($PaymentTerms as $TER) {
</div>
<br>
<!-- Start po file changes as per edit page -->
<div class="form-row">
<div class="form-group col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
</div>
<?php if (!empty($PrePOFile)) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) { ?>
<div class="form-row">
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<!-- ends here -->
<!-- f i l e c h o o s e n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
<?php if ($PrePOFile) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) {
?>
<div class="col-md-12">
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div>
</div>
<?php }} ?>
</div>
</div>
<?php } ?>
<?php } ?>
<!-- ends here -->
<!-- for Button -->
<div class="form-row">
<div class="form-group col-md-12" align="right"><br>
<div class="btn-container" style="text-align: right;">
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<!-- /. f i l e c h o o s e n -->
<br/>
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input class="btn btn-secondary" type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Save " ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
</div>
</div>
</div>
<!-- ends Button -->
<br>
<!-- for Start -->
<div class="form-row">
<div class="form-group col-md-3">
<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
$Reqon = $Reqon->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $Reqon; ?><br />
<label>Request By :</label><?php echo $RequesterName; ?><br />
<label>Status : </label><?php
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-5 text-left">
<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
$Reqon = $Reqon->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $Reqon; ?><br />
<label>Request By :</label><?php echo $RequesterName; ?><br />
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -1430,13 +1416,20 @@ foreach ($PaymentTerms as $TER) {
echo "Status not provided";
}
?>
</div>
<div class="col-md-7 text-right">
<input class="btn btn-secondary" type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Save " ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
</div>
</div>
</div>
<!-- ends Button -->
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div>
</div>
</div>
@ -1738,7 +1731,7 @@ foreach ($PaymentTerms as $TER) {
</div>
<div class="form-row px-3">
<div class="form-group col-md-12">
<label>Service Description </label>
<label>Service Description <span class="text-danger">*</span></label>
<?php $data = array(
'name' => 'EdittxtSpcialInstruction',
'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription),
@ -1883,7 +1876,9 @@ foreach ($PaymentTerms as $TER) {
$('#EditAmendPer').val($('#per' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
$('#EditRate').val($('#itemRate' + userid).val());
RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2);
$('#EditRate').val(RateValue);
$('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val());
@ -2330,6 +2325,10 @@ foreach ($PaymentTerms as $TER) {
else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) {
$('#EditRate').focus();
return false;
} else if ($('#EdittxtSpcialInstruction').val() == '') {
alert('Please Enter the Service Description');
$('#EdittxtSpcialInstruction').focus();
return false;
} else {
return true;
}

View File

@ -3549,7 +3549,6 @@ if (!empty($INRSYMBOL)) {
$('.EditRevenue').click(function() {
tinyMCE.triggerSave();
if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) {
// alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();

View File

@ -144,10 +144,10 @@ if (!empty($Status)) {
<th class="th">Requisted Date</th>
<th class="th">Requisition No</th>
<th class="th">Requisition Type</th>
<th class="th">Tot No.OfLineItem </th>
<th class="th">Po CreatedLineItem</th>
<th class="th">Partially PoCreatedLineItem</th>
<th class="th">NewLine Item</th>
<th class="th">Total Line Items</th>
<th class="th">PO Created</th>
<th class="th">Partial PO </th>
<th class="th">New</th>
<th class="th">Status</th>
<th class="th">Action</th>
</tr>

View File

@ -672,7 +672,6 @@ if (!empty($INRSYMBOL)) {
console.log("2222222222222222");
if (validateEditServiceTax()) {
alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
@ -1153,34 +1152,38 @@ if (!empty($INRSYMBOL)) {
<br>
<div class="form-row">
<div class="form-group col-md-12">
<label for="POFile">Select Purchase Order File</label>
<input type="file" class="d-block" name="POFile" id="POFile"><br>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<br />
<div align="right" style="padding-right:10px">
<!-- f i l e c h o o s e n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<label for="POFile">Select Purchase Order File</label>
<input type="file" class="d-block" name="POFile" id="POFile"><br>
</div>
</div>
</div>
<!-- /. f i l e c h o o s e n -->
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction">
<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
<input type="hidden" name="Budget" id="Budget" />
<div class="btn-container" style="text-align: right;">
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div><!-- 7.4 btn-container div closed here -->
</div><br /><!-- 7.4 right div closed here -->
</div><!-- 7.4 row div closed here -->
</div><!-- 11 form-row div closed here -->
</div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12 text-right">
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
@ -1465,9 +1468,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row">
<div class="form-group col-md-12">
<label>Service Description </label>
<label>Service Description <span class="text-danger">*</span></label>
<?php
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
@ -1747,7 +1748,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row">
<div class="form-group col-md-12">
<label>Service Description </label>
<label>Service Description <span class="text-danger">*</span></label>
<?php
$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
@ -1901,7 +1902,6 @@ if (!empty($INRSYMBOL)) {
tinyMCE.triggerSave();
if (validateServiceTax()) {
// alert('inside Addservice');
var temp = index;
var Reqnumber = $('#ReqNo').val();
var departmentName = $('#deptName').val();
@ -2291,6 +2291,10 @@ if (!empty($INRSYMBOL)) {
} else if (ExceedBudget($('#txtBasicValue').val(), $('#AvlBudAmt').val()) == false) {
$('#Rate').focus();
return false;
} else if ($('#txtSpcialInstruction').val() == '') {
alert('Please Enter the Service Description');
$('#txtSpcialInstruction').focus();
return false;
} else {
return true;
}
@ -2328,6 +2332,10 @@ if (!empty($INRSYMBOL)) {
} else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) {
$('#EditRate').focus();
return false;
} else if ($('#EdittxtSpcialInstruction').val() == '') {
alert('Please Enter the Service Description');
$('#EdittxtSpcialInstruction').focus();
return false;
} else {
return true;
}
@ -2399,7 +2407,6 @@ if (!empty($INRSYMBOL)) {
} else {
var formData = new FormData($('.ServicePO')[0]);
$('#loader').show();
console.log("inside add service purchase order view page");
console.log(formData);