From bed68d3ec9bcd21d9ad867f9ae7d2d4a7f76c349 Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Mon, 22 Jan 2024 11:47:00 +0530
Subject: [PATCH] Jan 22 [UPDT] : Updated 'sale_report_advanced'

---
 sale_report_advanced/doc/RELEASE_NOTES.md          |  6 ++++++
 .../report/sales_weekly_templates.xml              |  3 +++
 sale_report_advanced/wizard/sale_report_weekly.py  | 14 ++++++--------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/sale_report_advanced/doc/RELEASE_NOTES.md b/sale_report_advanced/doc/RELEASE_NOTES.md
index 5845e1b3b..2d68e4eab 100644
--- a/sale_report_advanced/doc/RELEASE_NOTES.md
+++ b/sale_report_advanced/doc/RELEASE_NOTES.md
@@ -4,3 +4,9 @@
 #### Version 17.0.1.0.0
 ##### ADD
 - Initial Commit for Advanced Sales Reports
+
+#### 18.01.2024
+#### Version 17.0.1.0.1
+##### UPDT
+- Changed Hourly Report
+- 
\ No newline at end of file
diff --git a/sale_report_advanced/report/sales_weekly_templates.xml b/sale_report_advanced/report/sales_weekly_templates.xml
index b5ab57fab..28a43454b 100644
--- a/sale_report_advanced/report/sales_weekly_templates.xml
+++ b/sale_report_advanced/report/sales_weekly_templates.xml
@@ -14,6 +14,7 @@
                         </b>
                     </center>
                     <t t-foreach="times" t-as="t" t-key="t">
+                        <t t-log="t"/>
                         <center>
                             <b>
                                 <t t-out="t" style="font-size:21px;"/>
@@ -35,6 +36,7 @@
                             </thead>
                             <tbody>
                                 <tr t-foreach="form" t-as="order" t-key="order">
+                                    <t t-if="order['time'] == t">
                                     <td>
                                         <t t-esc="order['order']"/>
                                     </td>
@@ -46,6 +48,7 @@
                                         <t t-set="t_amt"
                                            t-value="t_amt + order['amount']"></t>
                                     </td>
+                                    </t>
                                 </tr>
                                 <tr>
                                     <td colsapn="3">
diff --git a/sale_report_advanced/wizard/sale_report_weekly.py b/sale_report_advanced/wizard/sale_report_weekly.py
index 4117e78dd..f8347a460 100644
--- a/sale_report_advanced/wizard/sale_report_weekly.py
+++ b/sale_report_advanced/wizard/sale_report_weekly.py
@@ -76,7 +76,6 @@ class SaleReportWeekly(models.TransientModel):
             ('date_order', '>=', self.date),
             ('state', '!=', 'cancel')
         ])
-        print('saaa',sale_orders)
         if not sale_orders:
             raise ValidationError("No data available for printing.")
         for rec in sale_orders:
@@ -95,7 +94,6 @@ class SaleReportWeekly(models.TransientModel):
                         'date': rec.date_order.date()
                     }
                     result.append(res)
-                    print('res', res)
         if not result:
             raise ValidationError("No data available for printing.")
         datas = {
@@ -106,7 +104,6 @@ class SaleReportWeekly(models.TransientModel):
             'type': self.amount_type,
             'times': times
         }
-        print('datas',datas)
         return datas
 
     def _get_time_start(self, time_id):
@@ -136,6 +133,7 @@ class SaleReportWeekly(models.TransientModel):
 
     def get_xlsx_report(self, data, response):
         """ Function for generating xlsx report """
+        loaded_data = json.loads(data)
         output = io.BytesIO()
         workbook = xlsxwriter.Workbook(output, {'in_memory': True})
         sheet = workbook.add_worksheet()
@@ -158,10 +156,10 @@ class SaleReportWeekly(models.TransientModel):
         count = 0
         row = 4
         row_number = 5
-        for rec in data['times']:
+        for rec in loaded_data['times']:
             col = 6
             row = row + count + 4
-            sheet.merge_range(h_row, h_col - 1, h_row, h_col + 1, rec['name'],
+            sheet.merge_range(h_row, h_col - 1, h_row, h_col + 1, rec,
                               format3)
             sheet.write(row, col, 'Order', format2)
             sheet.set_column(row, col, 15)
@@ -169,7 +167,7 @@ class SaleReportWeekly(models.TransientModel):
             sheet.write(row, col, 'Date', format2)
             sheet.set_column(row, col, 15)
             col += 1
-            if data['type'] == 'total':
+            if loaded_data['type'] == 'total':
                 sheet.write(row, col, 'Total', format2)
                 sheet.set_column(row, col, 15)
                 col += 1
@@ -181,8 +179,8 @@ class SaleReportWeekly(models.TransientModel):
             row_number = row_number + 4
             count = 0
             t_col = 7
-            for val in data['form']:
-                if val['time'] == rec['id']:
+            for val in loaded_data['form']:
+                if val['time'] == rec:
                     count += 1
                     column_number = 6
                     sheet.write(row_number, column_number, val['order'],