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

Amend PO calculation I,R,S po types : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-03-14 06:30:29 +00:00
parent c98944e4a2
commit 150ccfc146
7 changed files with 78 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Controllers/Amendmentpurchaseorder.php
View File

@ -292,6 +292,8 @@ class Amendmentpurchaseorder extends BaseController
$POStatus = $this->request->getPost('txtStatus'); $POStatus = $this->request->getPost('txtStatus');
$updatedBy = $this->session->get('userId'); $updatedBy = $this->session->get('userId');
$RowCount = $this->request->getPost('txtRowCount'); $RowCount = $this->request->getPost('txtRowCount');
$BudgetType = $this->request->getPost('Budget');
$updateddt = get_current_date_time(); $updateddt = get_current_date_time();
$qtycheck = $this->purchaseorder_model->getqtycheck($PONO); $qtycheck = $this->purchaseorder_model->getqtycheck($PONO);
@ -308,8 +310,7 @@ class Amendmentpurchaseorder extends BaseController
$Otherpayment = ''; $Otherpayment = '';
} }
$AmendmentNewPoNo = generate_amendment_po_number($PONO); $AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $Local_Interstate, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult,'CapitalRange' => $Local_Interstate,'BudgetType' => $BudgetType); // not
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $Local_Interstate, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile'); $PrePOFile = $this->request->getPost('PrePOFile');
@ -551,7 +552,7 @@ class Amendmentpurchaseorder extends BaseController
if($itemRate != 0){ if($itemRate != 0){
$this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); }
$POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'ReceivedQuantity' => $RecQtyvalue, 'Quantity' => $Quantity, 'Per' => $per, 'ServiceMaterialDescription' => $servicematerialdescription, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter, 'ServiceFrequency' => $ServiceFrequency, 'AmendedDetails' => $CAD); $POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'ReceivedQuantity' => $RecQtyvalue, 'Quantity' => $Quantity, 'Per' => $per, 'ServiceMaterialDescription' => $servicematerialdescription, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter, 'ServiceFrequency' => $ServiceFrequency, 'AmendedDetails' => $CAD,'LineitemAuditorNotes'=>$LineitemAuditorNotes);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
@ -597,6 +598,7 @@ class Amendmentpurchaseorder extends BaseController
*/ */
function UpdateAmendServicePurchaseOrder() function UpdateAmendServicePurchaseOrder()
{ {
// dd($this->request->getPost()); // dd($this->request->getPost());
$PONO = $this->request->getPost('txtPONO'); $PONO = $this->request->getPost('txtPONO');
@ -1316,6 +1318,8 @@ class Amendmentpurchaseorder extends BaseController
*/ */
function EditAmendImportPO() function EditAmendImportPO()
{ {
// echo "<pre>"; print_r($this->request->getPost()); echo"</pre>";
$MAD = ''; $MAD = '';
$PONO = $this->request->getPost('txtPONO'); $PONO = $this->request->getPost('txtPONO');
@ -1440,7 +1444,7 @@ class Amendmentpurchaseorder extends BaseController
if (count($LastPO) > 0) { if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO']; $NewPO = $LastPO[0]['PONO'];
} }
if( $changeStatus == "ST026" || $changeStatus == "ST014"){ if( $changeStatus == "ST026" || $changeStatus == "ST014"){
$PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
@ -1662,8 +1666,9 @@ class Amendmentpurchaseorder extends BaseController
if (count($POLineItem) > 0) { if (count($POLineItem) > 0) {
$LineItemNo = $POLineItem[0]['LineItemNo']; $LineItemNo = $POLineItem[0]['LineItemNo'];
} }
$ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NoOfTrip, 'FreightValue' => $Freightrate, 'AfterFreightValue' => $Freightamount, 'AssessableValue' => $Assable, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge,'LineitemAuditorNotes' => $LineitemAuditorNotes); $ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NoOfTrip, 'FreightValue' => $Freightrate, 'AfterFreightValue' => $Freightamount, 'AssessableValue' => $Assable, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge);
$ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList); $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
} }

8
app/Views/EditservicePurchaseorder.php
View File

@ -1453,7 +1453,9 @@ if (!empty($getlogpodtl)) {
<label>Description Of Service <span class="text-danger">*</label> <label>Description Of Service <span class="text-danger">*</label>
<?php <?php
$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $DescriptionOfPo = html_entity_decode($DescriptionOfPo);
$DescriptionOfPo = strip_tags($DescriptionOfPo);
$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', $DescriptionOfPo), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); echo form_textarea($data);
?> ?>
@ -1467,7 +1469,9 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Scope Of Work</label> <label>Scope Of Work</label>
<?php <?php
$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); $ServiceDescription = html_entity_decode($ServiceDescription);
$ServiceDescription = strip_tags($ServiceDescription);
$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', $ServiceDescription), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data); echo form_textarea($data);
?> ?>
</div> </div>

8
app/Views/editImportAmendPO.php
View File

@ -2793,10 +2793,10 @@ if (!empty($RequistionDetails)) {
var cellval = tr.cells; var cellval = tr.cells;
cellval[3].innerHTML = editQuantity; cellval[4].innerHTML = editQuantity;
cellval[4].innerHTML = editUOM; cellval[5].innerHTML = editUOM;
cellval[5].innerHTML = itemRate; cellval[6].innerHTML = itemRate;
cellval[6].innerHTML = BasicValue; cellval[7].innerHTML = BasicValue;
$('#materialCode' + userid).val(editMaterialCode); $('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(edititemname); $('#materialName' + userid).val(edititemname);

62
app/Views/editRevenueAmendPO.php
View File

@ -143,7 +143,6 @@ if (!empty($POMaster)) {
$POStatus = $Req->StatusName; $POStatus = $Req->StatusName;
$PONO = $Req->PONO; $PONO = $Req->PONO;
$taxrange = $Req->PORange; $taxrange = $Req->PORange;
//echo $taxrange . "t";
$ServiceDescription = $Req->ServiceDescription; $ServiceDescription = $Req->ServiceDescription;
$modeofshipment = $Req->Mode_Of_Shipment; $modeofshipment = $Req->Mode_Of_Shipment;
$supplierref = $Req->Supplier_Reference; $supplierref = $Req->Supplier_Reference;
@ -1670,6 +1669,7 @@ if (!empty($INRSYMBOL)) {
value="<?php echo $RowCount; ?>" /> value="<?php echo $RowCount; ?>" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<input type="button" class="btn btn-secondary" value="Cancel" <input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';"> onClick="window.location ='amendmentpurchaseorder';">
@ -2074,30 +2074,31 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-row" id="IGSTModel" style="display:none;">
<div class="form-group col-md-6"></div> <div id="IGSTModel" style="display:none;">
<div class="form-group col-md-3"> <div class="form-row">
<label>IGST in %</label> <div class="form-group col-md-3 offset-md-6">
<div> <label>IGST in %</label>
<?php <div>
$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;'); <?php
echo form_input($data); $data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
?> echo form_input($data);
?>
</div>
</div> </div>
</div> <div class="form-group col-md-3">
<div class="form-group col-md-3"> <label>IGST Amt <?php echo "($INRSYM)" ?></label>
<label>IGST Amt <?php echo "($INRSYM)" ?></label> <div>
<div> <?php
<?php $data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data);
echo form_input($data); ?>
?> </div>
</div> </div>
</div>
</div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-9"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -2345,7 +2346,7 @@ if (!empty($INRSYMBOL)) {
$('#EditRate').val($('#itemRate' + userid).val()); $('#EditRate').val($('#itemRate' + userid).val());
$('#txtEditBasicValue').val(parseFloat(cellval[6].innerHTML).toFixed(2)); $('#txtEditBasicValue').val(parseFloat(cellval[7].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val(); RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val()); $('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val()); $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -2463,14 +2464,15 @@ if (!empty($INRSYMBOL)) {
var tr = document.getElementById(userid); var tr = document.getElementById(userid);
var cellval = tr.cells; var cellval = tr.cells;
var shorten = editDescription.length > 13 ? editDescription.slice(0, 13) + "..." : editDescription;
cellval[2].innerHTML = shorten;
cellval[2].innerHTML = editDescription; cellval[4].innerHTML = parseFloat(editQuantity).toFixed(2);
cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2); cellval[5].innerHTML = editUOM;
cellval[4].innerHTML = editUOM; cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[5].innerHTML = parseFloat(itemRate).toFixed(2); cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
cellval[6].innerHTML = parseFloat(basicval).toFixed(2); cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2); cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode); $('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription); $('#materialName' + userid).val(editDescription);

6
app/Views/editRevenuepurchaseorder.php
View File

@ -2958,7 +2958,7 @@ if (!empty($getlogpodtl)) {
<?php } ?> <?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span <a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Submit</span></a> class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Submit" <a class="btn btn-success Save" ID="Submit"
onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a> onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?> <?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span <a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span
@ -5497,7 +5497,7 @@ if (!empty($getlogpodtl)) {
} else { } else {
$('#EditPer').val($('#per' + userid).val()); $('#EditPer').val($('#per' + userid).val());
} }
$('#txtEditBasicValue').val(cellval[7].innerHTML); $('#txtEditBasicValue').val(parseFloat(cellval[8].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val(); RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val()); $('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val()); $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -5599,7 +5599,7 @@ if (!empty($getlogpodtl)) {
$('#ViewQuantity').val($('#quantity' + userid).val()); $('#ViewQuantity').val($('#quantity' + userid).val());
$('#ViewRate').val($('#itemRate' + userid).val()); $('#ViewRate').val($('#itemRate' + userid).val());
$('#ViewPer').val($('#per' + userid).val()); $('#ViewPer').val($('#per' + userid).val());
$('#txtViewBasicValue').val(cellval[7].innerHTML); $('#txtViewBasicValue').val(parseFloat(cellval[8].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val(); RequistQuantity = $('#quantity' + userid).val();
$('#txtViewDiscount').val($('#DisVal' + userid).val()); $('#txtViewDiscount').val($('#DisVal' + userid).val());
$('#txtViewAfterDiscount').val($('#AfterDisVal' + userid).val()); $('#txtViewAfterDiscount').val($('#AfterDisVal' + userid).val());

30
app/Views/editServiceAmendPO.php
View File

@ -1325,7 +1325,9 @@ foreach ($PaymentTerms as $TER) {
<label>Description Of Service </label><span class="text-danger">*</span> <label>Description Of Service </label><span class="text-danger">*</span>
<?php <?php
$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', strip_tags($DescriptionOfPo)), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $DescriptionOfPo = html_entity_decode($DescriptionOfPo);
$DescriptionOfPo = strip_tags($DescriptionOfPo);
$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); echo form_textarea($data);
?> ?>
@ -1341,7 +1343,10 @@ foreach ($PaymentTerms as $TER) {
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Scope Of Work</label> <label>Scope Of Work</label>
<textarea name="ScopeofWork" id="ScopeofWork" class="form-control" rows="8" cols="40"> <textarea name="ScopeofWork" id="ScopeofWork" class="form-control" rows="8" cols="40">
<?php echo set_value('ScopeofWork', strip_tags($ServiceDescription)); ?> <?php
$ServiceDescription = html_entity_decode($ServiceDescription);
$ServiceDescription = strip_tags($ServiceDescription);
echo set_value('ScopeofWork', $ServiceDescription); ?>
</textarea> </textarea>
</div> </div>
@ -1392,7 +1397,7 @@ foreach ($PaymentTerms as $TER) {
<input class="btn btn-secondary" type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';"> <input class="btn btn-secondary" type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-primary Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <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">Submit</span></a> <a class="btn btn-success Save " ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div> </div>
</div> </div>
@ -1879,7 +1884,7 @@ foreach ($PaymentTerms as $TER) {
$('#EditQuantity').val($('#quantity' + userid).val()); $('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val(); RequistQuantity = $('#quantity' + userid).val();
$('#EditRate').val($('#itemRate' + userid).val()); $('#EditRate').val($('#itemRate' + userid).val());
$('#txtEditBasicValue').val(cellval[7].innerHTML); $('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val()); $('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val()); $('#EditSgst').val($('#Sgst' + userid).val());
$('#EditIgst').val($('#Igst' + userid).val()); $('#EditIgst').val($('#Igst' + userid).val());
@ -2002,12 +2007,12 @@ foreach ($PaymentTerms as $TER) {
cellval[2].innerHTML = editMaterialCode; cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription; cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity; cellval[5].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM; cellval[6].innerHTML = editUOM;
cellval[6].innerHTML = parseFloat(itemRate).toFixed(2); cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML = parseFloat(basicval).toFixed(2); cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2); cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2); cellval[10].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode); $('#materialCode' + userid).val(editMaterialCode);
@ -2027,8 +2032,10 @@ foreach ($PaymentTerms as $TER) {
$('#otherallowance' + userid).val(otherallowance); $('#otherallowance' + userid).val(otherallowance);
$('#TotalOrderValue' + userid).val(TotalOrderValue); $('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax(); populateValueMainFormForEditServiceTax();
setTimeout(() => {
$('#EDITSERVICE').modal('hide');
}, 1000);
} }
}); });
@ -2410,6 +2417,7 @@ foreach ($PaymentTerms as $TER) {
console.log("error occurred" , error); console.log("error occurred" , error);
}, },
complete : function (){ complete : function (){
$('#loader').hide();
// setTimeout(function() { enableButtons(); }, 2000); // setTimeout(function() { enableButtons(); }, 2000);
console.log("Ajax call is completed ..!!"); console.log("Ajax call is completed ..!!");
} }

8
app/Views/editimportpo.php
View File

@ -1349,10 +1349,10 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a> <a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
if ($PONOStatus == PO_DRAFT) { ?> if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-secondary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php } ?> <?php } ?>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a> <a class="btn btn-success waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if($PONOStatus == PO_AMENDED){ ?> <?php } else if($PONOStatus == PO_AMENDED){ ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a> <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } else { ?> <?php } else { ?>
@ -1360,7 +1360,7 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a> <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } else { ?> <?php } else { ?>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a> <a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
@ -2738,7 +2738,7 @@ if (!empty($getlogpodtl)) {
<label> Basic Price (<?php echo $INR ?>)</label> <label> Basic Price (<?php echo $INR ?>)</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div> <div style="display:none;">
<?php <?php
$data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);'); $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data); echo form_input($data);