Skip to content

Commit

Permalink
[IMP] account_invoice_merge: pre-commit auto fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
acsonefho committed Dec 31, 2024
1 parent d39194c commit 48883df
Show file tree
Hide file tree
Showing 15 changed files with 109 additions and 84 deletions.
66 changes: 39 additions & 27 deletions account_invoice_merge/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,39 +17,45 @@ Account Invoice Merge
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--invoicing-lightgray.png?logo=github
:target: https://github.com/OCA/account-invoicing/tree/16.0/account_invoice_merge
:target: https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_merge
:alt: OCA/account-invoicing
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-account_invoice_merge
:target: https://translation.odoo-community.org/projects/account-invoicing-18-0/account-invoicing-18-0-account_invoice_merge
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-invoicing&target_branch=16.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-invoicing&target_branch=18.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

This module adds an action in the invoices list to merge invoices. Here are
the conditions to allow merging:
This module adds an action in the invoices list to merge invoices. Here
are the conditions to allow merging:

* Type should be the same (Customer Invoice, Supplier Invoice, Customer Refund or
Supplier Refund)
* Partner should be the same
* Currency should be the same
* Account receivable account should be the same
- Type should be the same (Customer Invoice, Supplier Invoice, Customer
Refund or Supplier Refund)
- Partner should be the same
- Currency should be the same
- Account receivable account should be the same

**Table of contents**

.. contents::
:local:

Configuration
=============



Usage
=====

Go to a invoice tree view, select several invoices and click expand the
action button and click 'Merge Partner Invoice'.

.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
|Try me on Runbot|

.. |Try me on Runbot| image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:target: https://runbot.odoo-community.org/runbot/95/10.0

Bug Tracker
Expand All @@ -58,39 +64,45 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-invoicing/issues>`_.
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
`feedback <https://github.com/OCA/account-invoicing/issues/new?body=module:%20account_invoice_merge%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/account-invoicing/issues/new?body=module:%20account_invoice_merge%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
~~~~~~~
-------

* Elico Corp

Contributors
~~~~~~~~~~~~
------------

- Ian Li <[email protected]>

- Cédric Pigeon <[email protected]>

- Lois Rilo <[email protected]>

- Miquel Raïch <[email protected]>

- Sylvain Van Hoof <[email protected]>

* Ian Li <[email protected]>
* Cédric Pigeon <[email protected]>
* Lois Rilo <[email protected]>
* Miquel Raïch <[email protected]>
* Sylvain Van Hoof <[email protected]>
* Freni Patel <[email protected]>
- Freni Patel <[email protected]>

* `Trobz <https://trobz.com>`_:
- `Trobz <https://trobz.com>`__:

* Nguyễn Minh Chiến <[email protected]>
- Nguyễn Minh Chiến <[email protected]>

Other credits
~~~~~~~~~~~~~
-------------

The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp
The migration of this module from 15.0 to 16.0 was financially supported
by Camptocamp

Maintainers
~~~~~~~~~~~
-----------

This module is maintained by the OCA.

Expand All @@ -102,6 +114,6 @@ 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.

This module is part of the `OCA/account-invoicing <https://github.com/OCA/account-invoicing/tree/16.0/account_invoice_merge>`_ project on GitHub.
This module is part of the `OCA/account-invoicing <https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_merge>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion account_invoice_merge/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{
"name": "Account Invoice Merge",
"version": "16.0.1.0.1",
"version": "18.0.1.0.1",
"category": "Finance",
"summary": "Merge invoices in draft",
"author": "Elico Corp,Odoo Community Association (OCA)",
Expand Down
3 changes: 3 additions & 0 deletions account_invoice_merge/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["whool"]
build-backend = "whool.buildapi"
1 change: 1 addition & 0 deletions account_invoice_merge/readme/CONFIGURE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Empty file.
15 changes: 15 additions & 0 deletions account_invoice_merge/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- Ian Li \<<[email protected]>\>

- Cédric Pigeon \<<[email protected]>\>

- Lois Rilo \<<[email protected]>\>

- Miquel Raïch \<<[email protected]>\>

- Sylvain Van Hoof \<<[email protected]>\>

- Freni Patel \<<[email protected]>\>

- [Trobz](https://trobz.com):

> - Nguyễn Minh Chiến \<<[email protected]>\>
10 changes: 0 additions & 10 deletions account_invoice_merge/readme/CONTRIBUTORS.rst

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp
The migration of this module from 15.0 to 16.0 was financially supported
by Camptocamp
8 changes: 8 additions & 0 deletions account_invoice_merge/readme/DESCRIPTION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
This module adds an action in the invoices list to merge invoices. Here
are the conditions to allow merging:

- Type should be the same (Customer Invoice, Supplier Invoice, Customer
Refund or Supplier Refund)
- Partner should be the same
- Currency should be the same
- Account receivable account should be the same
8 changes: 0 additions & 8 deletions account_invoice_merge/readme/DESCRIPTION.rst

This file was deleted.

4 changes: 4 additions & 0 deletions account_invoice_merge/readme/USAGE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Go to a invoice tree view, select several invoices and click expand the
action button and click 'Merge Partner Invoice'.

[![Try me on Runbot](https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas)](https://runbot.odoo-community.org/runbot/95/10.0)
6 changes: 0 additions & 6 deletions account_invoice_merge/readme/USAGE.rst

This file was deleted.

63 changes: 35 additions & 28 deletions account_invoice_merge/static/description/index.html
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>
Expand All @@ -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.
Expand Down Expand Up @@ -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 }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

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

span.section-subtitle {
Expand Down Expand Up @@ -369,54 +369,58 @@ <h1 class="title">Account Invoice Merge</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:651021e32ffff00752cf1bf5fb2f7a648a2cd05de7d30f50cdd816492245cf3d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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-invoicing/tree/16.0/account_invoice_merge"><img alt="OCA/account-invoicing" src="https://img.shields.io/badge/github-OCA%2Faccount--invoicing-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-account_invoice_merge"><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-invoicing&amp;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 module adds an action in the invoices list to merge invoices. Here are
the conditions to allow merging:</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-invoicing/tree/18.0/account_invoice_merge"><img alt="OCA/account-invoicing" src="https://img.shields.io/badge/github-OCA%2Faccount--invoicing-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-invoicing-18-0/account-invoicing-18-0-account_invoice_merge"><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-invoicing&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds an action in the invoices list to merge invoices. Here
are the conditions to allow merging:</p>
<ul class="simple">
<li>Type should be the same (Customer Invoice, Supplier Invoice, Customer Refund or
Supplier Refund)</li>
<li>Type should be the same (Customer Invoice, Supplier Invoice, Customer
Refund or Supplier Refund)</li>
<li>Partner should be the same</li>
<li>Currency should be the same</li>
<li>Account receivable account should be the same</li>
</ul>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
<li><a class="reference internal" href="#other-credits" id="toc-entry-6">Other credits</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="configuration">
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
<p>Go to a invoice tree view, select several invoices and click expand the
action button and click ‘Merge Partner Invoice’.</p>
<a class="reference external image-reference" href="https://runbot.odoo-community.org/runbot/95/10.0"><img alt="Try me on Runbot" src="https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas" /></a>
<p><a class="reference external image-reference" href="https://runbot.odoo-community.org/runbot/95/10.0"><img alt="Try me on Runbot" src="https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas" /></a></p>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<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-invoicing/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-invoicing/issues/new?body=module:%20account_invoice_merge%0Aversion:%2016.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-invoicing/issues/new?body=module:%20account_invoice_merge%0Aversion:%2018.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">
<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
<ul class="simple">
<li>Elico Corp</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
<ul>
<li><p class="first">Ian Li &lt;<a class="reference external" href="mailto:ian.li&#64;elico-corp.com">ian.li&#64;elico-corp.com</a>&gt;</p>
</li>
Expand All @@ -440,17 +444,20 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
</ul>
</div>
<div class="section" id="other-credits">
<h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
<p>The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp</p>
<h2><a class="toc-backref" href="#toc-entry-7">Other credits</a></h2>
<p>The migration of this module from 15.0 to 16.0 was financially supported
by Camptocamp</p>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
<h2><a class="toc-backref" href="#toc-entry-8">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>This module is part of the <a class="reference external" href="https://github.com/OCA/account-invoicing/tree/16.0/account_invoice_merge">OCA/account-invoicing</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_merge">OCA/account-invoicing</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>
Expand Down
2 changes: 1 addition & 1 deletion account_invoice_merge/wizard/invoice_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def merge_invoices(self):
"in_invoice": "action_move_in_invoice_type",
"in_refund": "action_move_in_refund_type",
}[invoices[0].move_type]
action = self.env["ir.actions.act_window"]._for_xml_id("account.{}".format(xid))
action = self.env["ir.actions.act_window"]._for_xml_id(f"account.{xid}")
action.update(
{
"domain": [("id", "in", ids + list(allinvoices.keys()))],
Expand Down
2 changes: 0 additions & 2 deletions account_invoice_merge/wizard/invoice_merge_view.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>

<record id="view_invoice_merge" model="ir.ui.view">
<field name="name">Merger Partner Invoice</field>
<field name="model">invoice.merge</field>
Expand Down Expand Up @@ -63,5 +62,4 @@
<field name="binding_model_id" ref="account.model_account_move" />
<field name="binding_view_types">list</field>
</record>

</odoo>

0 comments on commit 48883df

Please sign in to comment.