From 0cb5cb50b3c142a2dc6a3c8c625c52d4c76bb5dd Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Mon, 21 Apr 2025 17:44:44 +0530 Subject: [PATCH 1/7] stock changes 21-04-2025 --- app/Views/editconfig.php | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php index 1013c078..4cf8da5b 100755 --- a/app/Views/editconfig.php +++ b/app/Views/editconfig.php @@ -157,9 +157,9 @@ if (!empty($master)) { Config_ID === 'C023'){ ?> - + @@ -168,7 +168,7 @@ if (!empty($master)) { - ConfigValue; ?> + ConfigValue; ?> @@ -422,8 +422,6 @@ if (!empty($master)) { }, success: function(data) { - console.log(data); - if (data.length > 0) { if (data[0]?.isActive == 1) { @@ -509,15 +507,17 @@ if (!empty($master)) { var id = $(this).data('id'); var key = $(this).data('key'); var code = $(this).data('code'); - var configValue = $(this).data('configvalue'); + var configValue = $(this).attr('data-configvalue'); + + console.log(configValue); $('#key').val(key); $('#Config_ID').val(code); $('#configValue').val(configValue); - $('#EditConfiguration').modal('show'); - + }); + @@ -541,7 +541,25 @@ if (!empty($master)) { success: function(response) { if (response.status) { alert('Config Value updated successfully'); - location.reload(); + + let key = $('#key').val(); + + let configValue = $("#configValue").val(); + + let configId = $('#Config_ID').val(); + if (configId === "C023") { + $(`#configtable tbody tr td.config-value-td a[data-key="${key}"]`).text(configValue); + } else { + $(`#configtable tbody tr td.config-value-td[data-key="${key}"]`).text(configValue); + } + + $(`#configtable tbody tr td a.editConfigurationBtn[data-key="${key}"]`).attr('data-configvalue', configValue); + + + $("#configValue").val(" "); + + $('#EditConfiguration').modal('hide'); + } else { alert('Failed to update Config Value'); } From 47fd42baee848a5b2bac43d01c8464b742ed6a4b Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 22 Apr 2025 11:48:55 +0530 Subject: [PATCH 2/7] stock changes 22-04-2025 --- app/Config/Routes.php | 3 +++ app/Models/Dashboard_model.php | 10 +++++----- app/Views/Report_pending_purchase.php | 1 + app/Views/includes/new_header.php | 12 ++++++++++-- app/Views/reportslink.php | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 752cfac5..56ca9f5a 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -544,3 +544,6 @@ $routes->post('updateTrpProductionDetails', 'StockController::updateTrpProductio $routes->post('updateAbstractDetails','StockController::updateAbstractDetails'); +//Reports Module + +$routes->get('allReports','Report::allReports'); \ No newline at end of file diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php index 82e2cd67..3bfa49d0 100755 --- a/app/Models/Dashboard_model.php +++ b/app/Models/Dashboard_model.php @@ -1065,11 +1065,11 @@ pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027' "; $sql = "SELECT - CASE WHEN MONTH(PODate)>=4 THEN - concat(YEAR(PODate), '-',YEAR(PODate)+1) - ELSE concat(YEAR(PODate)-1,'-', YEAR(PODate)) END AS financial_year - FROM t_purchaseorder_master -GROUP BY financial_year"; + CASE WHEN MONTH(PODate)>=4 THEN + concat(YEAR(PODate), '-',YEAR(PODate)+1) + ELSE concat(YEAR(PODate)-1,'-', YEAR(PODate)) END AS financial_year + FROM t_purchaseorder_master + GROUP BY financial_year"; $query = $this->db->query($sql); return $query->getResult(); } diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index a4c5eafd..b46cc7f0 100755 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -125,6 +125,7 @@ +
diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index f2840762..c03055cd 100755 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -26,7 +26,7 @@

  Purchase

-

Purchase

+

Purchase

Year Wise

Pending

Purchase Supplier - Wise

From 1ebd28fba448b27204e3f3f5ada4429931f0ba94 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 22 Apr 2025 06:20:06 +0000 Subject: [PATCH 3/7] tracker issues --- app/Config/Routes.php | 1 + app/Views/EditservicePurchaseorder.php | 2 +- app/Views/Report_pending_purchase.php | 1 + app/Views/assetListing.php | 4 +- app/Views/costListing.php | 2 +- app/Views/editOldemppay.php | 2 +- app/Views/editRawmaterial.php | 2 +- app/Views/editSupplier.php | 2 +- app/Views/editimportpo.php | 6 ++- app/Views/factoryMachineMasterDetails.php | 2 +- app/Views/includes/new_header.php | 53 ++++++++++++++++++- app/Views/rawmaterialListing.php | 7 ++- app/Views/report_sales.php | 24 +++++---- app/Views/requisitionlisting.php | 5 +- app/Views/sales_invoice.php | 17 ++++-- app/Views/stock/incomingSilicaSandDetails.php | 2 +- app/Views/supplierListing.php | 2 +- app/Views/transporterListing.php | 8 +-- app/Views/userListing.php | 9 ++-- 19 files changed, 110 insertions(+), 41 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 752cfac5..b87741c7 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -316,6 +316,7 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'EditStoreRequisition', 'Storer $routes->get( 'AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working $routes->get( 'ViewIGR', 'Inwardgateregister::viewIGR'); // View IGR PAGE - Working $routes->post('ViewIGR', 'Inwardgateregister::viewIGR');//for filter purpose +$routes->post('cancellationIGR', 'Inwardgateregister::cancellationIGR'); $routes->get( 'accountsDashboard', 'Inwardgateregister::accountsDashboard'); // View IGR PAGE - Working $routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails'); $routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails'); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 3b080fbe..a75ecd90 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1715,7 +1715,7 @@ if (!empty($getlogpodtl)) {   Submit   Approve -   OK +   OK   Submit   Reset diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index a4c5eafd..24582bf8 100755 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -158,6 +158,7 @@

+
diff --git a/app/Views/assetListing.php b/app/Views/assetListing.php index fe17cfe4..287f3f69 100755 --- a/app/Views/assetListing.php +++ b/app/Views/assetListing.php @@ -153,7 +153,7 @@ IsActive == 0) { ?> - @@ -168,7 +168,7 @@    - IsActive == 0) { ?> -     diff --git a/app/Views/editOldemppay.php b/app/Views/editOldemppay.php index 7e92e7b8..b2467de2 100755 --- a/app/Views/editOldemppay.php +++ b/app/Views/editOldemppay.php @@ -344,7 +344,7 @@ if (!empty($emppay)) {
- +
diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index 48b5e391..c298dcbb 100755 --- a/app/Views/editRawmaterial.php +++ b/app/Views/editRawmaterial.php @@ -114,7 +114,7 @@ if ($total <= $reorder) {

Edit Material - Details

diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php index 5e90c047..ea05467d 100755 --- a/app/Views/editSupplier.php +++ b/app/Views/editSupplier.php @@ -287,7 +287,7 @@ if (!empty($supplier)) {

Edit Supplier Details

diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index f75f9938..fe03f7d6 100755 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -1409,10 +1409,12 @@ if (!empty($getlogpodtl)) {   Submit   Approve - OK + + OK   Submit - OK + OK + diff --git a/app/Views/factoryMachineMasterDetails.php b/app/Views/factoryMachineMasterDetails.php index 518c5e5c..a3545514 100644 --- a/app/Views/factoryMachineMasterDetails.php +++ b/app/Views/factoryMachineMasterDetails.php @@ -159,7 +159,7 @@ - + diff --git a/app/Views/rawmaterialListing.php b/app/Views/rawmaterialListing.php index d7375955..a9725090 100755 --- a/app/Views/rawmaterialListing.php +++ b/app/Views/rawmaterialListing.php @@ -204,8 +204,10 @@ } ?> IsActive == 0) { ?> - +     + @@ -217,11 +219,12 @@ class="fa fa-edit" style="color:#02a8b5;">    +     - + diff --git a/app/Views/report_sales.php b/app/Views/report_sales.php index 04d7a270..ba7ea95e 100644 --- a/app/Views/report_sales.php +++ b/app/Views/report_sales.php @@ -155,21 +155,23 @@ - +
+ - - - - - - - - - - + + + + + + + + + + diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php index d0b5beec..d0cf9670 100755 --- a/app/Views/requisitionlisting.php +++ b/app/Views/requisitionlisting.php @@ -114,9 +114,10 @@ if (!empty($Status)) { Raise New Requisition 0) { ?> -

The Requisition No is in Draft + Raise New Requisition + diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php index c83a09a3..4b6c5270 100755 --- a/app/Views/sales_invoice.php +++ b/app/Views/sales_invoice.php @@ -359,7 +359,7 @@

-
@@ -368,7 +368,7 @@
-
@@ -380,7 +380,7 @@
- +
@@ -488,6 +488,9 @@ $(document).ready(function () { $(document).ready(function() { + get('roleText') == 'Auditor'){ ?> + $(".account-restricted").hide(); + // Initialize the DataTable var table = $('#datatable-buttosns').DataTable({ @@ -554,7 +557,7 @@ $(document).ready(function () { style="font-size: 25px;"> -
+ diff --git a/app/Views/supplierListing.php b/app/Views/supplierListing.php index 3cdaa8cb..7500691f 100755 --- a/app/Views/supplierListing.php +++ b/app/Views/supplierListing.php @@ -61,7 +61,7 @@

Supplier Listing

- Add New Supplier + Add New Supplier
diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php index ecc666ee..d9f66eb9 100755 --- a/app/Views/transporterListing.php +++ b/app/Views/transporterListing.php @@ -93,7 +93,7 @@ Add New Transporter + class="btn btn-success auditor-restricted-btn">Add New Transporter @@ -170,7 +170,7 @@ @@ -230,7 +230,7 @@
-
diff --git a/app/Views/userListing.php b/app/Views/userListing.php index 4dcfb81f..1150bddd 100755 --- a/app/Views/userListing.php +++ b/app/Views/userListing.php @@ -150,12 +150,12 @@ - + @@ -105,7 +105,7 @@ -
Invoice DateInvoice NoClient NameProductHSNQuantityRateSub TotalGSTTotalInvoice DateInvoice NoClient NameProductHSNQuantityRateSub TotalGSTTotal
isactive == 1) {echo"Active";}else{echo "InActive";}?> isactive == 0) { ?> -     @@ -180,7 +180,7 @@ class="fa fa-edit">       + class="fa fa-trash auditor-restricted-btn">   
isDeleted == 0) {echo"Active";}else{echo"InActive";} ?> isDeleted == 1) { ?> - - + + @@ -165,12 +165,13 @@    - + + From 7e3c2ff636f40c918113ff33f0d97abffebc4035 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 22 Apr 2025 12:36:07 +0000 Subject: [PATCH 4/7] tracker issues-1597 --- app/Views/editOldemppay.php | 2 +- app/Views/employeeLeaveApplicationForm.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Views/editOldemppay.php b/app/Views/editOldemppay.php index b2467de2..790852dd 100755 --- a/app/Views/editOldemppay.php +++ b/app/Views/editOldemppay.php @@ -343,7 +343,7 @@ if (!empty($emppay)) {
- +
diff --git a/app/Views/employeeLeaveApplicationForm.php b/app/Views/employeeLeaveApplicationForm.php index b7bcc8d6..594a4fa5 100755 --- a/app/Views/employeeLeaveApplicationForm.php +++ b/app/Views/employeeLeaveApplicationForm.php @@ -82,7 +82,7 @@ 		From Date To Date Number Of DaysStatusStatus Action
+ - - - - - - - - - - - -
- -
- -
-
-
- -
- - -
-
- - -
- -
- - -
- -
-
- -
- - - - -
-
- - -
- -
- - - - -
- -
-

- - -
- - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PO NoPO TypePO DateReleased DateRequested DepartmentTotal Order Value  (₹)
PONO?>POType?>PODate);echo $date->format('d-m-Y'); ?>ReleasedDate);echo $date->format('d-m-Y'); ?>Dept_Name?>TotalOrderValue,2,'.',''); - echo number_format($rel->TotalOrderValue,2,'.','')?>
- -
-
- - - - - - - - - - - - - - - - + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/Report_consolidate.php b/app/Views/Report_consolidate.php index a3ca2dd8..8a58eeeb 100755 --- a/app/Views/Report_consolidate.php +++ b/app/Views/Report_consolidate.php @@ -1,153 +1,141 @@ + + }); + - -
-
-
- -
- -
-
-

Report - Consolidate

- input->post('client_name')){ - $cl=$this->input->post('client_name'); - echo $cl; - } - if($this->input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - } - - ?> -

-
- - -
+ .dataTables_filter { + /* width: 50%; */ + float: right; + text-align: right; + } -
+ .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } -
-
- -
- -
-
- - -
- -
- -
+ div.dt-buttons { + position: relative; + /* float: right; */ + + } + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Reports
    2. +
  2. Purchase
    3. +
  3. +

    Report - Purchase Consolidate

    +
    4. +
- -
-
- - - -
- - -

- - -
-
- + +
+
+
+
+
+
+ - +
-
- -
- - - + + +
+
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+
+ + + +
+ + +

+ + +
+
+ +
+ + + @@ -184,11 +172,11 @@ table.dataTable thead > tr > td.sorting { $qfeb = 0; $qmar = 0; $qtot = 0; - $ab=$this->input->post('financialyear'); + $ab= ""; foreach ($spurchse as $index=>$result) { ?>
Supplier Name Material Name
- supplier_name;?> + supplier_name;?> material_name)) { echo $result->material_name ; } else {echo "-";} @@ -405,291 +393,47 @@ table.dataTable thead > tr > td.sorting { } ?> -
- -
- - +
+ + + + - - - - - - - + + + - - - - - - + + + + + + + + + - \ No newline at end of file diff --git a/app/Views/Report_openorder.php b/app/Views/Report_openorder.php index 4184f9f2..b79259e3 100755 --- a/app/Views/Report_openorder.php +++ b/app/Views/Report_openorder.php @@ -1,252 +1,264 @@ + + - -
-
-
- -
- -
-
-

Open Orders - Pending -

- input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - echo ' '; - - } - if($this->input->post('month')){ - $m=$this->input->post('month'); - echo '('.$m.')'; - echo ' '; - } - if($this->input->post('from_date') && $this->input->post('to_date')){ - $frm = $this->input->post('from_date'); - $t = $this->input->post('to_date'); - echo $frm.'-to-'.$t; - } - if($this->input->post('total_order_value_From') && $this->input->post('total_order_value_To')){ - $tfrm = $this->input->post('total_order_value_From'); - $tt = $this->input->post('total_order_value_To'); - echo 'Total Order Value between'.' '.'RS.'.$tfrm.'-to-'.'RS.'.$tt; - } - ?> -

-
- -
- -
- -
- - - -
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
- - -
- -
- - -
- -
-
- -
- - - - -
-
- - -
- -
- - - - -
- -
-

- - -
-
-
- - - -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PO NoPO TypePO DateApproved DateRequested DepartmentTotal Order Value  (₹)
PONO?>POType?>PODate?>ApprovedDate?>Dept_Name?>TotalOrderValue,2,'.',''); - echo number_format($rel->TotalOrderValue,2,'.','')?>
- -
-
-
- -
- -
-
- - - - - - - - - - + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/Report_purchase.php b/app/Views/Report_purchase.php index dffcf848..c8006637 100755 --- a/app/Views/Report_purchase.php +++ b/app/Views/Report_purchase.php @@ -1,261 +1,190 @@ - - - - -
-
-
- -
- -
-
-

Report - Purchase -

- input->post('client_name')){ - $cl=$this->input->post('client_name'); - echo $cl; - echo ' '.' '; - } - if($this->input->post('item_name')){ - $it=$this->input->post('item_name'); - echo $it; - echo ' '.' '; - } - - if($this->input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - echo ' '; - - } - if($this->input->post('month')){ - $m=$this->input->post('month'); - echo '('.$m.')'; - echo ' '; - } - if($this->input->post('from_date') && $this->input->post('to_date')){ - $frm = $this->input->post('from_date'); - $t = $this->input->post('to_date'); - echo $frm.'-to-'.$t; - } - - ?> -

-
- - -
+ .dataTables_filter { + /* width: 50%; */ + float: right; + text-align: right; + } -
+ .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } -
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
+ div.dt-buttons { + position: relative; + /* float: right; */ + + } + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Reports
    2. +
  2. Purchase
    3. +
  3. +

    Report - Purchase

    +
    4. +
-
- -
- -
-
-
- -
- - - - -
-
- - -
- -
- - - - -
- +
-

- - -
-
- +
+
+
+
+
+ - +
-
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - "> +
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+

+ +
+ +
+
+
+ +
+ + + +
PO NoDateMaterial NameSupplier NameQuantityUOMRate  (₹)Value  (₹)Exchange RateSGST  (₹)CGST  (₹)IGST  (₹)Discount  (₹)Freight  (₹)Package  (₹)Insurance  (₹)Total  (₹)
+ + + + + + + + + + + + + + + + + + + + + + + + + + tr > td.sorting { - -
PO NoDateMaterial NameSupplier NameQuantityUOMRate  (₹)Value  (₹)Exchange RateSGST  (₹)CGST  (₹)IGST  (₹)Discount  (₹)Freight  (₹)Package  (₹)Insurance  (₹)Total  (₹)
- + + + +
+
+
-
- -
- -
-
-
- + + + - - - - - - - - - + + + + + + + - - - \ No newline at end of file +}); + \ No newline at end of file diff --git a/app/Views/Report_supplier.php b/app/Views/Report_supplier.php index 01a6984f..1d73cc98 100755 --- a/app/Views/Report_supplier.php +++ b/app/Views/Report_supplier.php @@ -1,421 +1,290 @@ - - -
-
-
- -
- -
-
-

Report - Purchase-SupplierWise

- input->post('client_name')){ - $cl=$this->input->post('client_name'); - echo $cl; - echo ' '.' '; - } - - if($this->input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - echo ' '; - - } - if($this->input->post('month')){ - $m=$this->input->post('month'); - echo '('.$m.')'; - echo ' '; - } - if($this->input->post('from_date') && $this->input->post('to_date')){ - $frm = $this->input->post('from_date'); - $t = $this->input->post('to_date'); - echo $frm.'to'.$t; - } - - ?>

-
- - -
+ .dataTables_filter input { + padding: 4px; + } -
+ .dataTables_filter { + /* width: 50%; */ + float: right; + text-align: right; + } -
-
- -
- -
-
- - -
- -
- -
-
-
- -
- -
-
-
- -
- - - - -
-
+ .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } - -
- -
- - - - + div.dt-buttons { + position: relative; + /* float: right; */ + + } + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Reports
    2. +
  2. Purchase
    3. +
  3. +

    Report - Purchase supplier wise

    +
    4. +
- +
-

- - -
-
- - - - -
- - - -
-
- - - - - - - - - - - - - input->post('financialyear'); - $month=$this->input->post('month'); - $frm = $this->input->post('from_date'); - $t = $this->input->post('to_date'); - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NamePO CountQuantityValue  (₹)
- supplier_name;?> - counts); - echo round($rel->counts);?>quantity); - echo round($rel->quantity);?>value; - echo number_format($rel->value,2,'.','');?>
Total - - - - - - - - - - -
- +
+
+
+
+
+ + +
+ +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+

+ +
+ +
+
+
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NamePO CountQuantityValue  (₹)
+ supplier_name?> + counts); + echo round($rel->counts);?>quantity); + echo round($rel->quantity);?>value; + echo number_format($rel->value,2,'.','');?>
Total + + + + + + + + + + +
+
+
+
-
- -
- -
-
-
+
+ + - - - - - - - - + + + + + + + - - - \ No newline at end of file +}); + \ No newline at end of file diff --git a/app/Views/Report_totalorders.php b/app/Views/Report_totalorders.php index 88376871..b00883e8 100755 --- a/app/Views/Report_totalorders.php +++ b/app/Views/Report_totalorders.php @@ -1,110 +1,106 @@ - -
-
-
- -
- -
-
-

Total Orders -

- input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - echo ' '; - - } - - ?>

-
- -
- - -
-
-
-
-
-
-
+
+
+
+
+
+
+ + +
+ + +
+ +
+
+ +
-
- - - -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -127,30 +123,31 @@ } ?> - -
DepartmentPO CreatedSpecial POApprover OnholdApprovedReleaser OnholdReleasedIGR CreatedMRIR RejectedMRIR ApprovedService completed
DepartmentPO CreatedSpecial POApprover OnholdApprovedReleaser OnholdReleasedIGR CreatedMRIR RejectedMRIR ApprovedService completed
- + + + + + +
+
+
-
- -
- - - - - + + + - - - - - - - - + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/Report_year_wise.php b/app/Views/Report_year_wise.php index e6907b5b..106db822 100755 --- a/app/Views/Report_year_wise.php +++ b/app/Views/Report_year_wise.php @@ -1,118 +1,133 @@ + + + - -
-
-
- -
- -
-
-

Report - Year-Wise

- input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - echo ' '; - - } - - ?>

-
- - -
- -
-
-
-
-
-
- -
-
-
-
- -
- - -
-
- - - - - - - - - - - + + +
+
+
+ + +
+ +
+
+
+
+ +
+
+

+ +
+ +
+
+
+ +
+ + + +
Month-YearQuantityTotal Value  (₹)
+ + + + + + + + + + - + @@ -124,15 +139,13 @@ - @@ -162,119 +175,44 @@ -
Month-YearQuantityTotal Value  (₹)
+ created_date); $new = date('M-y', $date); $pass = date('Y-m-d',$date); - $ab=$this->input->post('financialyear'); - //echo $new; + echo $new; ?> - - quantity; echo round($rel->quantity);?>
input->post('financialyear'); - $Total="Total"; - echo anchor('report/year_wise_total/' . $ab,$Total); ?> + Total
- + + +
+
+
-
-
- - - - - - - + + + - - - - - - - - + + + + + + + - - - \ No newline at end of file +}); + \ No newline at end of file diff --git a/app/Views/report_pendingreqst.php b/app/Views/report_pendingreqst.php index 7467326c..6988c8ee 100755 --- a/app/Views/report_pendingreqst.php +++ b/app/Views/report_pendingreqst.php @@ -1,277 +1,260 @@ + + + - -
-
- -
- -
- -
-
-

Total Pending Requests -

- -

-
- -
- + } + - -
"> - -
- - - -
- -
- -
+
+
+ +
+ +
+
+
+
+
+
    +
  1. Reports
    2. +
  2. Requisation
    3. +
  3. +

    Pending

    +
    4. +
-
- -
- -
-
-
- -
- - -
-
- - -
- -
- - -
- +
-
- -
- - - - -
-
- - -
- -
- - - - -
- -
-

- - -
-
- - - - -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Requistion DateRequistion NumberRequested ByDepartmentRequistion TypeAging
ReqDate?>ReqNo?>Requestedby?>DepartmentName?>ReqType?>Aging?>
- +
-
-
- -
- -
-
+
+
+
+ -
- - - - - - - +
- +
+ +
+
+ +
+ +
+
- + + + + + + + - \ No newline at end of file diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index c03055cd..a136b0b2 100755 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -19,27 +19,24 @@

  Requisition

-

Pending

-

Order Value - Released

-

Open Orders - Pending

-

Total Orders

+

Pending

 +

Order Value Released

 +

Open Orders - Pending

 +

Total Orders

  Purchase

-

Purchase

 -

Year Wise

-

Pending

 -

Purchase Supplier - Wise

-

Consolidate Report

-

Cumulative Report

- +

Purchase

 +

Year Wise

 +

Pending Purchase

 +

purchase - Supplier Wise

 +

purchase - Consolidate

  Material Master

Material Master - supplier wise

Material Master - Item wise

Material Master - Receipt Value

-

  Inward

@@ -61,14 +58,17 @@

Cost Cente

Production Salary Cost

+ + -
+

Cashbook Monthly Expenses

 +

Cashbook Yearly Expenses

 +
-->

  GST Reports

Monthly GST Summary Report

From e2feca4520e7d4595aaa6428745b6a424215ed3e Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Wed, 23 Apr 2025 03:40:38 +0000 Subject: [PATCH 6/7] reports 1 --- app/Config/Routes.php | 16 +++++++++++++++- app/Controllers/Report.php | 8 ++++++++ app/Models/Dashboard_model.php | 4 +++- app/Views/reportslink.php | 6 +++--- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index fe8150a7..a56d708e 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -547,4 +547,18 @@ $routes->post('updateAbstractDetails','StockController::updateAbstractDetails'); //Reports Module -$routes->get('allReports','Report::allReports'); \ No newline at end of file +$routes->get('allReports','Report::allReports'); + +// Material Report Links +$routes->get('MM_Supplier', 'Report::MM_Supplier'); +$routes->get('MM_Item','Report::MM_Item'); +$routes->match(['GET', 'POST'],'MM_ReceiptValue','Report::MM_ReceiptValue'); + +//Inward Report Links +$routes->match(['GET', 'POST'],'ipurchase','Report::ipurchase'); +$routes->match(['GET', 'POST'],'iyear_wise', 'Report::iyear_wise'); +$routes->match(['GET', 'POST'],'ipurchase_supplier' , 'Report::ipurchase_supplier'); +$routes->match(['GET', 'POST'],'iconsolidate' , 'Report::iconsolidate'); +$routes->match(['GET', 'POST'],'icumulative' , 'Report::icumulative'); +$routes->match(['GET', 'POST'],'rawi_cumulative' , 'Report::rawi_cumulative'); +$routes->match(['GET', 'POST'],'rawi_consolidate' , 'Report::rawi_consolidate'); \ No newline at end of file diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index 36f1c166..85f04e75 100755 --- a/app/Controllers/Report.php +++ b/app/Controllers/Report.php @@ -219,6 +219,8 @@ class Report extends BaseController $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['month'] = $m; + $data['financialyear'] = $ab; $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['mmr'] = $this->dahsboard_Model->report_MMReceiptValue($fa, $aa, $m); } @@ -541,14 +543,20 @@ class Report extends BaseController $this->global['pageTitle'] = 'Inward PO Reports'; if ($this->request->getPost('btn_submit')) { $cname = $this->request->getPost('client_name'); + $data['client_name'] = $cname; $prod = $this->request->getPost('item_name'); + $data['item_name'] = $prod; $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $cat = $this->request->getVar('cat'); $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['month'] = $m; $frm = $this->request->getPost('from_date'); + $data['frm'] = $frm; $t = $this->request->getPost('to_date'); + $data['t'] = $t; //print_r($prod); $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php index 3bfa49d0..87de7b9f 100755 --- a/app/Models/Dashboard_model.php +++ b/app/Models/Dashboard_model.php @@ -875,7 +875,9 @@ group by po.SupplierID,pl.MaterialCode"; { - $sql = "SELECT MaterialCode,MaterialName,UOM,Category,HSNCODE FROM t_materialmaster group by MaterialCode"; + $sql = "SELECT MaterialCode,MaterialName,UOM, t_configdetails.ConfigValue as Category,HSNCODE FROM t_materialmaster + join t_configdetails on t_configdetails.key = t_materialmaster.Category + group by MaterialCode"; $query = $this->db->query($sql); return $query->getResult(); } diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index c03055cd..52025981 100755 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -36,9 +36,9 @@

  Material Master

-

Material Master - supplier wise

-

Material Master - Item wise

-

Material Master - Receipt Value

+

Material Master - supplier wise

 +

Material Master - Item wise

 +

Material Master - Receipt Value
From 3f83e170bb9206ecd7a5b44a4f40d1465bb21223 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Wed, 23 Apr 2025 03:52:30 +0000 Subject: [PATCH 7/7] merge with material --- app/Views/reportslink.php | 101 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 app/Views/reportslink.php diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php new file mode 100644 index 00000000..a136b0b2 --- /dev/null +++ b/app/Views/reportslink.php @@ -0,0 +1,101 @@ +
+
+ +
+ +
+
+
+

+
+
+
+ + +
+
+
+
+
+
+

  Requisition

+

Pending

 +

Order Value Released

 +

Open Orders - Pending

 +

Total Orders

 +
+
+

  Purchase

+

Purchase

 +

Year Wise

 +

Pending Purchase

 +

purchase - Supplier Wise

 +

purchase - Consolidate

 +
+
+

  Material Master

+

Material Master - supplier wise

+

Material Master - Item wise

+

Material Master - Receipt Value

+
+
+

  Inward

+

Inward Details

+

Inward Summary

+

Year Wise-Inward

+

Inward-Supplier Wise

+

Consolidate Report-Inward

+

Cumulative Report-Inward

+

Cumulative Report - Category Wise-Inward

+

Consolidate Report - Category Wise-Inward

+

Report - DeliveryPerformance

+
+
+
+
+
+

  Finance Reports

+

Cost Cente

+

Production Salary Cost

+
+ + +
+

  GST Reports

+

Monthly GST Summary Report

+
+
+

  Sales Reports

+

Invoice Report

 +
+ +
+
+
+
+

  PayRoll

+

Employee Payroll

+
+
+

  Attendance

+

Employee Attendance

+

Employee Performance

+

Leave Report

 +
+
+
+
+
+
+
+
+
\ No newline at end of file