Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[15.0][IMP] account_financial_report: VAT report fields translation #1172

Open
wants to merge 2 commits into
base: 15.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion account_financial_report/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Account Financial Reports
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:80acd6b2fff0b0817cc7e978b4eb91669c3e6a9d6e1289d4721e8a790f858f1c
!! source digest: sha256:dde50b33a9e349d2370cbdcc2ed14cb1cd591e459d12dcd8da574cf4fc07c246
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -182,6 +182,10 @@ Contributors
Much of the work in this module was done at a sprint in Sorrento, Italy in
April 2016.

* Ooops404 <https://www.ooops404.com>

* Eduard Brahas <[email protected]>

Maintainers
~~~~~~~~~~~

Expand Down
4 changes: 4 additions & 0 deletions account_financial_report/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@

Much of the work in this module was done at a sprint in Sorrento, Italy in
April 2016.

* Ooops404 <https://www.ooops404.com>

* Eduard Brahas <[email protected]>
4 changes: 2 additions & 2 deletions account_financial_report/report/templates/vat_report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@
</div>
<div class="act_as_row">
<div class="act_as_cell">
<span t-esc="date_from" />
<span t-esc="date_from" t-options="{'widget': 'date'}" />
</div>
<div class="act_as_cell">
<span t-esc="date_to" />
<span t-esc="date_to" t-options="{'widget': 'date'}" />
</div>
<div class="act_as_cell">
<span t-esc="based_on" />
Expand Down
16 changes: 10 additions & 6 deletions account_financial_report/report/vat_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import operator

from odoo import api, models
from odoo import api, fields, models


class VATReport(models.AbstractModel):
Expand Down Expand Up @@ -200,8 +200,8 @@ def _get_report_values(self, docids, data):
wizard_id = data["wizard_id"]
company = self.env["res.company"].browse(data["company_id"])
company_id = data["company_id"]
date_from = data["date_from"]
date_to = data["date_to"]
date_from = fields.Date.from_string(data["date_from"])
date_to = fields.Date.from_string(data["date_to"])
based_on = data["based_on"]
tax_detail = data["tax_detail"]
only_posted_moves = data["only_posted_moves"]
Expand All @@ -222,9 +222,13 @@ def _get_report_values(self, docids, data):
"docs": self.env["open.items.report.wizard"].browse(wizard_id),
"company_name": company.display_name,
"currency_name": company.currency_id.name,
"date_to": data["date_to"],
"date_from": data["date_from"],
"based_on": data["based_on"],
"date_from": date_from,
"date_to": date_to,
"based_on": dict(
self.env["vat.report.wizard"]
._fields["based_on"]
._description_selection(self.env)
).get(data["based_on"]),
"tax_detail": data["tax_detail"],
"vat_report": vat_report,
}
Expand Down
9 changes: 8 additions & 1 deletion account_financial_report/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Expand Down Expand Up @@ -367,7 +368,7 @@ <h1 class="title">Account Financial Reports</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:80acd6b2fff0b0817cc7e978b4eb91669c3e6a9d6e1289d4721e8a790f858f1c
!! source digest: sha256:dde50b33a9e349d2370cbdcc2ed14cb1cd591e459d12dcd8da574cf4fc07c246
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/account-financial-reporting/tree/15.0/account_financial_report"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-reporting-15-0/account-financial-reporting-15-0-account_financial_report"><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/account-financial-reporting&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds a set of financial reports. They are accessible under
Expand Down Expand Up @@ -525,6 +526,12 @@ <h2><a class="toc-backref" href="#toc-entry-10">Contributors</a></h2>
</ul>
<p>Much of the work in this module was done at a sprint in Sorrento, Italy in
April 2016.</p>
<ul class="simple">
<li>Ooops404 &lt;<a class="reference external" href="https://www.ooops404.com">https://www.ooops404.com</a>&gt;<ul>
<li>Eduard Brahas &lt;<a class="reference external" href="mailto:eduardbrhas&#64;outlook.it">eduardbrhas&#64;outlook.it</a>&gt;</li>
</ul>
</li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h2>
Expand Down
Loading