From d9ba4081ce0a981f7ff07e70626a0c01754beba5 Mon Sep 17 00:00:00 2001
From: Venba <bitbucket@venbainfotech.com>
Date: Wed, 18 Dec 2024 07:03:55 +0000
Subject: [PATCH 1/5] Ipinvoice_model.php edited online with Bitbucket

---
 app/Models/Ipinvoice_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php
index ad7999cf..b2542e48 100755
--- a/app/Models/Ipinvoice_model.php
+++ b/app/Models/Ipinvoice_model.php
@@ -425,7 +425,7 @@ class Ipinvoice_model extends Model
             ->join('ip_tax_rates igst', 'igst.tax_rate_id = iit.igst_item_tax_rate_id', 'left')
             ->join('ip_tax_rates tcs', 'tcs.tax_rate_id = tc.tax_rate_id', 'left')
             ->where('icf.invoice_custom_fieldid', $vehicleCustomFieldId)
-            ->where('ii.invoice_status_id', 2)
+            ->whereIn('a.invoice_status_id', [2,5]);
             ->where('ii.invoice_date_created', date('Y-m-d'))
             ->groupBy('ii.invoice_number, iit.item_description')
             ->orderBy('ii.invoice_number');

From 07fb22f8383cb954def8a25a195c7a668c7391ee Mon Sep 17 00:00:00 2001
From: Venba <bitbucket@venbainfotech.com>
Date: Wed, 18 Dec 2024 07:07:47 +0000
Subject: [PATCH 2/5] Ipinvoice_model.php edited online with Bitbucket

---
 app/Models/Ipinvoice_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php
index b2542e48..a421d26f 100755
--- a/app/Models/Ipinvoice_model.php
+++ b/app/Models/Ipinvoice_model.php
@@ -425,7 +425,7 @@ class Ipinvoice_model extends Model
             ->join('ip_tax_rates igst', 'igst.tax_rate_id = iit.igst_item_tax_rate_id', 'left')
             ->join('ip_tax_rates tcs', 'tcs.tax_rate_id = tc.tax_rate_id', 'left')
             ->where('icf.invoice_custom_fieldid', $vehicleCustomFieldId)
-            ->whereIn('a.invoice_status_id', [2,5]);
+            ->whereIn('ii.invoice_status_id', [2,5])
             ->where('ii.invoice_date_created', date('Y-m-d'))
             ->groupBy('ii.invoice_number, iit.item_description')
             ->orderBy('ii.invoice_number');

From af17f9a563ec0868318d98e359b9b7d69b890d8e Mon Sep 17 00:00:00 2001
From: Venba <bitbucket@venbainfotech.com>
Date: Wed, 18 Dec 2024 07:26:47 +0000
Subject: [PATCH 3/5] Ipinvoice_model.php edited online with Bitbucket

---
 app/Models/Ipinvoice_model.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php
index a421d26f..ede1b0bb 100755
--- a/app/Models/Ipinvoice_model.php
+++ b/app/Models/Ipinvoice_model.php
@@ -348,7 +348,7 @@ class Ipinvoice_model extends Model
             ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
             ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
             ->where('a.invoice_date_created >=', $fiscalYearStartCurrent)
-            ->where('a.invoice_status_id', 2)
+            ->whereIn('a.invoice_status_id', [2,5])
             ->groupBy("DATE_FORMAT(a.invoice_date_created, '%b')")
             ->orderBy('MONTH(a.invoice_date_created)');
 
@@ -360,7 +360,7 @@ class Ipinvoice_model extends Model
             ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
             ->where('a.invoice_date_created >=', $fiscalYearStartLast)
             ->where('a.invoice_date_created <', $fiscalYearStartCurrent)
-            ->where('a.invoice_status_id', 2)
+            ->whereIn('a.invoice_status_id', [2,5])
             ->groupBy("DATE_FORMAT(a.invoice_date_created, '%b')")
             ->orderBy('MONTH(a.invoice_date_created)');
 
@@ -412,8 +412,8 @@ class Ipinvoice_model extends Model
                 SUM(iia.item_cgst_amt) AS 'CGST',
                 SUM(iia.item_sgst_amt) AS 'SGST',
                 SUM(iia.item_igst_amt) AS 'IGST',
-                SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)) AS 'TCS',
-                SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)) + SUM(iia.item_total) AS 'Total'
+                truncate(SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)),2) AS 'TCS',
+                truncate(SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)) + SUM(iia.item_total),2) AS 'Total'
             ")
             ->join('ip_invoice_custom icf', 'icf.invoice_id = ii.invoice_id', 'left')
             ->join('ip_invoice_tax_rates tc', 'tc.invoice_id = ii.invoice_id', 'left')

From 40952c832044a8761317ee39d2858396d191941d Mon Sep 17 00:00:00 2001
From: Venba <bitbucket@venbainfotech.com>
Date: Wed, 18 Dec 2024 07:35:43 +0000
Subject: [PATCH 4/5] sales_invoice.php edited online with Bitbucket

---
 app/Views/sales_invoice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php
index 7d1e9b5a..799e0ae0 100755
--- a/app/Views/sales_invoice.php
+++ b/app/Views/sales_invoice.php
@@ -171,8 +171,8 @@
                                             <th>Invoice No</th>
                                             <th>Client Name</th>
                                             <th>Product</th>
-                                            <th>Rate</th>
                                             <th>Quantity</th>
+                                            <th>Rate</th>
                                             <th>Sub Total</th>
                                             <th>GST</th>
                                             <th>Total</th>
@@ -205,8 +205,8 @@
                                                     </td>
                                                     <td><?php echo $invoice->client_name ?></td>
                                                     <td><?php echo $invoice->item_name ?></td>
-                                                    <td align="right"><?php echo number_format($invoice->item_price, 2, '.', ',') ?></td>
                                                     <td align="right"><?php echo number_format($invoice->item_quantity, 2, '.', ',') ?></td>
+                                                    <td align="right"><?php echo number_format($invoice->item_price, 2, '.', ',') ?></td>
                                                     <td align="right"><?php echo number_format($subtotal, 2, '.', ',') ?></td>
                                                     <td align="right"><?php echo number_format($cgst_amount + $sgst_amount, 2, '.', ',') ?></td>
                                                     <td align="right"><?php echo number_format($total, 2, '.', ',') ?></td>

From 2fbbea433a79d08950869da7f67d7dd0bbffba8d Mon Sep 17 00:00:00 2001
From: Venba <bitbucket@venbainfotech.com>
Date: Wed, 18 Dec 2024 07:51:29 +0000
Subject: [PATCH 5/5] sales_invoice.php edited online with Bitbucket

---
 app/Views/sales_invoice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php
index 799e0ae0..673c09b2 100755
--- a/app/Views/sales_invoice.php
+++ b/app/Views/sales_invoice.php
@@ -177,7 +177,7 @@
                                             <th>GST</th>
                                             <th>Total</th>
                                             <th>Status</th>
-                                            <th>E-Invoice Number</th>
+                                           <!-- <th>E-Invoice Number</th> -->
                                             <th>Action</th>
                                         </tr>
                                     </thead>
@@ -211,7 +211,7 @@
                                                     <td align="right"><?php echo number_format($cgst_amount + $sgst_amount, 2, '.', ',') ?></td>
                                                     <td align="right"><?php echo number_format($total, 2, '.', ',') ?></td>
                                                     <td><?php echo $invoice->status ?></td>
-                                                    <td><?php echo $invoice->e_invoice_number; ?></td>
+                                                   <!-- <td><?php echo $invoice->e_invoice_number; ?></td> -->
                                                     <td>
                                                         <a class="edit-button" style="cursor: pointer; display: inline-block;" title="Files Upload" onclick="openInvoiceModal('<?php echo $invoice->invoice_number; ?>', '<?php echo $invoice->client_name; ?>', '<?php echo $invoice->invoice_date_created; ?>', '<?php echo $invoice->invoice_id; ?>')">
                                                             <i class="fas fa-file-upload text-muted" style="font-size: 18px; vertical-align: middle;"></i>