From 430b6013829523f90176037d4b36a0604fe8e3f4 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Thu, 19 Sep 2024 10:17:09 +0530 Subject: [PATCH 1/3] bug fix on submit button in add employee --- app/Views/addEmployeenew.php | 3 ++- app/Views/editEmployeenew.php | 4 ++-- deletableFile.php | 0 3 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 deletableFile.php diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index b9b42fa7..2ad0cf4a 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -1472,7 +1472,8 @@ }); if (!isValid) { - console.log('Validation failed. Please fill all required fields.'); + + alert('Validation failed. Please fill all required fields.'); return; // Stop the submission if validation fails } diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 543d8b7b..2242dcb6 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -1024,14 +1024,14 @@ if (!empty($EmpDetails)) { -
+
-
+
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 9d4b09e4..202d1721 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -6,7 +6,6 @@ array("name" => "NO", "value" => "0"), array("name" => "YES", "value" => "1") ); - $requestedBy = $requestedBy[0]->FirstName; // $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); @@ -427,7 +426,7 @@

- Back + Back
@@ -784,42 +783,6 @@
- - - -
-
- -
-
-
@@ -1078,7 +1041,7 @@ -
    +     @@ -1169,7 +1132,6 @@ ?> - @@ -1181,7 +1143,9 @@
-
+ + +
@@ -1393,54 +1357,98 @@
-
- - - - -
+

+
+ + + + +
+
+
+
+ + + + + + + +   Submit + + +
+ +
- - - - - - - -   Submit - - -
- format('d-m-Y'); ?> -
- -
- - - 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; +
+ format('d-m-Y'); ?> +
+ +
+ + + 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; - if (isset($PoStatusName) && !empty($PoStatusName)) { - if (isset($statusMappings[$PoStatusName])) { - echo $statusMappings[$PoStatusName]; + if (isset($PoStatusName) && !empty($PoStatusName)) { + if (isset($statusMappings[$PoStatusName])) { + echo $statusMappings[$PoStatusName]; + } else { + echo $PoStatusName; + } } else { - echo $PoStatusName; + echo "Status not provided"; } - } else { - echo "Status not provided"; - } - ?> -
+ ?> +
+
+ + +
+
+ +
+
+
+ @@ -1464,308 +1472,308 @@
- -
- -
- -
- 'Select Req No'); - // if(!empty($RequistionDetails)) - // { - // foreach ($RequistionDetails as $SID): - // $RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName; - // endforeach; - // } +
+ +
+ +
+ + 'Select Req No'); + // if(!empty($RequistionDetails)) + // { + // foreach ($RequistionDetails as $SID): + // $RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName; + // endforeach; + // } - $data = array('name' => 'EditReqnumber', 'value' => set_value('EditReqnumber'), 'id' => 'EditReqnumber', 'class' => 'form-control select2', 'readonly' => 'true'); - echo form_input($data); + $data = array('name' => 'EditReqnumber', 'value' => set_value('EditReqnumber'), 'id' => 'EditReqnumber', 'class' => 'form-control select2', 'readonly' => 'true'); + echo form_input($data); - ?> - -
-
-
- -
- 'EditCapitalDepartmentName', 'value' => set_value('EditCapitalDepartmentName'), 'id' => 'EditCapitalDepartmentName', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - -
- -
- 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - - ?> -
-
-
- - 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
- - -
-
-
- -
- 'Item Code'); - echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"'); - ?> -
-
-
- - 'EditCapitalItemName', 'value' => set_value('EditCapitalItemName'), 'id' => 'EditCapitalItemName', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - 'EditCPUOM', 'value' => set_value('EditCPUOM'), 'id' => 'EditCPUOM', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - 'EditCPQuantity', 'value' => set_value('EditCPQuantity'), 'id' => 'EditCPQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(3);calculateFreightloceditper()'); - echo form_input($data); - ?> -
-
- - 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(3);calculateFreightloceditper()'); - echo form_input($data); - ?> -
-
- 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer', 'class' => 'form-control'); - echo form_input($data); ?> -
-
- - 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
-
- -
- 'Select Discount Type'); - //print_r( $options); - - if (!empty($TaxType)) { - foreach ($TaxType as $SID) : - - - $options[$SID->ConfigValue] = $SID->ConfigValue; - - endforeach; - } - - 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' => 'EditRatechange();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'); - //print_r( $options); - - 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); - ?> -
-
-
- -
- - CGST In % -
-
- - 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'ChangeEditSgst();EditRatechange();', '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); - ?> - -
-
+ ?>
-
-
+
+
+ +
+ 'EditCapitalDepartmentName', 'value' => set_value('EditCapitalDepartmentName'), 'id' => 'EditCapitalDepartmentName', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
- SGST In % -
-
- '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); - ?> +
+ +
+ -
+ $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); - 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); - echo form_input($data); - ?> + ?> +
+
+
+ + 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
-
+ +
+
+
+ +
+ 'Item Code'); + echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"'); + ?> +
+
+
+ + 'EditCapitalItemName', 'value' => set_value('EditCapitalItemName'), 'id' => 'EditCapitalItemName', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'EditCPUOM', 'value' => set_value('EditCPUOM'), 'id' => 'EditCPUOM', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'EditCPQuantity', 'value' => set_value('EditCPQuantity'), 'id' => 'EditCPQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(3);calculateFreightloceditper()'); + echo form_input($data); + ?> +
+
+ + 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(3);calculateFreightloceditper()'); + echo form_input($data); + ?> +
+
+ 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
+ + 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
+ +
+ 'Select Discount Type'); + //print_r( $options); -
-
-
+ if (!empty($TaxType)) { + foreach ($TaxType as $SID) : - IGST In % -
-
+ $options[$SID->ConfigValue] = $SID->ConfigValue; - '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); - ?> + endforeach; + } -
-
+ echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"'); - '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', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> + ?>
-
-
- -
+
+ + 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();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'); + //print_r( $options); -
- 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
-
-
-
- Basic Price In -
- +
+ + SGST In % +
+
+ + '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); + ?> + +
+ +
+
+
+ + IGST In % +
+ +
+ + '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', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+
+
+
+ +
+ +
+ 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
+
+
+ Basic Price In +
+ -
- 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- Landing charge -
-
- '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); - ?> -
-
-
-
- Assessable Value (A) -
-
-
- '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); - ?> -
-
-
-
- Custom duty (B) : -
-
- '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); - ?> -
-
- - - -
-
- Custom ED_cess : (C) -
-
- '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); - ?> -
-
-
-
- Custom S & H cess : (D) -
-
- '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); - ?> -
+
+ 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?>
-
-
-
- Subtotal: (E) -
-
-
- '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); - ?> -
+
+
+ Landing charge
- - - - - - -
-
- - IGST on (E): (F) - -
-
- '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); - ?> -
+
+ 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?>
- - - - - - - - -
-
- Total Duty -
-
- 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
+
+ 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?>
- - -
-
- Freight Type -
- 'Select Freight Type'); - //print_r( $options); - - 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 "'); - - ?> -
-
- -
- Freight Rate - 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(3);'); - echo form_input($data); - ?> -
- -
- Freight Amt - 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
- +
+
+
+ Assessable Value (A)
- - -
-
-
-
-
-
- Duty Impact -
-
- 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- Quantity - 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
- -
-
- -
- Custom Duty -
-
- 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); - echo form_input($data); - ?> -
- -
-
-
- Clearing Charges -
-
- 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); - echo form_input($data); - ?> -
- - - - - - -
- - Nett per UOM -
-
- 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); - echo form_input($data); - ?> -
- - - -
- - - +
+
+ Custom duty (B) : +
+
+ '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); + ?>
-
-
-
-
- - 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); - echo form_textarea($data); ?> + +
+
+ Custom ED_cess : (C) +
+
+ '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); + ?> +
+
+
+
+ Custom S & H cess : (D) +
+
+ '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); + ?> +
+
+
+
+
+
+ Subtotal: (E) +
+
+
+ '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); + ?> +
+
+ + + + + + +
+
+ + IGST on (E): (F) + +
+
+ '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); + ?> +
+
+ + + + + + + + +
+
+ Total Duty +
+
+ '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'); + //print_r( $options); + + 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 "'); + + ?> +
+
+ +
+ Freight Rate + 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(3);'); + echo form_input($data); + ?> +
+ +
+ Freight Amt + 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ + +
+
+
+
+
+
+ Duty Impact +
+
+ 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ Quantity + 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+ +
+
+ +
+ Custom Duty +
+
+ 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+
+
+ Clearing Charges +
+
+ 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+ + + + + + +
+ + Nett per UOM +
+
+ '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); ?> +
+ +
Cancel @@ -2887,173 +2895,174 @@ /* get Edit Capital Po Modal*/ $(document).ready(function() { - $("#EDITCAPITAL").on("shown.bs.modal", function(e) { + $("#EDITCAPITAL").on("shown.bs.modal", function(e) { - userid = $(e.relatedTarget).data('userid'); + userid = $(e.relatedTarget).data('userid'); - $('#isEdit').val(1); - //alert(userid); - var tr = document.getElementById(userid); + $('#isEdit').val(1); + //alert(userid); + var tr = document.getElementById(userid); - var cellval = tr.cells; + var cellval = tr.cells; - var id = $('#Reqnumber' + userid).val(); - var disc = $('#DisType' + userid).val(); - //alert(disc); - if (disc != 'NIL') { - //alert('removed'); - $('#txtEditDiscount').removeAttr('readonly'); - } else { - //alert('Set'); - $('#txtEditDiscount').attr('readonly', true); - } + var id = $('#Reqnumber' + userid).val(); + var disc = $('#DisType' + userid).val(); + //alert(disc); + if (disc != 'NIL') { + //alert('removed'); + $('#txtEditDiscount').removeAttr('readonly'); + } else { + //alert('Set'); + $('#txtEditDiscount').attr('readonly', true); + } - $('#EditReqnumber').val($('#Reqnumber' + userid).val()); + $('#EditReqnumber').val($('#Reqnumber' + userid).val()); - $('#EditCapitalDepartmentName').val($('#departmentName' + userid).val()); - $("#EditCostCenter").val($('#CPCostCode' + userid).val()); - $('#EditCapitalbudAmt').val($('#AvilBudget' + userid).val()); - $('#EditExchangeRtModal').val($('#echangeRate' + userid).val()); + $('#EditCapitalDepartmentName').val($('#departmentName' + userid).val()); + $("#EditCostCenter").val($('#CPCostCode' + userid).val()); + $('#EditCapitalbudAmt').val($('#AvilBudget' + userid).val()); + $('#EditExchangeRtModal').val($('#echangeRate' + userid).val()); - $('#EditCapitalItemName').val($('#materialName' + userid).val()); - $('#Edittxtservicedescription').val($('#ServiceMaterialDescription' + userid).val()); - $('#EditFrequency').val($('#frequency' + userid).val()); + $('#EditCapitalItemName').val($('#materialName' + userid).val()); + $('#Edittxtservicedescription').val($('#ServiceMaterialDescription' + userid).val()); + $('#EditFrequency').val($('#frequency' + userid).val()); - $('#EditCPUOM').val($('#uom' + userid).val()); - $('#EditAmendPer').val($('#per' + userid).val()); - $('#EditCPQuantity').val($('#quantity' + userid).val()); - $('#EditCPRate').val(parseFloat($('#rateInUs' + userid).val()).toFixed(2)); + $('#EditCPUOM').val($('#uom' + userid).val()); + $('#EditAmendPer').val($('#per' + userid).val()); + $('#EditCPQuantity').val($('#quantity' + userid).val()); + $('#EditCPRate').val(parseFloat($('#rateInUs' + userid).val()).toFixed(2)); - $('#EditCPTotalAmount').val(parseFloat($('#basicval' + userid).val()).toFixed(2)); + $('#EditCPTotalAmount').val(parseFloat($('#basicval' + userid).val()).toFixed(2)); - RequistQuantity = $('#quantity' + userid).val(); - $('#EditCgst').val($('#CGST' + userid).val()); - $('#EditAfterCgst').val($('#afterCGST' + userid).val()); - $('#EditSgst').val($('#SGST' + userid).val()); - $('#EditAfterSgst').val($('#afterSGST' + userid).val()); - $('#EditIgst').val($('#IGST' + userid).val()); - $('#EditAfterIgst').val($('#afterIGST' + userid).val()); - $('#EditOtherAllowances').val($('#otherallowance' + userid).val()); - //$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val()); + RequistQuantity = $('#quantity' + userid).val(); + $('#EditCgst').val($('#CGST' + userid).val()); + $('#EditAfterCgst').val($('#afterCGST' + userid).val()); + $('#EditSgst').val($('#SGST' + userid).val()); + $('#EditAfterSgst').val($('#afterSGST' + userid).val()); + $('#EditIgst').val($('#IGST' + userid).val()); + $('#EditAfterIgst').val($('#afterIGST' + userid).val()); + $('#EditOtherAllowances').val($('#otherallowance' + userid).val()); + //$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val()); - $('#Editservicetotalordervaue').val(cellval[8].innerHTML); + $('#Editservicetotalordervaue').val(cellval[8].innerHTML); - $('#drpFreighteditloc').val($('#Ftype' + userid).val()); - $('#NOOfTripslocedit').val($('#NoTrip' + userid).val()); - $('#txtFreightlocedit').val($('#Fvalue' + userid).val()); - $('#txtAfterFreightlocedit').val($('#Afvalue' + userid).val()); + $('#drpFreighteditloc').val($('#Ftype' + userid).val()); + $('#NOOfTripslocedit').val($('#NoTrip' + userid).val()); + $('#txtFreightlocedit').val($('#Fvalue' + userid).val()); + $('#txtAfterFreightlocedit').val($('#Afvalue' + userid).val()); - var FreightType = $('#drpFreighteditloc').val(); + var FreightType = $('#drpFreighteditloc').val(); - if (FreightType == "PER TRIP") { - ///salert(); - $('#TripsValuelocedit').show(); - } else { - $('#TripsValuelocedit').hide(); - } + if (FreightType == "PER TRIP") { + ///salert(); + $('#TripsValuelocedit').show(); + } else { + $('#TripsValuelocedit').hide(); + } - $('#EditAfterBasicPriceTax').val($('#basicvalInINR' + userid).val()); - $('#EditAfterLandingCharge').val($('#landingCharge' + userid).val()); + $('#EditAfterBasicPriceTax').val($('#basicvalInINR' + userid).val()); + $('#EditAfterLandingCharge').val($('#landingCharge' + userid).val()); - $('#EditAfterCustomduty').val($('#CustomDuty' + userid).val()); + $('#EditAfterCustomduty').val($('#CustomDuty' + userid).val()); - $('#EditAfterCustomEDcess').val($('#CustomEDCess' + userid).val()); - $('#EditAfterCustomSHcess').val($('#CustomSHCess' + userid).val()); + $('#EditAfterCustomEDcess').val($('#CustomEDCess' + userid).val()); + $('#EditAfterCustomSHcess').val($('#CustomSHCess' + userid).val()); - $('#EditGrossdutypayable').val($('#GrossDutyPayable' + userid).val()); + $('#EditGrossdutypayable').val($('#GrossDutyPayable' + userid).val()); - $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val()); - //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val()); + $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val()); + //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val()); - $('#EdittxtTotalOrderValue').val($('#PerKgExpense' + userid).val()); + $('#EdittxtTotalOrderValue').val($('#PerKgExpense' + userid).val()); - /* get % value */ + /* get % value */ - $('#EditLandingCharge').val($('#beforeLanding' + userid).val()); + $('#EditLandingCharge').val($('#beforeLanding' + userid).val()); - $('#EditCustomduty').val($('#beforeCustomDuty' + userid).val()); + $('#EditCustomduty').val($('#beforeCustomDuty' + userid).val()); - $('#EditCustomEDcess').val($('#beforeCustomEDCess' + userid).val()); - $('#EditCustomSHcess').val($('#beforeCustomSHCess' + userid).val()); + $('#EditCustomEDcess').val($('#beforeCustomEDCess' + userid).val()); + $('#EditCustomSHcess').val($('#beforeCustomSHCess' + userid).val()); - $('#EditPurQuantity').val($('#PurQuantity' + userid).val()); + $('#EditPurQuantity').val($('#PurQuantity' + userid).val()); - $('#EditAfterAssessable').val($("#AssessableValue" + userid).val()); - $('#EditSubtotal').val($("#SubTotal" + userid).val()); - $('#EditIgstInt').val($("#IGSTInt" + userid).val()); - $('#EditAfterIgstInt').val($("#AfterIGSTInt" + userid).val()); - $('#EditDutyImpact').val($("#DutyImpact" + userid).val()); - $('#EditNett').val($("#NetValue" + userid).val()); - $('#EditClearingCharges').val($("#ClearingCharge" + userid).val()); + $('#EditAfterAssessable').val($("#AssessableValue" + userid).val()); + $('#EditSubtotal').val($("#SubTotal" + userid).val()); + $('#EditIgstInt').val($("#IGSTInt" + userid).val()); + $('#EditAfterIgstInt').val($("#AfterIGSTInt" + userid).val()); + $('#EditDutyImpact').val($("#DutyImpact" + userid).val()); + $('#EditNett').val($("#NetValue" + userid).val()); + $('#EditClearingCharges').val($("#ClearingCharge" + userid).val()); - var EditUOM = $('#uom' + userid).val(); - $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')'); - $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')'); - $("#EditDiscountType").val($('#DisType' + userid).val()); - $('#txtEditDiscount').val($('#DisVal' + userid).val()); - $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val()); - tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition' + userid).val()); - $('#AmendtxtFreight').val($('#FreightVal' + userid).val()); - $('#AmendtxtAfterFreight').val($('#AfterFreightVal' + userid).val()); - $('#AmendNOOfTrips').val($('#NoOfTrip' + userid).val()); - $("#drpamendFreight").val($('#FreightType' + userid).val()); + var EditUOM = $('#uom' + userid).val(); + $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')'); + $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')'); + $("#EditDiscountType").val($('#DisType' + userid).val()); + $('#txtEditDiscount').val($('#DisVal' + userid).val()); + $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val()); + tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition' + userid).val()); + $('#AmendtxtFreight').val($('#FreightVal' + userid).val()); + $('#AmendtxtAfterFreight').val($('#AfterFreightVal' + userid).val()); + $('#AmendNOOfTrips').val($('#NoOfTrip' + userid).val()); + $("#drpamendFreight").val($('#FreightType' + userid).val()); - var FreightType = $('#FreightType' + userid).val(); + var FreightType = $('#FreightType' + userid).val(); - if (FreightType == "PER TRIP") { - $('#AmendTripsValue').show(); - } else { - $('#AmendTripsValue').hide(); - } - var Material = ; + if (FreightType == "PER TRIP") { + $('#AmendTripsValue').show(); + } else { + $('#AmendTripsValue').hide(); + } + var Material = ; - $("#EditMaterialCode").empty(); + $("#EditMaterialCode").empty(); - $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())); + $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())); - for (i = 0; i < Material.length; i++) { - $.each(Material[i], function(idx, obj) { - if (obj.MaterialCode != $('#materialCode' + userid).val()) { - $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName)); + for (i = 0; i < Material.length; i++) { + $.each(Material[i], function(idx, obj) { + if (obj.MaterialCode != $('#materialCode' + userid).val()) { + $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName)); - } - }); - } - $('#EditLandingCharge').attr("style", "pointer-events: none;"); - $('#EditHighseas').attr("style", "pointer-events: none;"); - $('#EditCustomduty').attr("style", "pointer-events: none;"); - $('#EditExcisedutyTax').attr("style", "pointer-events: none;"); - $('#EditExcisedutyEDcess').attr("style", "pointer-events: none;"); - $('#EditExcisedutySHcess').attr("style", "pointer-events: none;"); - $('#EditCustomEDcess').attr("style", "pointer-events: none;"); - $('#EditCustomSHcess').attr("style", "pointer-events: none;"); - $('#EditAdditionalExciseduty').attr("style", "pointer-events: none;"); - $('#EditGrossdutypayable').attr("style", "pointer-events: none;"); - $('#EditPurQuantity').attr("style", "pointer-events: none;"); - $('#AmendtxtFreight').attr("style", "pointer-events: none;"); - $('#AmendtxtAfterFreight').attr("style", "pointer-events: none;"); - $('#AmendNOOfTrips').attr("style", "pointer-events: none;"); - $('#drpamendFreight').attr("style", "pointer-events: none;"); - });}); + } + }); + } + $('#EditLandingCharge').attr("style", "pointer-events: none;"); + $('#EditHighseas').attr("style", "pointer-events: none;"); + $('#EditCustomduty').attr("style", "pointer-events: none;"); + $('#EditExcisedutyTax').attr("style", "pointer-events: none;"); + $('#EditExcisedutyEDcess').attr("style", "pointer-events: none;"); + $('#EditExcisedutySHcess').attr("style", "pointer-events: none;"); + $('#EditCustomEDcess').attr("style", "pointer-events: none;"); + $('#EditCustomSHcess').attr("style", "pointer-events: none;"); + $('#EditAdditionalExciseduty').attr("style", "pointer-events: none;"); + $('#EditGrossdutypayable').attr("style", "pointer-events: none;"); + $('#EditPurQuantity').attr("style", "pointer-events: none;"); + $('#AmendtxtFreight').attr("style", "pointer-events: none;"); + $('#AmendtxtAfterFreight').attr("style", "pointer-events: none;"); + $('#AmendNOOfTrips').attr("style", "pointer-events: none;"); + $('#drpamendFreight').attr("style", "pointer-events: none;"); + }); + }); @@ -3188,7 +3197,7 @@ //alert('else'); - $('#content').loader('show'); + // $('#content').loader('show'); //salert('ss'); //alert('before Ajax'); var formData = new FormData($('.CapitalPO')[0]); @@ -3205,9 +3214,10 @@ processData: false, contentType: false, success: function(data) { + // console.log(data); if (data) { alert(data); - $('#content').loader('hide'); + // $('#content').loader('hide'); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); @@ -3216,7 +3226,7 @@ window.location = "amendmentpurchaseorder"; } else { - $('#content').loader('hide'); + // $('#content').loader('hide'); alert("Error"); } diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index 774affc0..33463d5a 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -298,7 +298,7 @@ if (!empty($RequistionDetails)) {

- Back + Back
@@ -2931,8 +2931,7 @@ if (!empty($RequistionDetails)) { $('#Deliverydt').focus(); return false; } else { - - $('#content').loader('show'); + // $('#content').loader('show'); var formData = new FormData($('.ImportPO')[0]); $.ajax({ @@ -2944,8 +2943,9 @@ if (!empty($RequistionDetails)) { type: "POST", url: "amendmentpurchaseorder/EditAmendImportPO", success: function(data) { + //console.log(data); if (data) { - $('#content').loader('hide'); + // $('#content').loader('hide'); alert(data); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 61c201d8..ab16d5a9 100755 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -160,7 +160,7 @@ if (!empty($INRSYMBOL)) { var InsuranceNumber = ''; $(document).ready(function() { - $('#RequistionNo').attr("style", "pointer-events: none;"); + // $('#RequistionNo').attr("style", "pointer-events: none;"); $('#drpSupplier').attr("style", "pointer-events: none;"); $('#PoTypeOptions').attr("style", "pointer-events: none;"); $('#insurancestatus').attr("style", "pointer-events: none;"); @@ -333,7 +333,12 @@ if (!empty($INRSYMBOL)) { $('#txtEditAfterFreight').val(''); if (selValue == PercentageType) { var PackagingCalculation = ''; - $('#freightmodel').modal('show'); + // $('#freightmodel').modal('show'); + $('#EDITREVENUE').modal('hide'); + setTimeout(() => { + $('#freightmodel').modal('show'); + }, 1000); + $('#txtEditFreight').removeAttr('readonly', 'true'); } else if (selValue == NilType) { @@ -734,6 +739,10 @@ if (!empty($INRSYMBOL)) { FreightCalculation = $("input:radio[name='optfreight']:checked").val(); // alert("this is value taken as before after radio value"+FreightCalculation); $('#freightmodel').modal('hide'); + setTimeout(() => { + $('#EDITREVENUE').modal('show'); + }, 1000); + // $('#EDITREVENUE').modal('show'); calculateFreight(); } @@ -910,7 +919,8 @@ if (!empty($INRSYMBOL)) {
-

+

+ Back
@@ -1242,7 +1252,7 @@ if (!empty($INRSYMBOL)) { - + @@ -1908,10 +1918,10 @@ if (!empty($INRSYMBOL)) {
-
+
-
+
@@ -2011,7 +2021,7 @@ if (!empty($INRSYMBOL)) { -->