-
-
Notifications
You must be signed in to change notification settings - Fork 414
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MIG] account_payment_term_partner_holiday: Migration to 16.0
- Loading branch information
1 parent
8b3bdff
commit 9e2b0da
Showing
5 changed files
with
45 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 27 additions & 10 deletions
37
account_payment_term_partner_holiday/models/account_payment_term.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,52 @@ | ||
| # Copyright 2021 Tecnativa - Víctor Martínez | ||
| # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). | ||
|
|
||
| from odoo import fields, models | ||
| from odoo import models | ||
|
|
||
|
|
||
| class AccountPaymentTerm(models.Model): | ||
| _inherit = "account.payment.term" | ||
|
|
||
| def compute(self, value, date_ref=False, currency=None): | ||
| def _compute_terms( | ||
| self, | ||
| date_ref, | ||
| currency, | ||
| company, | ||
| tax_amount, | ||
| tax_amount_currency, | ||
| sign, | ||
| untaxed_amount, | ||
| untaxed_amount_currency, | ||
| ): | ||
| """Compute the due date taking into account the holiday periods | ||
| set in the partner. | ||
| Once an initial date resulting of the payment term is computed, | ||
| compute the first available date after that. | ||
| Then, apply_payment_days() and apply_holidays() to prevent | ||
| incompatibilities. | ||
| """ | ||
| result = super().compute(value=value, date_ref=date_ref, currency=currency) | ||
| result = super()._compute_terms( | ||
| date_ref, | ||
| currency, | ||
| company, | ||
| tax_amount, | ||
| tax_amount_currency, | ||
| sign, | ||
| untaxed_amount, | ||
| untaxed_amount_currency, | ||
| ) | ||
| ctx = self.env.context | ||
| partner_id = ctx.get("move_partner_id", ctx.get("default_partner_id")) | ||
| if partner_id: | ||
| partner = self.env["res.partner"].browse(partner_id) | ||
| result2 = [] | ||
| for key, item in enumerate(result): | ||
| next_date = partner._get_valid_due_date(item[0]) | ||
| if next_date != item[0]: | ||
| line = self.line_ids[key] | ||
| next_date = partner._get_valid_due_date(item["date"]) | ||
| if next_date != item["date"]: | ||
| line = self.line_ids.sorted(lambda x: x.value == "balance")[key] | ||
| next_date = self.apply_payment_days(line, next_date) | ||
| next_date = self.apply_holidays(next_date) | ||
| result2.append((fields.Date.to_string(next_date), item[1])) | ||
| else: | ||
| result2.append(item) | ||
| item.update({"date": next_date}) | ||
| result2.append(item) | ||
| result = result2 | ||
| return result |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> | ||
|
|
@@ -9,10 +8,11 @@ | |
|
|
||
| /* | ||
| :Author: David Goodger ([email protected]) | ||
| :Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z 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. | ||
| Despite the name, some widely supported CSS2 features are used. | ||
|
|
||
| See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to | ||
| customize this style sheet. | ||
|
|
@@ -275,7 +275,7 @@ | |
| margin-left: 2em ; | ||
| margin-right: 2em } | ||
|
|
||
| pre.code .ln { color: grey; } /* line numbers */ | ||
| pre.code .ln { color: gray; } /* line numbers */ | ||
| pre.code, code { background-color: #eeeeee } | ||
| pre.code .comment, code .comment { color: #5C6576 } | ||
| pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } | ||
|
|
@@ -301,7 +301,7 @@ | |
| span.pre { | ||
| white-space: pre } | ||
|
|
||
| span.problematic { | ||
| span.problematic, pre.problematic { | ||
| color: red } | ||
|
|
||
| span.section-subtitle { | ||
|
|
@@ -369,7 +369,7 @@ <h1 class="title">Account Payment Term Partner Holiday</h1> | |
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! source digest: sha256:afe7b305107611842f1263bcb1bc45fed2405cd569ea078defd85c749ae46592 | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> | ||
| <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-payment/tree/14.0/account_payment_term_partner_holiday"><img alt="OCA/account-payment" src="https://img.shields.io/badge/github-OCA%2Faccount--payment-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-payment-14-0/account-payment-14-0-account_payment_term_partner_holiday"><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-payment&target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> | ||
| <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-payment/tree/16.0/account_payment_term_partner_holiday"><img alt="OCA/account-payment" src="https://img.shields.io/badge/github-OCA%2Faccount--payment-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-payment-16-0/account-payment-16-0-account_payment_term_partner_holiday"><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-payment&target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> | ||
| <p>This addon adds the possibility of defining holiday periods in a | ||
| partner so as not to use those periods as the due date on invoices.</p> | ||
| <p><strong>Table of contents</strong></p> | ||
|
|
@@ -408,7 +408,7 @@ <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1> | |
| <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-payment/issues">GitHub Issues</a>. | ||
| In case of trouble, please check there if your issue has already been reported. | ||
| If you spotted it first, help us to smash it by providing a detailed and welcomed | ||
| <a class="reference external" href="https://github.com/OCA/account-payment/issues/new?body=module:%20account_payment_term_partner_holiday%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> | ||
| <a class="reference external" href="https://github.com/OCA/account-payment/issues/new?body=module:%20account_payment_term_partner_holiday%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> | ||
| <p>Do not contact contributors directly about support or help with technical issues.</p> | ||
| </div> | ||
| <div class="section" id="credits"> | ||
|
|
@@ -433,13 +433,15 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2> | |
| <div class="section" id="maintainers"> | ||
| <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2> | ||
| <p>This module is maintained by the OCA.</p> | ||
| <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a> | ||
| <a class="reference external image-reference" href="https://odoo-community.org"> | ||
| <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /> | ||
| </a> | ||
| <p>OCA, or the Odoo Community Association, is a nonprofit organization whose | ||
| mission is to support the collaborative development of Odoo features and | ||
| promote its widespread use.</p> | ||
| <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p> | ||
| <p><a class="reference external image-reference" href="https://github.com/victoralmau"><img alt="victoralmau" src="https://github.com/victoralmau.png?size=40px" /></a></p> | ||
| <p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-payment/tree/14.0/account_payment_term_partner_holiday">OCA/account-payment</a> project on GitHub.</p> | ||
| <p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-payment/tree/16.0/account_payment_term_partner_holiday">OCA/account-payment</a> project on GitHub.</p> | ||
| <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p> | ||
| </div> | ||
| </div> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters