diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 5d1b9089..69a83303 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1100,12 +1100,12 @@ if (!empty($getlogpodtl)) { Requisition No Item Code Item Name - Quantity + Quantity UOM - Rate - Basic Amount - Tax Amount - Total Order Amount + Rate + Basic Amount + Tax Amount + Total Order Amount diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 0944c3bf..143b60a6 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -2225,10 +2225,10 @@ if (!empty($getlogpodtl)) { Item Description Quantity UOM - Rate - Basic Amount - Tax Amount - Total Order Amount + Rate + Basic Amount + Tax Amount + Total Order Amount diff --git a/app/Views/porelease_view.php b/app/Views/porelease_view.php index 4307bb2e..b2963c4a 100755 --- a/app/Views/porelease_view.php +++ b/app/Views/porelease_view.php @@ -150,13 +150,13 @@ if (empty($Status)) {
- +
- - - + + + @@ -206,7 +206,8 @@ if (empty($Status)) { - + ?> + - - StatusName == 'RELEASER ONHOLD' or $record->StatusName == 'AWAITING RELEASE' or $record->StatusName == 'AMENDMENT PO'){ - if ($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { - - ?> - + -
-
"; - } ?> + + - + @@ -545,6 +543,10 @@ if (empty($Status)) { \ No newline at end of file diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index bea4707d..09015242 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -2378,8 +2378,8 @@ if (!empty($INRSYMBOL)) { $('#PoTypeOptions').focus(); return false; - } else if ($('#Otherpayment').val() == '') { - alert('Please Enter the Payable Terms'); + } else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + alert('Please Enter Other Payable Terms Description'); $('#Otherpayment').focus(); return false; @@ -2441,14 +2441,21 @@ if (!empty($INRSYMBOL)) { } //If others is the payment terms to display mandatory field - $("#PaymentTerms").change(function() { - if ($('#PaymentTerms').val().trim() == 'PT08') { - $('#otheroptiondiv').show(); - } else { - $('#otheroptiondiv').hide(); - $('#Otherpayment').val(''); - } - }); + $(document).ready(function () { + $("#PaymentTerms").change(function() { + console.log("Payment terms changed."); // Check if event is triggered. + var paymentValue = $('#PaymentTerms').val().trim(); + console.log("Selected value:", paymentValue); // Check the selected value. + + if (paymentValue === 'PT08') { + $('#otheroptiondiv').show(); + } else { + $('#otheroptiondiv').hide(); + $('#Otherpayment').val(''); + } + }); +}); + function Reset() { location.reload();
PO DatePurchase Order NumberPurchase Order TypeCost Center NamePONOPO TypeCost Center Supplier Name Created By DepartmentApprover ?> + 'AWAITING APPROVE', 'AWAITING RELEASE' => 'AWAITING APPROVE', @@ -226,15 +227,12 @@ if (empty($Status)) { - ?> + + StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { ?> + - Remarks == '') { - } else { - echo $record->Remarks; - } ?> + Remarks == '') { + } else { + echo $record->Remarks; + } ?> +