Merge pull request #210 from OCA/14.0

Syncing from upstream OCA/sale-reporting (14.0)
brain-tec · Apr 4, 2024 · 2ef5fc6 · 2ef5fc6
2 parents 196dc85 + fded214
commit 2ef5fc6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ addon | version | maintainers | summary
 [sale_backorder](sale_backorder/) | 14.0.1.0.0 | [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) | Report of Un-Invoice Goods Delivered and Backorders
 [sale_comment_template](sale_comment_template/) | 14.0.2.1.2 |  | Comments texts templates on Sale documents
 [sale_layout_category_hide_detail](sale_layout_category_hide_detail/) | 14.0.1.0.3 |  | Hide details for sections in sale orders and invoices for reports and customer portal
-[sale_order_invoice_date](sale_order_invoice_date/) | 14.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Display the invoice date on Sales Order analysis reports
+[sale_order_invoice_date](sale_order_invoice_date/) | 14.0.1.0.1 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Display the invoice date on Sales Order analysis reports
 [sale_order_line_position](sale_order_line_position/) | 14.0.1.2.0 |  | Adds position number on sale order line.
 [sale_order_report_product_image](sale_order_report_product_image/) | 14.0.1.0.0 |  | Show product images on Sale documents
 [sale_order_weight](sale_order_weight/) | 14.0.1.0.0 |  | Add products weight in report for sale order

diff --git a/sale_order_invoice_date/README.rst b/sale_order_invoice_date/README.rst
@@ -7,7 +7,7 @@ Sale Order Invoice Date
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:8aa4f52b8b33db8b9d8941b86507926c0350336764e767e7ec8654ccf796eb84
+   !! source digest: sha256:0aed8f342f792d9dafd85814801c4ed5ba82f517c3542444be65f43bd2a2c6c5
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/sale_order_invoice_date/__manifest__.py b/sale_order_invoice_date/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Sale Order Invoice Date",
     "summary": "Display the invoice date on Sales Order analysis reports",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.0.1",
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "maintainers": ["ivantodorovich"],
     "website": "https://github.com/OCA/sale-reporting",

diff --git a/sale_order_invoice_date/reports/sale_report.py b/sale_order_invoice_date/reports/sale_report.py
@@ -10,9 +10,9 @@ class SaleReport(models.Model):
 
     invoice_date = fields.Date(readonly=True)
 
-    def _select_sale(self, fields=None):
-        res = super()._select_sale(fields=fields)
-        return f"{res}, l.invoice_date"
+    def _select_additional_fields(self, fields):
+        fields["invoice_date"] = ", l.invoice_date as invoice_date"
+        return super()._select_additional_fields(fields)
 
     def _group_by_sale(self, groupby=""):
         res = super()._group_by_sale(groupby=groupby)

diff --git a/sale_order_invoice_date/static/description/index.html b/sale_order_invoice_date/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Sale Order Invoice Date</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:8aa4f52b8b33db8b9d8941b86507926c0350336764e767e7ec8654ccf796eb84
+!! source digest: sha256:0aed8f342f792d9dafd85814801c4ed5ba82f517c3542444be65f43bd2a2c6c5
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/sale-reporting/tree/14.0/sale_order_invoice_date"><img alt="OCA/sale-reporting" src="https://img.shields.io/badge/github-OCA%2Fsale--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-reporting-14-0/sale-reporting-14-0-sale_order_invoice_date"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/sale-reporting&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Display the invoice date on Sales Order analysis reports.</p>