From 610e75999e315a852849b462f6497383dc12fd62 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Mon, 2 Sep 2024 17:10:04 +0530 Subject: [PATCH 1/3] merge : GWM --- app/Views/monthlypayinputs.php | 56 ++++++---------------------------- 1 file changed, 10 insertions(+), 46 deletions(-) diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php index dd282299..df464541 100644 --- a/app/Views/monthlypayinputs.php +++ b/app/Views/monthlypayinputs.php @@ -84,18 +84,19 @@
- -

The Red highlighted Employee have loan - to pay. Put 'NA' for Skip Current - Month Loan Due.

-
-
+ + +
+ Key)) { @@ -539,46 +541,8 @@ i = i + 1; totalmonthloan[i] = $(this).find('td').eq(7).text(); }); - //console.log(totalmonthloan); - /* $('#monthlylisting').DataTable({ - "paging": true, - "lengthChange": true, - "searching": true, - "ordering": true, - "aaSorting": [[ 0, "asc" ]], - "info": true, - "autoWidth": true - - }); */ + - //var key = ; - - - //alert($('#monthyear').val()); - - - - - - - // show_hide_column(11,key); - // var t = $('#monthlylistings').DataTable({ - // "columnDefs": [{ - // "searchable": false, - // "orderable": false, - // "targets": 0 - // }], - // "searching": true, - // "lengthChange": true, - // "info": true, - // "paging": false, - // "autoWidth": true, - - // // "scrollX": true, - // "order": [ - // [1, 'asc'] - // ], - // }); t.on('order.dt search.dt', function() { t.column(0, { From 0a2d543e6d8996e8578387cfc898da64344c8ae1 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 3 Sep 2024 08:14:17 +0000 Subject: [PATCH 2/3] Emergency po fixes --- app/Controllers/Emergencypurchaseorder.php | 2 +- app/Views/alterpurchaseorder.php | 440 +++++++++------------ 2 files changed, 197 insertions(+), 245 deletions(-) diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index 8e6dab1e..4cecdeb2 100644 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -386,7 +386,7 @@ class Emergencypurchaseorder extends BaseController function addNewRevenuePurchaseOrder() { - print_r($this->request->getPost());die; + // print_r($this->request->getPost());die; $txtspl = $this->request->getPost('txtSpecial'); diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index d331a1e1..094ae7bb 100644 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -1901,39 +1901,39 @@ if (!empty($INRSYMBOL)) { } $(document).ready(function() { $('#ServiceMaterialCode').change(function() { - var selectedMaterialCode = ''; - selectedMaterialCode = $("#ServiceMaterialCode").val(); - $.each(JSON.parse(materialData), function(index, value) { - if (selectedMaterialCode == value.MaterialCode) { - $("#ServiceDescription").val(value.MaterialName); - $("#ServiceUOM").val(value.UOM); - if ($('#ScheduleType').val().trim() != 'Recurring') { - $('#FrequencyChange').val('One Time'); + var selectedMaterialCode = ''; + selectedMaterialCode = $("#ServiceMaterialCode").val(); + $.each(JSON.parse(materialData), function(index, value) { + if (selectedMaterialCode == value.MaterialCode) { + $("#ServiceDescription").val(value.MaterialName); + $("#ServiceUOM").val(value.UOM); + if ($('#ScheduleType').val().trim() != 'Recurring') { + $('#FrequencyChange').val('One Time'); - $('#ServiceNo').val(1); - } else { - $('#FrequencyChange').val($('#ScheduleType').val()); + $('#ServiceNo').val(1); + } else { + $('#FrequencyChange').val($('#ScheduleType').val()); + } } - } + + }); + var d = $('#drpSupplier').val(); + $.ajax({ + url: "VerifyWithSupplierForPendingPO", + type: 'POST', + data: { + supplierid: d, + materialcode: selectedMaterialCode + }, + success: function(response) { + if (response) alert(response); + } + }); }); - var d = $('#drpSupplier').val(); - $.ajax({ - url: "VerifyWithSupplierForPendingPO", - type: 'POST', - data: { - supplierid: d, - materialcode: selectedMaterialCode - }, - success: function(response) { - if (response) alert(response); - } - }); - - }); let materialData; @@ -2309,7 +2309,6 @@ if (!empty($INRSYMBOL)) { 'form-label-left CreatealterPO ', 'name' => 'CreatealterPO', 'id' => 'CreatealterPO'); - echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes); ?>
@@ -2559,7 +2558,8 @@ if (!empty($INRSYMBOL)) {
'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); + $formattedDate = $dt->format('Y-m-d'); + $data = array('type' => 'date', 'name' => 'PODate', 'value' => set_value('PODate', $formattedDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); ?>
@@ -2759,7 +2759,7 @@ if (!empty($INRSYMBOL)) {
- +
@@ -2787,7 +2787,7 @@ if (!empty($INRSYMBOL)) {
@@ -2838,14 +2838,14 @@ if (!empty($INRSYMBOL)) { + +
-->
@@ -2872,16 +2872,16 @@ if (!empty($INRSYMBOL)) { + + MaterialCode1 + DeliveryChallanDate + DeliveryChallanNo + VehicleNo + CourierNo + Quantity12 + File + + --> @@ -2907,7 +2907,6 @@ if (!empty($INRSYMBOL)) {
- --> @@ -2952,8 +2951,8 @@ if (!empty($INRSYMBOL)) {
- Cancel -   Submit + Cancel +   Submit
@@ -3102,9 +3101,9 @@ if (!empty($INRSYMBOL)) {

Edit Service Purchase Order Item

-
+
-
+
@@ -3146,7 +3145,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -3242,7 +3241,7 @@ if (!empty($INRSYMBOL)) {
--> -
+
@@ -3278,8 +3277,7 @@ if (!empty($INRSYMBOL)) {
-
-
+
CGST In % @@ -3307,7 +3305,7 @@ if (!empty($INRSYMBOL)) {
-
+
SGST In % @@ -3335,7 +3333,7 @@ if (!empty($INRSYMBOL)) {
-
+
IGST In % @@ -3364,8 +3362,8 @@ if (!empty($INRSYMBOL)) {
-
-
+
+
@@ -3377,8 +3375,8 @@ if (!empty($INRSYMBOL)) {
-
-
+
+
@@ -3390,17 +3388,21 @@ if (!empty($INRSYMBOL)) {
-
+
+
'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?> +
+ -
+ +
-
+
Cancel   Update Service
@@ -3416,14 +3418,14 @@ if (!empty($INRSYMBOL)) {
-
+

Edit Revenue Purchase Order Line Item

-
-
+
+
@@ -3464,7 +3466,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -3486,7 +3488,7 @@ if (!empty($INRSYMBOL)) { ?>
-
+
-
@@ -3514,7 +3515,7 @@ if (!empty($INRSYMBOL)) { ?>
-
+
'editrevenueEmergPer', 'value' => set_value('editrevenueEmergPer'), 'id' => 'editrevenueEmergPer', 'class' => 'form-control'); echo form_input($data); ?> @@ -3528,9 +3529,8 @@ if (!empty($INRSYMBOL)) { ?>
-
-
+
@@ -3572,7 +3572,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -3614,7 +3614,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -3670,7 +3670,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -3692,8 +3692,7 @@ if (!empty($INRSYMBOL)) {
- -
+
@@ -3715,7 +3714,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -3737,7 +3736,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -3750,8 +3749,7 @@ if (!empty($INRSYMBOL)) {
- -
+
@@ -3764,24 +3762,24 @@ if (!empty($INRSYMBOL)) {
-
+
+
-
'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100'); echo form_textarea($data);; ?>
-
-
- Cancel -   Edit Revenue -
+
+
- +
+ Cancel +   Edit Revenue +
@@ -3829,7 +3827,7 @@ if (!empty($INRSYMBOL)) { ?>
-
+
-
-
+
-
+
-
+
'addrevenueEmergPer', 'value' => set_value('addrevenueEmergPer'), 'id' => 'addrevenueEmergPer', 'class' => 'form-control'); echo form_input($data); ?>
-
+
-
@@ -4108,10 +4104,8 @@ if (!empty($INRSYMBOL)) {
+
-
-
-
'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100'); echo form_textarea($data);; @@ -4412,7 +4406,6 @@ if (!empty($INRSYMBOL)) { -