Skip to content

Commit

Permalink
Merge pull request #42 from OCA/15.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/agreement (15.0)
  • Loading branch information
bt-admin authored Oct 9, 2024
2 parents d038323 + 37a0d0e commit 5e88cfd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ addon | version | maintainers | summary
--- | --- | --- | ---
[agreement](agreement/) | 15.0.1.1.0 | [![ygol](https://github.com/ygol.png?size=30px)](https://github.com/ygol) [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Adds an agreement object
[agreement_legal](agreement_legal/) | 15.0.1.1.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![ygol](https://github.com/ygol.png?size=30px)](https://github.com/ygol) | Manage Agreements, LOI and Contracts
[agreement_rebate](agreement_rebate/) | 15.0.1.1.1 | | Rebate in agreements
[agreement_rebate](agreement_rebate/) | 15.0.1.1.2 | | Rebate in agreements
[agreement_serviceprofile](agreement_serviceprofile/) | 15.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Adds an Agreement Service Profile object

[//]: # (end addons)
Expand Down
2 changes: 1 addition & 1 deletion agreement_rebate/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Agreement Rebate
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:1bb225a2990de9f0d42264b2164c7589a28394d376adde1222eb45a8f32364f0
!! source digest: sha256:7f01bd313e1a27417c639efae7e8ffb50de5becc6ebb444a80772232d425f46d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion agreement_rebate/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"name": "Agreement Rebate",
"summary": "Rebate in agreements",
"version": "15.0.1.1.1",
"version": "15.0.1.1.2",
"development_status": "Beta",
"category": "Agreement",
"website": "https://github.com/OCA/agreement",
Expand Down
13 changes: 8 additions & 5 deletions agreement_rebate/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,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.
Expand Down Expand Up @@ -274,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 }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -366,7 +367,7 @@ <h1 class="title">Agreement Rebate</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:1bb225a2990de9f0d42264b2164c7589a28394d376adde1222eb45a8f32364f0
!! source digest: sha256:7f01bd313e1a27417c639efae7e8ffb50de5becc6ebb444a80772232d425f46d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/agreement/tree/15.0/agreement_rebate"><img alt="OCA/agreement" src="https://img.shields.io/badge/github-OCA%2Fagreement-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/agreement-15-0/agreement-15-0-agreement_rebate"><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/agreement&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 extends the functionality of agreement module to allow define
Expand Down Expand Up @@ -457,7 +458,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-6">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>
Expand Down
2 changes: 1 addition & 1 deletion agreement_rebate/wizards/invoice_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def action_create_invoice(self):
)
settlements -= settlements.filtered(
lambda s: any(
ail.move_id.type == self.invoice_type
ail.move_id.move_type == self.invoice_type
for ail in s.line_ids.mapped("invoice_line_ids").filtered(
lambda ln: ln.parent_state != "cancel"
)
Expand Down

0 comments on commit 5e88cfd

Please sign in to comment.