diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index e47a1daf..90e58bc8 100755 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -589,7 +589,11 @@ class Amendmentpurchaseorder extends BaseController } - echo 'Purchase Order Amended Successfully! PO Number Is: ' . $PONO . '- New PO Number is' . $NewPO; + $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO ; + if($changeStatus == 'ST014'){ + $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO .' (Saved as Draft)'; + } + echo $message; } @@ -883,7 +887,12 @@ class Amendmentpurchaseorder extends BaseController $this->purchaseorder_model->pomasterupdatestatus($NewPO, $Newstatus); } - echo 'PO Number is' . $PONO . ' is Amended Successfully! - New Amended PO Number is ' . $NewPO; + $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO ; + if($changeStatus == 'ST014'){ + $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO .' (Saved as Draft)'; + } + + echo $message; } /** @@ -906,7 +915,6 @@ class Amendmentpurchaseorder extends BaseController $Deliverydt = ''; if (($DeliveryOption == 1) || ($DeliveryOption == 2)) { $Deliverydt = null; - if ($DeliveryOption == 1) { $DeliverySchedule = $this->request->getPost('Scheduleby'); } @@ -955,12 +963,15 @@ class Amendmentpurchaseorder extends BaseController } $MAD .= "Current Paymemnt Terms :  " . $prePaymentmethodtext . "
"; } + if ($predispatch != $curdispatch) { $MAD .= "Current Delivery Option :  " . $predispatch . $preDeliverySchedule . $preDate . "
"; } + if ($DeliverySchedule1 != $preDeliverySchedule) { $MAD .= "Current DeliveyOption :  " . $preDeliverySchedule . $preDate . $predispatch . "
"; } + if ($preDate != $Date) { $MAD .= "Current DeliveyOption :  " . $preDate . $preDeliverySchedule . "
"; } @@ -995,6 +1006,7 @@ class Amendmentpurchaseorder extends BaseController $qtycheck = $this->purchaseorder_model->getqtycheck($PONO); $qtycheckresult = ''; + foreach ($qtycheck as $qty) { $qtycheckresult = $qty->IsQualityChkReqired; } @@ -1006,8 +1018,10 @@ class Amendmentpurchaseorder extends BaseController if ($PaymentMethod != 'PT08') { $Otherpayment = ''; } + $updatedBy = $this->session->get('userId'); $AmendmentNewPoNo = generate_amendment_po_number($PONO); + $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' =>$changeStatus , 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult); $file = $this->request->getFile('POFile'); @@ -1040,11 +1054,10 @@ class Amendmentpurchaseorder extends BaseController $NewPO = $LastPO[0]['PONO']; } - if( $changeStatus == "ST026" || $changeStatus == "ST014"){ - $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS - - $APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail); - } + if( $changeStatus == "ST026" || $changeStatus == "ST014"){ + $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS + $APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail); + } $LineItemStatus = REQITEM_NEW; @@ -1057,7 +1070,6 @@ class Amendmentpurchaseorder extends BaseController // { // $igrno = $igrvalue[0]->IGRNO; // $po =$igrvalue[0]->PONO; - // } foreach ($igrvalue as $value) { @@ -1065,9 +1077,6 @@ class Amendmentpurchaseorder extends BaseController $igrno = $value->IGRNO; $po = $value->PONO; - // print_r($igrno); - - if ($PONO == $po) { $NewPOno = array('PONO' => $NewPO); // print_r($NewPOno); @@ -1077,7 +1086,6 @@ class Amendmentpurchaseorder extends BaseController } - for ($i = 1; $i <= $RowCount; $i++) { $CAD = ''; @@ -1093,63 +1101,34 @@ class Amendmentpurchaseorder extends BaseController $Productprice = $this->request->getPost('basicvalInINR' . $i); $LandingCharge = $this->request->getPost('beforeLanding' . $i); $AfterLandingCharge = $this->request->getPost('landingCharge' . $i); - - $CustomDuty = $this->request->getPost('beforeCustomDuty' . $i); $AfterCustomDuty = $this->request->getPost('CustomDuty' . $i); - - $CustomEd = $this->request->getPost('beforeCustomEDCess' . $i); $AfterCustomEd = $this->request->getPost('CustomEDCess' . $i); - $CustomSH = $this->request->getPost('beforeCustomSHCess' . $i); $AfterCustomSH = $this->request->getPost('CustomSHCess' . $i); - - - $Grossdutypayable = $this->request->getPost('GrossDutyPayable' . $i); - $purchaseratePerKG = $this->request->getPost('purchaseRate' . $i); $CustomDutyExpensesPerKG = $this->request->getPost('CustomDutyExpenses' . $i); - $QuantityKG = $this->request->getPost('PurQuantity' . $i); - - $Totalvalueitem = $this->request->getPost('PerKgExpense' . $i); - - - - $Assable = $this->request->getPost('AssessableValue' . $i); $beforeAssable = $this->request->getPost('beforeAssessableValue' . $i); - - - $Subtotal = $this->request->getPost('SubTotal' . $i); $beforeSubtotal = $this->request->getPost('beforeSubTotal' . $i); - - - $Igst = $this->request->getPost('IGSTInt' . $i); $beforeIgst = $this->request->getPost('beforeIGSTInt' . $i); $AfterIgst = $this->request->getPost('AfterIGSTInt' . $i); - - $ClearingCharge = $this->request->getPost('ClearingCharge' . $i); - $NetValue = $this->request->getPost('NetValue' . $i); - $DutyImpact = $this->request->getPost('DutyImpact' . $i); - $CostCenter = $this->request->getPost('CPCostCode' . $i); - $SGST = $this->request->getPost('SGST' . $i); $preSGST = $this->request->getPost('beforeSGST' . $i); $CGST = $this->request->getPost('CGST' . $i); $preCGST = $this->request->getPost('beforeCGST' . $i); $IGST = $this->request->getPost('IGST' . $i); $preIGST = $this->request->getPost('beforeIGST' . $i); - $SGSTvalue = $this->request->getPost('afterSGST' . $i); $preSGSTvalue = $this->request->getPost('beforeSGSTvalue' . $i); $CGSTvalue = $this->request->getPost('afterCGST' . $i); @@ -1171,12 +1150,10 @@ class Amendmentpurchaseorder extends BaseController $AfterFreightValue = $this->request->getPost('AfterFreightVal' . $i); $NOOfTrip = $this->request->getPost('NoOfTrip' . $i); $POLineItemNo = $this->request->getPost('LineItemNo' . $i); - $FreightTypeloc = $this->request->getPost('Ftype' . $i); $FreightNoofTriploc = $this->request->getPost('NoTrip' . $i); $Freightrateloc = $this->request->getPost('Fvalue' . $i); $FreightAmountloc = $this->request->getPost('Afvalue' . $i); - $beforeFreightTypeloc = $this->request->getPost('beforeFtype' . $i); $beforeFreightNoofTriploc = $this->request->getPost('beforeNoTrip' . $i); $beforeFreightrateloc = $this->request->getPost('beforeFvalue' . $i); @@ -1263,20 +1240,28 @@ class Amendmentpurchaseorder extends BaseController $CAD .= $CAD2; } if($itemRate != 0){ + // changed rate are update here $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } - $POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'AmendedDetails' => $CAD, 'Per' => $Per, 'ServiceMaterialDescription' => $CapitalItemDescrition,'LineitemAuditorNotes' => $LineitemAuditorNotes); - $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); - $LineItemNo = ''; + // PO line item insert here + $POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'AmendedDetails' => $CAD, 'Per' => $Per, 'ServiceMaterialDescription' => $CapitalItemDescrition,'LineitemAuditorNotes' => $LineitemAuditorNotes); + $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); - foreach ($POLineItem as $line) : - $LineItemNo = $line['LineItemNo']; - endforeach; + // don't use this foreach + // foreach ($POLineItem as $line) : + // $LineItemNo = $line['LineItemNo']; + // endforeach; + + $LineItemNo = ''; + if (count($POLineItem) > 0) { + $LineItemNo = $POLineItem[0]['LineItemNo']; + } if (!is_null($POType) && is_string($POType) && trim($POType) === 'CAPITAL') { if ($capitalType == '1') { + // 1 means $ServiceTaxList = array('LineItemNo' => $LineItemNo, 'CGST' => $CGST, 'After_CGST' => $CGSTvalue, 'SGST' => $SGST, 'After_SGST' => $SGSTvalue, 'IGST' => $IGST, 'After_IGST' => $IGSTvalue, 'otherallowance' => $otherallowance, 'TotalValue' => $TotalServiceOrderValue, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'discount' => $DiscountType, 'discountval' => $DiscountValue, 'Afterdiscountval' => $AfterDiscount, 'FreightType' => $FreightTypeloc, 'NoOfTrip' => $FreightNoofTriploc, 'FreightValue' => $Freightrateloc, 'AfterFreightValue' => $FreightAmountloc); $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList); } else if ($capitalType == '0') { @@ -1309,7 +1294,12 @@ class Amendmentpurchaseorder extends BaseController } - echo 'Purchase Order' . $PONO . 'Amended Successfully! New PO Number Is: ' . $NewPO; + $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO ; + if($changeStatus == 'ST014'){ + $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO .' (Saved as Draft)'; + } + echo $message; + } @@ -1444,7 +1434,7 @@ class Amendmentpurchaseorder extends BaseController if (count($LastPO) > 0) { $NewPO = $LastPO[0]['PONO']; } - + if( $changeStatus == "ST026" || $changeStatus == "ST014"){ $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS @@ -1667,7 +1657,6 @@ class Amendmentpurchaseorder extends BaseController $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); $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList); } @@ -1695,6 +1684,11 @@ class Amendmentpurchaseorder extends BaseController $this->purchaseorder_model->pomasterupdatestatus($NewPO, $Newstatus); } - echo 'Purchase Order is' . $PONO . 'Amended Successfully! New PO Number is: ' . $NewPO; + $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO ; + if($changeStatus == 'ST014'){ + $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO .' (Saved as Draft)'; + } + + echo $message; } } diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index adbadd41..baea8ddd 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -1259,7 +1259,13 @@ class Purchaseorder extends BaseController } } } - echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO; + $message = 'Revenue Purchase Order Created Successfully! PO Number Is: ' . $PONO; + if($POStatus == 'ST014'){ + $message = 'Revenue Purchase Order Saved as Draft! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST026'){ + $message = 'Revenue Purchase Order Approved Successfully! PO Number Is: ' . $PONO; + } + echo $message; } catch (\Exception $e) { log_message('error', 'Exception occurred: ' . $e->getMessage()); echo 'An error occurred while creating the purchase order. Please try again.'; @@ -1590,7 +1596,13 @@ class Purchaseorder extends BaseController } } - echo 'Purchase Order Updated Successfully! PO Number Is: ' . $PONO; + $message = 'Revenue Purchase Order Updated Successfully! PO Number Is: ' . $PONO; + if($POStatus == 'ST014'){ + $message = 'Revenue Purchase Order Saved as Draft! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST026'){ + $message = 'Revenue Purchase Order Approved Successfully! PO Number Is: ' . $PONO; + } + echo $message; } @@ -2151,7 +2163,14 @@ class Purchaseorder extends BaseController } } - echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO; + $message = 'Import Purchase Order Created Successfully! PO Number Is: ' . $PONO; + if($POStatus == 'ST014'){ + $message = 'Import Purchase Order Saved as Draft! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST026'){ + $message = 'Import Purchase Order Approved Successfully! PO Number Is: ' . $PONO; + } + echo $message; + } catch (\Exception $e) { log_message('error', 'Exception occurred: ' . $e->getMessage()); echo 'An error occurred while creating the purchase order. Please try again.'; @@ -2533,7 +2552,13 @@ class Purchaseorder extends BaseController } - echo 'Purchase Order Updated Successfully! PO Number Is: ' . $PONO; + $message = 'Import Purchase Order Updated Successfully! PO Number Is: ' . $PONO; + if($POStatus == 'ST014'){ + $message = 'Import Purchase Order Saved as Draft! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST026'){ + $message = 'Import Purchase Order Approved Successfully! PO Number Is: ' . $PONO; + } + echo $message; } @@ -2912,7 +2937,13 @@ class Purchaseorder extends BaseController } } - echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO; + $message = 'Capital Purchase Order Created Successfully! PO Number Is: ' . $PONO; + if($POStatus == 'ST014'){ + $message = 'Capital Purchase Order Saved as Draft! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST026'){ + $message = 'Capital Purchase Order Approved Successfully! PO Number Is: ' . $PONO; + } + echo $message; } catch (\Exception $e) { log_message('error', 'Exception occurred: ' . $e->getMessage()); echo 'An error occurred while creating the purchase order. Please try again.'; @@ -3342,9 +3373,14 @@ class Purchaseorder extends BaseController } } } + $message = 'Capital Purchase Order Updated Successfully! PO Number Is: ' . $PONO; + if($POStatus == 'ST014'){ + $message = 'Capital Purchase Order Saved as Draft! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST026'){ + $message = 'Capital Purchase Order Approved Successfully! PO Number Is: ' . $PONO; + } + echo $message; - - echo 'Purchase Order Updated Successfully! PO Number Is: ' . $PONO; } diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php index 428201a4..0ca003b9 100755 --- a/app/Controllers/Servicepurchaseorder.php +++ b/app/Controllers/Servicepurchaseorder.php @@ -342,7 +342,15 @@ class Servicepurchaseorder extends BaseController } } } - echo 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO; + $message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO; + + if($POStatus == 'ST015'){ + $message = 'Service Purchase Order Saved as Draft! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST026'){ + $message = 'Service Purchase Order Approved Successfully! PO Number Is: ' . $PONO; + } + echo $message; + } //update service po function UpdateServicePurchaseOrder() @@ -606,7 +614,15 @@ class Servicepurchaseorder extends BaseController } /*--------- Lineitem Section starts ---------------------*/ } - echo 'Purchase Order Updated Successfully! PO Number Is: ' . $PONO; + $message = 'Service Purchase Order Updated Successfully! PO Number Is: ' . $PONO; + if($POStatus == 'ST014'){ + $message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST015'){ + $message = 'Service Purchase Order Saved as Draft! PO Number Is: ' . $PONO; + } else if($POStatus == 'ST026'){ + $message = 'Service Purchase Order Approved Successfully! PO Number Is: ' . $PONO; + } + echo $message; } diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 7b820d75..78b28659 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -2855,7 +2855,7 @@ if (!empty($getlogpodtl)) { function populateValueMainFormForEditServiceTax() { - var rows = $('#ServiceTable tbody tr').length; + var rows = document.getElementById('ServiceTable').rows.length; // alert(rows); var editrow = parseFloat(rows) - 1; var TotCgst = 0; @@ -3373,7 +3373,7 @@ if (!empty($getlogpodtl)) { AvlBudAmt = ''; //ServiceTable - var rows = $('#ServiceTable tbody tr').length; + var rows = document.getElementById('ServiceTable').rows.length; var DeletedMaterialCode = ''; var DeletedMaterialName = ''; diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php index 186bbdfc..ca9777a7 100644 --- a/app/Views/accountsDashboard.php +++ b/app/Views/accountsDashboard.php @@ -420,10 +420,11 @@
- + +
- + diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 3aa2f7ad..6bb5e4d3 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -1126,7 +1126,7 @@ if (!empty($INRSYMBOL)) { ?> - +
@@ -1140,7 +1140,7 @@ if (!empty($INRSYMBOL)) { ?>
- +
@@ -1179,14 +1179,12 @@ if (!empty($INRSYMBOL)) { ?>
- - +
-
*
-
+ - -
-
-
-
- -
- 'Select Discount Type'); - //print_r( $options); - - if (!empty($TaxType)) { - foreach ($TaxType as $SID) : - - - $options[$SID->ConfigValue] = $SID->ConfigValue; - - endforeach; - } - - echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType" class="form-control"'); - - ?> -
-
-
- -
- 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(0);'); - echo form_input($data); - ?> -
-
-
- -
- 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
-
-
- - 'Select Freight Type'); - if (!empty($FreightType)) { - foreach ($FreightType as $SID) : - $options[$SID->ConfigValue] = $SID->ConfigValue; - endforeach; - } - echo form_dropdown('drpFreightloc', $options, set_value('drpFreightloc'), 'id="drpFreightloc" class="form-control "'); - ?> -
- -
- - 'txtFreightloc', 'value' => set_value('txtFreightloc'), 'id' => 'txtFreightloc', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightlocaddper();'); - echo form_input($data); - ?> -
-
- - 'txtAfterFreightloc', 'value' => set_value('txtAfterFreightloc'), 'id' => 'txtAfterFreightloc', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
- -
- - - - - -
-
- -
-
- - 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> - -
-
- 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- -
-
- -
-
- 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
-
- 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- -
-
- - -
-
- - 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> - -
-
- - 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true'); - echo form_input($data); - ?> - -
-
-
-
- -
-
- 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()'); - echo form_input($data); - ?> -
-
-
-
- -
-
- 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - -
-
-
-
+
-
- - +
- -
- 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - -
-
- 'LandingCharge', 'value' => set_value('LandingCharge'), 'id' => 'LandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); - echo form_input($data); - ?> -
-
- 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - -
- -
- 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - -
-
- 'Customduty', 'value' => set_value('Customduty'), 'id' => 'Customduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); - echo form_input($data); - ?> -
-
- 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - -
-
- 'CustomEDcess', 'value' => set_value('CustomEDcess'), 'id' => 'CustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); - echo form_input($data); - ?> -
-
- 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - -
-
- 'CustomSHcess', 'value' => set_value('CustomSHcess'), 'id' => 'CustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); - echo form_input($data); - ?> -
-
- 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
-
- - -
-
-
+
+ +
'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty'), 'id' => 'AdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + $options = array("0" => 'Select Discount Type'); + //print_r( $options); + + if (!empty($TaxType)) { + foreach ($TaxType as $SID) : + + + $options[$SID->ConfigValue] = $SID->ConfigValue; + + endforeach; + } + + echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType" class="form-control"'); + + ?> +
+
+
+ +
+ 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(0);'); echo form_input($data); ?>
-
- 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> +
+ +
+ 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
-
+
-
- - - - - +
-
- - 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'IgstInt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()'); - echo form_input($data); - ?> -
-
- 'AfterIgstInt', 'value' => set_value('AfterIgstInt', 0), 'id' => 'AfterIgstInt', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- -
-
- - -
- -
- -
- -
- 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- -
- -
- -
+
'Select Freight Type'); - //print_r( $options); if (!empty($FreightType)) { foreach ($FreightType as $SID) : $options[$SID->ConfigValue] = $SID->ConfigValue; endforeach; } - echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "'); + echo form_dropdown('drpFreightloc', $options, set_value('drpFreightloc'), 'id="drpFreightloc" class="form-control "'); ?>
- - -
+
'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);'); + $data = array('name' => 'txtFreightloc', 'value' => set_value('txtFreightloc'), 'id' => 'txtFreightloc', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightlocaddper();'); echo form_input($data); ?>
- -
- +
+ 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); + $data = array('name' => 'txtAfterFreightloc', 'value' => set_value('txtAfterFreightloc'), 'id' => 'txtAfterFreightloc', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?>
-
+
+
-
- +
+ +
+
+ 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); + $data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> + +
+
+ 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); echo form_input($data); ?>
-
- - 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); - echo form_input($data); - ?> -
-
+
-
- +
+ +
+
'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); + $data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);'); echo form_input($data); ?>
- -
+
+ 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ + +
+
-
- 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + $data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> + +
+
+ + 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true'); + echo form_input($data); + ?> + +
+
+
+
+ +
+
+ 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()'); echo form_input($data); ?>
- -
- - +
+
+
+ +
+
'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); + $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); echo form_input($data); ?>
+
+ + +
+
+
+
+
+
+ + +
+
+
+ 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+
+
+ 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ + +
+
+ 'LandingCharge', 'value' => set_value('LandingCharge'), 'id' => 'LandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + echo form_input($data); + ?> +
+
+ 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ + +
+
+
+ 'Highseas ', 'value' => set_value('Highseas'), 'id' => 'Highseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + echo form_input($data); + ?> +
+
+
+ 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ + +
+
+ 'Customduty', 'value' => set_value('Customduty'), 'id' => 'Customduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + echo form_input($data); + ?> +
+
+ 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ + +
+
+ 'CustomEDcess', 'value' => set_value('CustomEDcess'), 'id' => 'CustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + echo form_input($data); + ?> +
+
+ 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ + +
+
+ 'CustomSHcess', 'value' => set_value('CustomSHcess'), 'id' => 'CustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + echo form_input($data); + ?> +
+
+ 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
+ + +
+
+
+ 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty'), 'id' => 'AdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + echo form_input($data); + ?> +
+
+
+ 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ + + + + +
+
+ + 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'IgstInt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()'); + echo form_input($data); + ?> +
+
+ 'AfterIgstInt', 'value' => set_value('AfterIgstInt', 0), 'id' => 'AfterIgstInt', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ +
+
+ + +
+ +
+ +
+ 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ +
+ +
+ +
+ + 'Select Freight Type'); + //print_r( $options); + if (!empty($FreightType)) { + foreach ($FreightType as $SID) : + $options[$SID->ConfigValue] = $SID->ConfigValue; + endforeach; + } + echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "'); + ?> +
+ + + +
+ + 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);'); + echo form_input($data); + ?> +
+ +
+ + 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
-
+
+

Cost Of The Product Per UOM

+
+
+ +
+
+ + 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + echo form_input($data); + ?> +
+
+
+
+ + 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ + 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); + echo form_input($data); + ?> +
+ +
+ + + 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); + echo form_input($data); + ?> +
-
-
- - +
-
+
+
+
@@ -1674,20 +1662,16 @@ if (!empty($INRSYMBOL)) { $data = array('name' => 'ItemDescription', 'value' => set_value('ItemDescription'), 'id' => 'ItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?>
-
+
+
- - - - -
Cancel     Add Capital -
- -
-
+
+ +
+ @@ -1751,7 +1735,7 @@ if (!empty($INRSYMBOL)) { echo form_input($data); ?> - +
@@ -1766,7 +1750,7 @@ if (!empty($INRSYMBOL)) {
- +
@@ -1805,7 +1789,7 @@ if (!empty($INRSYMBOL)) { ?>
- +
@@ -1832,419 +1816,60 @@ if (!empty($INRSYMBOL)) { ?>
- + -
+
-
- -
-
- -
- 'Select Discount Type'); - //print_r( $options); +
+ +
+
+ +
+ 'Select Discount Type'); + //print_r( $options); - if (!empty($TaxType)) { - foreach ($TaxType as $SID) : + if (!empty($TaxType)) { + foreach ($TaxType as $SID) : - $options[$SID->ConfigValue] = $SID->ConfigValue; + $options[$SID->ConfigValue] = $SID->ConfigValue; - endforeach; - } + endforeach; + } - echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"'); + echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"'); - ?> -
-
-
- -
- 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(1);', 'style' => 'text-align:right;'); - echo form_input($data); - ?> -
-
-
- -
- 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); - echo form_input($data); - ?> -
-
-
+ ?> +
+
+
+ +
+ 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(1);', 'style' => 'text-align:right;'); + echo form_input($data); + ?> +
+
+
+ +
+ 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); + echo form_input($data); + ?> +
+
+
-
- -
- -
- - 'Select Freight Type'); - if (!empty($FreightType)) { - foreach ($FreightType as $SID) : - $options[$SID->ConfigValue] = $SID->ConfigValue; - endforeach; - } - echo form_dropdown('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc" class="form-control "'); - ?> -
- -
- - 'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();'); - echo form_input($data); - ?> -
- -
- - 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
- -
- - - - -
-
- -
- -
-
- - 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
- -
- -
-
- - 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); - echo form_input($data); - ?> -
- -
- -
- -
-
- - -
- -
-
- - 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
- -
-
-
- - 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); - echo form_input($data); - ?> -
- -
- -
- -
-
- - -
- -
-
- - 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
- -
-
-
- - 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true'); - echo form_input($data); - ?> -
- -
- -
- -
-
- -
-
-
- 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
-
- -
-
-
- 'EdittxtTotalOrderValue', 'value' => set_value('EdittxtTotalOrderValue'), 'id' => 'EdittxtTotalOrderValue', 'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- -
- -
-
-
-
-
- -
- -
-
- 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- +
-
-
-
- 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
-
-
- 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - -
-
- -
-
-
- 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - -
-
-
- 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
-
-
- 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - -
-
-
- 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
-
-
- 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - -
-
-
- 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
-
-
- 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
-
-
- - -
-
- -
-
-
- 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - - - -
-
-
- 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()'); - echo form_input($data); - ?> -
-
-
-
- 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - -
-
-
- 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- - -
- -
- Freight Type +
+ 'Select Freight Type'); if (!empty($FreightType)) { @@ -2252,106 +1877,462 @@ if (!empty($INRSYMBOL)) { $options[$SID->ConfigValue] = $SID->ConfigValue; endforeach; } - echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"'); + echo form_dropdown('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc" class="form-control "'); ?> -
- + +
+ 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);'); + $data = array('name' => 'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();'); echo form_input($data); ?> -
+
-
- Freight Rate +
+ 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);'); + $data = array('name' => 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?> -
+
-
- Freight Amt +
+ + +
+ -
- -
-

Cost Of The Product Per UOM

-
-
-
- - 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> +
+ +
+ +
+
+ + 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+ +
+ +
+
+ + 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+ +
+
+ + +
+ +
+
+ + 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+ +
+
+ + +
+ +
+
+ + 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+ +
+
+
-
- - 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> +
+
+ 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
-
-
-
- -
-
- - 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
+
+ +
+
+
+ 'EdittxtTotalOrderValue', 'value' => set_value('EdittxtTotalOrderValue'), 'id' => 'EdittxtTotalOrderValue', 'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
-
+
-
- - 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
+
-
- - 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); - echo form_input($data); - ?> -
+
+
+
+
+
+ +
+
+
+ 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ -
+
+
+
+ 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ -
-
- +
+
+ +
+
+
+ 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ + +
+
+
+ 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ + +
+
+
+ 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ + +
+
+
+ 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
+
+ + +
+
+ +
+
+
+ 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ + +
+
+
+ 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ + +
+
+
+ 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ +
+ Freight Type + 'Select Freight Type'); + if (!empty($FreightType)) { + foreach ($FreightType as $SID) : + $options[$SID->ConfigValue] = $SID->ConfigValue; + endforeach; + } + echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"'); + ?> +
+ + +
+ Freight Rate + 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);'); + echo form_input($data); + ?> +
+ +
+ Freight Amt + 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+

Cost Of The Product Per UOM

+
+
+
+
+ + 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ + 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ + 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+ + 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ +
+
- 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); - echo form_textarea($data); ?> -
-
- -
+ +
+
+ + 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); + echo form_textarea($data); + ?> +
+
+ +
+
Cancel   Update Capital -
- - - + + + + + @@ -3724,7 +3705,14 @@ if (!empty($INRSYMBOL)) { function calculateTaxValue() { var Cgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val(); var Sgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val(); - var Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val(); + // var Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val(); + var Igst = 0.00; + if (capitalType == 'Domestic') { + Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val(); + } + if(capitalType == 'International') { + Igst = $('#AfterIgstInt').val() == '' ? '0.00' : $('#AfterIgstInt').val(); // caps interna + } var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val(); var HighSeasSalesCharge = $('#AfterHighseas').val() == '' ? '0.00' : $('#AfterHighseas').val(); @@ -4335,7 +4323,8 @@ if (!empty($INRSYMBOL)) { $('#EditAfterAssessable').val($("#AfterAssessable" + userid).val()); $('#EditSubtotal').val($("#Subtotal" + userid).val()); $('#EditIgstInt').val($("#IgstInt" + userid).val()); - $('#EditAfterIgstInt').val($("#AfterIgstInt" + userid).val()); + EAfterIgstInt = isNaN($("#AfterIgstInt" + userid).val()) ? 0 : parseFloat($("#AfterIgstInt" + userid).val()).toFixed(2); + $('#EditAfterIgstInt').val(EAfterIgstInt); $('#EditDutyImpact').val($("#Dutyimpact" + userid).val()); $('#EditClearingCharges').val($("#ClearingCharges" + userid).val()); $('#EditNett').val($("#Nett" + userid).val()); @@ -4798,7 +4787,9 @@ if (!empty($INRSYMBOL)) { var Igst = $('#EditIgstInt').val(); - var AfterIgst = $('#EditAfterIgstInt').val(); + EAfterIgstInt = isNaN($("#AfterIgstInt" + userid).val()) ? 0 : parseFloat($("#AfterIgstInt" + userid).val()).toFixed(2); + var AfterIgst = EAfterIgstInt; + var Dutyimpact = $('#EditDutyImpact').val(); var Clearing = $('#EditClearingCharges').val(); var Nett = $('#EditNett').val(); @@ -5034,7 +5025,14 @@ if (!empty($INRSYMBOL)) { function EditcalculateTaxValue() { var Cgst = $('#EditAfterCgst').val() == '' ? '0.00' : $('#EditAfterCgst').val(); var Sgst = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val(); - var Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); + // var Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); + var Igst = 0.00; + if (capitalType == 'Domestic') { + Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); + } + if(capitalType == 'International') { + Igst = $('#EditAfterIgstInt').val() == '' ? '0.00' : $('#EditAfterIgstInt').val(); // caps interna + } var landingCharge = $('#EditAfterLandingCharge').val() == '' ? '0.00' : $('#EditAfterLandingCharge').val(); var HighSeasSalesCharge = $('#EditAfterHighseas').val() == '' ? '0.00' : $('#EditAfterHighseas').val(); @@ -6390,13 +6388,8 @@ if (!empty($INRSYMBOL)) { $('#EditSubtotal').val(parseFloat(tot).toFixed(2)); } - - - if (isNaN(afterigst)) { - $('#EditAfterIgstInt').val(''); - } else { - $('#EditAfterIgstInt').val(parseFloat(afterigst).toFixed(2)); - } + EAfterIgstInt = isNaN(afterigst) ? 0 : parseFloat(afterigst).toFixed(2); + $('#EditAfterIgstInt').val(EAfterIgstInt); var grossexp = custom + customsh + customed + afterigst; diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 88dd00ae..f97a5927 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -1722,7 +1722,7 @@ if (!empty($POItem) && $CapitalRange == '1') {   Save as Draft  Submit + class="bold">Approve @@ -2144,304 +2144,306 @@ if (!empty($POItem) && $CapitalRange == '1') { ?> -
-
- -
- -
-
-
- -
- -
- 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - -
-
- 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
- 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- -
-
-
- 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
-
- 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - -
-
- 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
- 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - - -
-
- - -
-
- 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
- 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - -
-
- 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
- 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- - -
-
-
- - -
-
-
- 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
-
-
- 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- -
-
- - - -
-
- 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()'); - echo form_input($data); - ?> -
-
- 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- -
-
- -
-
- 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - -
-
- - 'Select Freight Type'); - if (!empty($FreightType)) { - foreach ($FreightType as $SID): - $options[$SID->ConfigValue] = $SID->ConfigValue; - endforeach; - } - echo form_dropdown('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight" class="form-control "'); - ?> -
- -
- - 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(3);'); - echo form_input($data); - ?> -
- -
- - 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
- -
- - -
-

Cost Of The Product Per UOM

-
-
- -
-
- - -
-
- 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
- -
- -
- -
- - -
-
- 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
- -
- -
-
- - -
-
- 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
+

@@ -3369,7 +3371,7 @@ Calculate Landing charge $('#EditOtherAllowances').val($('#otherallowance' + userid).val()); //$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val()); - $('#Editservicetotalordervaue').val(cellval[8].innerHTML); + $('#Editservicetotalordervaue').val(cellval[9].innerHTML); @@ -4079,19 +4081,20 @@ Calculate Landing charge $('#AfterFreightVal' + userid).val(AfterFreightVal); $('#DisVal' + userid).val(DisVal); $('#AfterDisVal' + userid).val(AfterDisVal); - cellval[2].innerHTML = materialName; + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; + cellval[2].innerHTML = shorten; //alert(materialName); - cellval[3].innerHTML = parseFloat(quantity).toFixed(2); + cellval[4].innerHTML = parseFloat(quantity).toFixed(2); //alert(quantity); - cellval[4].innerHTML = uom; + cellval[5].innerHTML = uom; //alert(uom); - cellval[5].innerHTML = parseFloat(itemRate).toFixed(2); + cellval[6].innerHTML = parseFloat(itemRate).toFixed(2); //alert(itemRate); - cellval[6].innerHTML = parseFloat(basicval).toFixed(2); + cellval[7].innerHTML = parseFloat(basicval).toFixed(2); //alert(basicval); - cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2); + cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2); //alert(TotalTaxValue); - cellval[8].innerHTML = parseFloat(totalservicevalue).toFixed(2); + cellval[9].innerHTML = parseFloat(totalservicevalue).toFixed(2); //alert(basicval); @@ -4142,7 +4145,14 @@ Calculate Landing charge function EditcalculateTaxValue() { var CGSTTaxAmount = $('#EditAfterCgst').val() == '' ? '0.00' : $('#EditAfterCgst').val(); var SGSTTaxAmount = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val(); - var IGSTTaxAmount = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); + // var IGSTTaxAmount = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); + var IGSTTaxAmount = 0.00; + if (capitalType == 'Domestic') { + IGSTTaxAmount = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); + } + if(capitalType == 'International') { + IGSTTaxAmount = $('#EditAfterIgstInt').val() == '' ? '0.00' : $('#EditAfterIgstInt').val(); + } var otherallowanceAmount = $('#EditOtherAllowances').val() == '' ? '0.00' : $('#EditOtherAllowances').val(); //alert(CGSTTaxAmount+""+SGSTTaxAmount+""+IGSTTaxAmount+otherallowanceAmount) diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 9d300c90..ef983b1b 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -1181,16 +1181,16 @@ if (!empty($getlogpodtl)) { - - - - -
-
+
+
Basic Price
-
@@ -2505,7 +2507,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -2544,7 +2546,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -2575,7 +2577,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2677,7 +2679,7 @@ if (!empty($getlogpodtl)) {
- +
@@ -2701,7 +2703,7 @@ if (!empty($getlogpodtl)) {
- +
@@ -2729,7 +2731,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2754,8 +2756,8 @@ if (!empty($getlogpodtl)) { ?>
- -
+ +

@@ -2764,8 +2766,8 @@ if (!empty($getlogpodtl)) {
Basic Price
-
Landing charge @@ -2801,7 +2803,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
Assessable Value (A) @@ -2822,7 +2824,7 @@ if (!empty($getlogpodtl)) { ?>
- +
Custom duty (B) @@ -2843,10 +2845,7 @@ if (!empty($getlogpodtl)) { ?>
- - - - +
Custom ED_cess (C) @@ -2867,7 +2866,7 @@ if (!empty($getlogpodtl)) { ?>
- +
Custom S & H cess (D) @@ -2888,8 +2887,8 @@ if (!empty($getlogpodtl)) { ?>
- - + +
@@ -2911,13 +2910,7 @@ if (!empty($getlogpodtl)) { ?>
-
- - - - - - +
@@ -2939,14 +2932,7 @@ if (!empty($getlogpodtl)) { ?>
- - - - - - - - +
Total Duty (G) @@ -2959,12 +2945,10 @@ if (!empty($getlogpodtl)) { ?>
- - - +
-
+
Freight Type 'Select Freight Type'); @@ -2976,31 +2960,29 @@ if (!empty($getlogpodtl)) { echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "'); ?>
-
-
+
@@ -3042,7 +3024,7 @@ if (!empty($getlogpodtl)) {
- +
Clearing Charges @@ -3059,9 +3041,9 @@ if (!empty($getlogpodtl)) { -
+
- +
'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); @@ -3075,11 +3057,11 @@ if (!empty($getlogpodtl)) { -
+
-
-
+
+
@@ -3087,16 +3069,16 @@ if (!empty($getlogpodtl)) { $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?>
-
- + +
Cancel   Update Capital -
+ - - + + @@ -3384,141 +3366,141 @@ if (!empty($getlogpodtl)) { -
-
-
+
+

-
-
- Basic Price -
- -
-
- 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- Landing charge -
-
-
- 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> +
+
+ Basic Price +
+
+ +
+
+
+ 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ Landing charge +
+
+
+ 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> -
-
-
-
-
- Assessable Value (A) -
-
- -
-
-
- 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- Custom duty (B) -
-
-
- 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> +
+
+
+
+
+ Assessable Value (A) +
+
+ +
+
+
+ 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ Custom duty (B) +
+
+
+ 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> -
-
-
-
- 'viewAfterCustomduty', 'value' => set_value('viewAfterCustomduty'), 'id' => 'viewAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> +
+
+
+
+ 'viewAfterCustomduty', 'value' => set_value('viewAfterCustomduty'), 'id' => 'viewAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> -
-
-
-
-
- Custom ED_cess (C) -
-
-
- 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- Custom S & H cess (D) -
-
-
- 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
+
+
+
+
+
+ Custom ED_cess (C) +
+
+
+ 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ Custom S & H cess (D) +
+
+
+ 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
@@ -3541,8 +3523,7 @@ if (!empty($getlogpodtl)) {
-
- +
@@ -3564,8 +3545,7 @@ if (!empty($getlogpodtl)) { ?>
- - +
Total Duty (G) @@ -3578,8 +3558,7 @@ if (!empty($getlogpodtl)) { ?>
- - +
@@ -3615,13 +3594,12 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
+

Cost Of The Product Per UOM


-
@@ -3638,7 +3616,7 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
+
@@ -3648,7 +3626,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -3660,13 +3638,13 @@ if (!empty($getlogpodtl)) {
-
-
+ ?> + +
- - - - - - - + + + +
@@ -3691,7 +3666,7 @@ if (!empty($getlogpodtl)) { $data = array('name' => 'ViewItemDescription', 'value' => set_value('ViewItemDescription'), 'id' => 'ViewItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?>
-
+
Cancel @@ -5646,7 +5621,14 @@ if (!empty($getlogpodtl)) { function calculateTaxValue() { var Cgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val(); var Sgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val(); - var Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val(); + + var Igst = 0.00; + if (capitalType == 'Domestic') { + Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val(); + } + if(capitalType == 'International') { + Igst = $('#AfterIgstInt').val() == '' ? '0.00' : $('#AfterIgstInt').val(); // caps interna + } var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val(); var HighSeasSalesCharge = $('#AfterHighseas').val() == '' ? '0.00' : $('#AfterHighseas').val(); var CustomDuty = $('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val(); @@ -5685,6 +5667,7 @@ if (!empty($getlogpodtl)) { var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val(); var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val(); + console.log("$('#AfterLandingCharge').val()",$('#AfterLandingCharge').val()); var CustomDuty = $('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val(); @@ -6012,8 +5995,7 @@ if (!empty($getlogpodtl)) { */ function populateValueMainFormForDeleteServiceTax(deletedRow) { - var rows = $('#serviceTax tbody tr').length; - + var rows = document.getElementById('serviceTax').rows.length; var capital = ; var TotalOrderValueSummary = 0; @@ -6117,6 +6099,7 @@ if (!empty($getlogpodtl)) { var TotOtherI = $('#OtherAmt' + i).val() == '' ? '0.00' : $('#OtherAmt' + i).val(); var TotLandingI = $('#landingCharge' + i).val() == '' ? '0.00' : $('#landingCharge' + i).val(); + // console.log("TotLandingI",TotLandingI); var TotCustomI = $('#CustomDuty' + i).val() == '' ? '0.00' : $('#CustomDuty' + i).val(); @@ -6227,7 +6210,7 @@ if (!empty($getlogpodtl)) { $("#EDITCAPITAL").on("shown.bs.modal", function(e) { - + // alert("***"); userid = $(e.relatedTarget).data('userid'); @@ -6308,7 +6291,9 @@ if (!empty($getlogpodtl)) { $('#EditAfterAssessable').val($("#AssessableValue" + userid).val()); $('#EditSubtotal').val($("#SubTotal" + userid).val()); $('#EditIgstInt').val($("#IGSTInt" + userid).val()); + // alert("Fetched the value GST"+$("#IGSTInt" + userid).val()); $('#EditAfterIgstInt').val($("#AfterIGSTInt" + userid).val()); + // alert("Fetched the value IGST"+$("#AfterIGSTInt" + userid).val()); $('#EditDutyImpact').val($("#DutyImpact" + userid).val()); $('#EditNett').val($("#NetValue" + userid).val()); $('#EditClearingCharges').val($("#ClearingCharge" + userid).val()); @@ -7018,8 +7003,8 @@ if (!empty($getlogpodtl)) { var AfterCgst = $("#EditAfterCgst").val(); var Sgst = $("#EditSgst").val(); var AfterSgst = $("#EditAfterSgst").val(); - var Igst = $("#EditIgst").val(); - var AfterIgst = $("#EditAfterIgst").val(); + var Igst = $("#EditIgst").val();//Dom Caps + var AfterIgst = $("#EditAfterIgst").val();//Dom Caps var OtherAmt = parseFloat($("#EditOtherAllowances").val() == '' ? "0.00" : $('#EditOtherAllowances').val()).toFixed(2); var TotalTaxValue = EditcalculateTaxValue(); @@ -7068,8 +7053,8 @@ if (!empty($getlogpodtl)) { var Assessable = $("#EditAfterAssessable").val(); var SubTotal = $("#EditSubtotal").val(); - // var Igst = $("#EditIgstInt").val(); - // var AfterIgst = $("#EditAfterIgstInt").val(); + var InternationalIgst = $("#EditIgstInt").val() == '' ? 0 : $("#EditIgstInt").val(); + var InternationalAfterIgst = $("#EditAfterIgstInt").val() == '' ? 0 : $("#EditAfterIgstInt").val(); var DutyImpact = $("#EditDutyImpact").val(); var ClearingCharges = $('#EditClearingCharges').val(); var Nett = $('#EditNett').val(); @@ -7170,23 +7155,23 @@ if (!empty($getlogpodtl)) { $('#AssessableValue' + userid).val(Assessable); $('#SubTotal' + userid).val(SubTotal); - $('#IGSTInt' + userid).val(Igst); - $('#AfterIGSTInt' + userid).val(AfterIgst); + $('#IGSTInt' + userid).val(InternationalIgst); + $('#AfterIGSTInt' + userid).val(InternationalAfterIgst); $('#DutyImpact' + userid).val(DutyImpact); $('#NetValue' + userid).val(Nett); $('#ClearingCharge' + userid).val(ClearingCharges); - + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; cellval[2].innerHTML = materialCode; - cellval[3].innerHTML = materialName; + cellval[3].innerHTML = shorten; cellval[5].innerHTML = quantity; cellval[6].innerHTML = uom; cellval[7].innerHTML = parseFloat(itemRate).toFixed(2); cellval[8].innerHTML = parseFloat(basicval).toFixed(2); - cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2); + cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);// what should i display here ?? if international means cellval[10].innerHTML = parseFloat(Total).toFixed(2); @@ -7344,7 +7329,14 @@ if (!empty($getlogpodtl)) { function EditcalculateTaxValue() { var Cgst = $('#EditAfterCgst').val() == '' ? '0.00' : $('#EditAfterCgst').val(); var Sgst = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val(); - var Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); + var Igst = 0.00; + if (capitalType == 'Domestic') { + Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); // caps dom + } + if(capitalType == 'International') { + Igst = $('#EditAfterIgstInt').val() == '' ? '0.00' : $('#EditAfterIgstInt').val(); // caps interna + } + console.log(Igst); var landingCharge = $('#EditAfterLandingCharge').val() == '' ? '0.00' : $('#EditAfterLandingCharge').val(); var HighSeasSalesCharge = $('#EditAfterHighseas').val() == '' ? '0.00' : $('#EditAfterHighseas').val(); var CustomDuty = $('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val(); @@ -7399,7 +7391,8 @@ if (!empty($getlogpodtl)) { */ function populateValueMainFormForEditCapitalTax() { - var rows = $('#serviceTax tbody tr').length; + var rows = document.getElementById('serviceTax').rows.length; + console.log("rr",rows); var capital = ; var TotalOrderValueSummary = 0; @@ -7426,9 +7419,9 @@ if (!empty($getlogpodtl)) { var TotBasicAmt = 0; var TotaFreight = 0; - + console.log("***---***"); for (var i = 1; i < rows; i++) { - + console.log(">>>---<<<"); var TotalOrderValueSummaryI = $('#ServiceTotalOrderValue' + i).val() == '' ? '0.00' : $('#ServiceTotalOrderValue' + i).val(); var TotalCgstI = $('#AfterCgst' + i).val() == '' ? '0.00' : $('#AfterCgst' + i).val(); @@ -7442,6 +7435,7 @@ if (!empty($getlogpodtl)) { var discountedRateValue = $('#AfterDisVal' + i).val() == '' ? '0.00' : $('#AfterDisVal' + i).val(); var TotLandingI = $('#landingCharge' + i).val() == '' ? '0.00' : $('#landingCharge' + i).val(); + console.log(TotLandingI,"TotLandingI"); var TotCustomI = $('#CustomDuty' + i).val() == '' ? '0.00' : $('#CustomDuty' + i).val(); @@ -7549,7 +7543,7 @@ if (!empty($getlogpodtl)) { function populateValueMainFormForViewCapitalTax() { - var rows = $('#serviceTax tbody tr').length; + var rows = document.getElementById('serviceTax').rows.length; var capital = ; var TotalOrderValueSummary = 0; @@ -8740,7 +8734,8 @@ if (!empty($getlogpodtl)) { function populateValueMainFormForupdateCapitalTax() { - var rows = $('#serviceTax tbody tr').length; + + var rows = document.getElementById('serviceTax').rows.length; var TotalFreight = 0; var i = 0; do { diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index 9b672960..8a4dd993 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -1624,7 +1624,7 @@ if (!empty($RequistionDetails)) {   Cancel   Save as Draft -   Submit +   Approve @@ -2916,7 +2916,7 @@ if (!empty($RequistionDetails)) { function populateValueMainFormForEditImportTax() { - var rows = $('#ImportTax tbody tr').length; + var rows = document.getElementById('ImportTax').rows.length;; var TotalLanding = 0; var TotalCustom = 0; var TotalCustomED = 0; diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 2b811f24..61fce2d5 100755 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -2552,7 +2552,7 @@ if (!empty($INRSYMBOL)) { } function populateValueMainFormForEditRevenueTax() { - var rows = $('#revenueTax tbody tr').length; + var rows = document.getElementById('revenueTax').rows.length; var totBasicAmt = 0; var totDiscountAmt = 0; var totPackagingAmt = 0; @@ -2628,8 +2628,7 @@ if (!empty($INRSYMBOL)) {
#SNo Item Code Item Description UOM