From 1c88f24b55538439ffe9319ff3f7e700399bbcf7 Mon Sep 17 00:00:00 2001 From: Cybrosys Technologies Date: Fri, 30 Aug 2024 15:57:51 +0530 Subject: [PATCH] Aug 30: [FIX] Bug Fixed 'warehouse_reports' --- warehouse_reports/__manifest__.py | 2 +- warehouse_reports/doc/RELEASE_NOTES.md | 5 ++ .../description/assets/screenshots/hero.gif | Bin .../screenshots/warehouse_report_10.png | Bin .../screenshots/warehouse_report_13.png | Bin .../screenshots/warehouse_report_14.png | Bin .../screenshots/warehouse_report_15.png | Bin .../screenshots/warehouse_report_16.png | Bin .../screenshots/warehouse_report_20.png | Bin .../wizards/stock_valuation_report.py | 69 +++++++++--------- 10 files changed, 41 insertions(+), 35 deletions(-) mode change 100644 => 100755 warehouse_reports/static/description/assets/screenshots/hero.gif mode change 100644 => 100755 warehouse_reports/static/description/assets/screenshots/warehouse_report_10.png mode change 100644 => 100755 warehouse_reports/static/description/assets/screenshots/warehouse_report_13.png mode change 100644 => 100755 warehouse_reports/static/description/assets/screenshots/warehouse_report_14.png mode change 100644 => 100755 warehouse_reports/static/description/assets/screenshots/warehouse_report_15.png mode change 100644 => 100755 warehouse_reports/static/description/assets/screenshots/warehouse_report_16.png mode change 100644 => 100755 warehouse_reports/static/description/assets/screenshots/warehouse_report_20.png diff --git a/warehouse_reports/__manifest__.py b/warehouse_reports/__manifest__.py index 346d6d236..260b98e85 100755 --- a/warehouse_reports/__manifest__.py +++ b/warehouse_reports/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': "Warehouse Reports", - "version": "16.0.1.0.0", + "version": "16.0.1.0.1", "category": "Warehouse", "summary": "All warehouse related PDF and Excel reports", "description": "User is able to print Pdf and Excel report of Stock move," diff --git a/warehouse_reports/doc/RELEASE_NOTES.md b/warehouse_reports/doc/RELEASE_NOTES.md index 8ea06ade6..fd1a8421f 100755 --- a/warehouse_reports/doc/RELEASE_NOTES.md +++ b/warehouse_reports/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### Version 16.0.1.0.0 #### ADD - Initial commit for Warehouse Reports + +#### 22.08.2024 +#### Version 16.0.1.0.1 +#### FIX +- Bug fix for not updating the latest valuation in the Stock Valuation Reports diff --git a/warehouse_reports/static/description/assets/screenshots/hero.gif b/warehouse_reports/static/description/assets/screenshots/hero.gif old mode 100644 new mode 100755 diff --git a/warehouse_reports/static/description/assets/screenshots/warehouse_report_10.png b/warehouse_reports/static/description/assets/screenshots/warehouse_report_10.png old mode 100644 new mode 100755 diff --git a/warehouse_reports/static/description/assets/screenshots/warehouse_report_13.png b/warehouse_reports/static/description/assets/screenshots/warehouse_report_13.png old mode 100644 new mode 100755 diff --git a/warehouse_reports/static/description/assets/screenshots/warehouse_report_14.png b/warehouse_reports/static/description/assets/screenshots/warehouse_report_14.png old mode 100644 new mode 100755 diff --git a/warehouse_reports/static/description/assets/screenshots/warehouse_report_15.png b/warehouse_reports/static/description/assets/screenshots/warehouse_report_15.png old mode 100644 new mode 100755 diff --git a/warehouse_reports/static/description/assets/screenshots/warehouse_report_16.png b/warehouse_reports/static/description/assets/screenshots/warehouse_report_16.png old mode 100644 new mode 100755 diff --git a/warehouse_reports/static/description/assets/screenshots/warehouse_report_20.png b/warehouse_reports/static/description/assets/screenshots/warehouse_report_20.png old mode 100644 new mode 100755 diff --git a/warehouse_reports/wizards/stock_valuation_report.py b/warehouse_reports/wizards/stock_valuation_report.py index e438dbca9..94030b99b 100755 --- a/warehouse_reports/wizards/stock_valuation_report.py +++ b/warehouse_reports/wizards/stock_valuation_report.py @@ -23,6 +23,7 @@ import io import json import xlsxwriter from odoo import fields, models +from odoo.exceptions import ValidationError from odoo.tools import date_utils @@ -75,31 +76,31 @@ class StockValuationReport(models.TransientModel): if self.product_id and self.company_id: self.env.cr.execute( """{}where product_product.id='{}' and stock_valuation_layer.company_id - ='{}' and stock_valuation_layer.create_date >='{}' - and stock_valuation_layer.create_date<'{}'""".format( + ='{}'""".format( query, product_id, company_id, - from_date, - to_date)) + )) elif self.product_id and self.company_id: self.env.cr.execute( """{}where product_product.id='{}' and - stock_valuation_layer.company_id ='{}' and - stock_valuation_layer.create_date >='{}' and - stock_valuation_layer.create_date<'{}'""".format( - query, product_id, company_id, from_date, - to_date)) + stock_valuation_layer.company_id ='{}'""".format( + query, product_id, company_id)) elif self.product_id: self.env.cr.execute( - """{}where product_product.id='{}' and - stock_valuation_layer.create_date >='{}' and - stock_valuation_layer.create_date<'{}'""".format( - query, product_id, from_date, to_date)) + """{}where product_product.id='{}'""".format( + query, product_id)) elif self.company_id: self.env.cr.execute( - """{} where stock_valuation_layer.company_id='{}' and - stock_valuation_layer.create_date >='{}' and - stock_valuation_layer.create_date<'{}'""".format( - query, company_id, from_date, to_date)) + """{} where stock_valuation_layer.company_id='{}' """.format( + query, company_id)) + elif self.from_Date: + self.env.cr.execute( + """{} where stock_valuation_layer.create_date >= '{}' """.format(query, from_date)) + elif self.to_date: + self.env.cr.execute( + """{} where stock_valuation_layer.create_date <= '{}' """.format(query, to_date)) + if from_date and to_date: + if to_date < from_date: + raise ValidationError('Sorry, To Date Must be greater Than From Date...') else: self.env.cr.execute("""{}""".format(query)) stock_valuation = self.env.cr.dictfetchall() @@ -146,31 +147,31 @@ class StockValuationReport(models.TransientModel): if self.product_id and self.company_id: self.env.cr.execute( """{}where product_product.id='{}' and stock_valuation_layer.company_id - ='{}' and stock_valuation_layer.create_date >='{}' - and stock_valuation_layer.create_date<'{}'""".format( + ='{}'""".format( query, product_id, company_id, - from_date, - to_date)) + )) elif self.product_id and self.company_id: self.env.cr.execute( """{}where product_product.id='{}' and - stock_valuation_layer.company_id ='{}' and - stock_valuation_layer.create_date >='{}' and - stock_valuation_layer.create_date<'{}'""".format( - query, product_id, company_id, from_date, - to_date)) + stock_valuation_layer.company_id ='{}'""".format( + query, product_id, company_id)) elif self.product_id: self.env.cr.execute( - """{}where product_product.id='{}' and - stock_valuation_layer.create_date >='{}' and - stock_valuation_layer.create_date<'{}'""".format( - query, product_id, from_date, to_date)) + """{}where product_product.id='{}'""".format( + query, product_id)) elif self.company_id: self.env.cr.execute( - """{} where stock_valuation_layer.company_id='{}' and - stock_valuation_layer.create_date >='{}' and - stock_valuation_layer.create_date<'{}'""".format( - query, company_id, from_date, to_date)) + """{} where stock_valuation_layer.company_id='{}' """.format( + query, company_id)) + elif self.from_Date: + self.env.cr.execute( + """{} where stock_valuation_layer.create_date >= '{}' """.format(query, from_date)) + elif self.to_date: + self.env.cr.execute( + """{} where stock_valuation_layer.create_date <= '{}' """.format(query, to_date)) + if from_date and to_date: + if to_date < from_date: + raise ValidationError('Sorry, To Date Must be greater Than From Date...') else: self.env.cr.execute("""{}""".format(query)) stock_valuation = self.env.cr.dictfetchall()