-
-
Notifications
You must be signed in to change notification settings - Fork 684
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[IMP] account_invoice_merge_attachment: pre-commit stuff
- Loading branch information
Showing
9 changed files
with
127 additions
and
108 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,20 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Copyright 2016-2017 ACSONE SA/NV | ||
| # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
|
||
| { | ||
| 'name': 'Account Invoice Merge Attachment', | ||
| 'summary': """ | ||
| "name": "Account Invoice Merge Attachment", | ||
| "summary": """ | ||
| Consider attachment during invoice merge process""", | ||
| 'version': '12.0.1.0.0', | ||
| 'license': 'AGPL-3', | ||
| 'author': 'ACSONE SA/NV, Odoo Community Association (OCA)', | ||
| 'website': 'https://www.acsone.eu', | ||
| 'depends': [ | ||
| 'account_invoice_merge', | ||
| 'document', | ||
| "version": "12.0.1.0.0", | ||
| "license": "AGPL-3", | ||
| "author": "ACSONE SA/NV, Odoo Community Association (OCA)", | ||
| "website": "https://github.com/OCA/account-invoicing", | ||
| "depends": [ | ||
| "account_invoice_merge", | ||
| "document", | ||
| ], | ||
| 'data': [ | ||
| 'wizards/invoice_merge.xml', | ||
| "data": [ | ||
| "wizards/invoice_merge.xml", | ||
| ], | ||
| 'auto_install': True, | ||
| "auto_install": True, | ||
| } |
24 changes: 10 additions & 14 deletions
24
account_invoice_merge_attachment/models/account_invoice.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,31 +1,27 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Copyright 2016-2017 ACSONE SA/NV | ||
| # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
|
||
| from odoo import api, models | ||
| from odoo import models | ||
|
|
||
|
|
||
| class AccountInvoice(models.Model): | ||
|
|
||
| _inherit = 'account.invoice' | ||
| _inherit = "account.invoice" | ||
|
|
||
| @api.multi | ||
| def do_merge(self, keep_references=True, date_invoice=False): | ||
| invoices_info = super(AccountInvoice, self).do_merge( | ||
| keep_references=keep_references, date_invoice=date_invoice) | ||
| keep_references=keep_references, date_invoice=date_invoice | ||
| ) | ||
|
|
||
| if self.env.context.get('link_attachment'): | ||
| AttachmentObj = self.env['ir.attachment'] | ||
| if self.env.context.get("link_attachment"): | ||
| AttachmentObj = self.env["ir.attachment"] | ||
| for new_invoice_id in invoices_info: | ||
| old_invoice_ids = invoices_info[new_invoice_id] | ||
| attachs = AttachmentObj.search([ | ||
| ('res_model', '=', self._name), | ||
| ('res_id', 'in', old_invoice_ids) | ||
| ]) | ||
| attachs = AttachmentObj.search( | ||
| [("res_model", "=", self._name), ("res_id", "in", old_invoice_ids)] | ||
| ) | ||
| for attach in attachs: | ||
| attach.copy(default={ | ||
| 'res_id': new_invoice_id, | ||
| 'name': attach.name | ||
| }) | ||
| attach.copy(default={"res_id": new_invoice_id, "name": attach.name}) | ||
|
|
||
| return invoices_info |
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,20 +1,20 @@ | ||
| <?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> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| <meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" /> | ||
| <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" /> | ||
| <title>Account Invoice Merge Attachment</title> | ||
| <style type="text/css"> | ||
|
|
||
| /* | ||
| :Author: David Goodger ([email protected]) | ||
| :Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z 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 http://docutils.sf.net/docs/howto/html-stylesheets.html for how to | ||
| 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 { | ||
|
|
@@ -366,60 +366,64 @@ <h1 class="title">Account Invoice Merge Attachment</h1> | |
| <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! source digest: sha256:1e6da1fe73b943a887b55f71bc88da6edf48c2743e2305b59dc7809e61b89fa7 | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> | ||
| <p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/12.0/account_invoice_merge_attachment"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-account_invoice_merge_attachment"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/264/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-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-invoicing/tree/16.0/account_invoice_merge_attachment"><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_attachment"><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&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 allows to link attachment on merged invoices</p> | ||
| <p><strong>Table of contents</strong></p> | ||
| <div class="contents local topic" id="contents"> | ||
| <ul class="simple"> | ||
| <li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li> | ||
| <li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li> | ||
| <li><a class="reference internal" href="#credits" id="id3">Credits</a><ul> | ||
| <li><a class="reference internal" href="#authors" id="id4">Authors</a></li> | ||
| <li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li> | ||
| <li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li> | ||
| <li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</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="#maintainers" id="toc-entry-6">Maintainers</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="configuration"> | ||
| <h1><a class="toc-backref" href="#id1">Configuration</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1> | ||
| <ul class="simple"> | ||
| <li>The module is automatically installed when account_invoice_merge is installed</li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="bug-tracker"> | ||
| <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1> | ||
| <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/field-service/issues">GitHub Issues</a>. | ||
| <h1><a class="toc-backref" href="#toc-entry-2">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 smashing it by providing a detailed and welcomed | ||
| <a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20account_invoice_merge_attachment%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> | ||
| 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_attachment%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"> | ||
| <h1><a class="toc-backref" href="#id3">Credits</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1> | ||
| <div class="section" id="authors"> | ||
| <h2><a class="toc-backref" href="#id4">Authors</a></h2> | ||
| <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2> | ||
| <ul class="simple"> | ||
| <li>ACSONE SA/NV</li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="contributors"> | ||
| <h2><a class="toc-backref" href="#id5">Contributors</a></h2> | ||
| <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2> | ||
| <ul class="simple"> | ||
| <li>Adrien Peiffer <<a class="reference external" href="mailto:adrien.peiffer@acsone.eu">adrien.peiffer@acsone.eu</a>></li> | ||
| <li>Benjamin Willig <<a class="reference external" href="mailto:benjamin.willig@acsone.eu">benjamin.willig@acsone.eu</a>></li> | ||
| <li>Mourad EL HADJ MIMOUNE <<a class="reference external" href="mailto:mourad.elhadj.mimoune@akretion.com">mourad.elhadj.mimoune@akretion.com</a>></li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="maintainers"> | ||
| <h2><a class="toc-backref" href="#id6">Maintainers</a></h2> | ||
| <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> | ||
| <p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/12.0/account_invoice_merge_attachment">OCA/field-service</a> project on GitHub.</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_attachment">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> | ||
|
|
||
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
Oops, something went wrong.