-
Notifications
You must be signed in to change notification settings - Fork 21
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
[WIP][14.0][IMP] account_invoice_batches: report intermediary service #426
Open
FrankC013
wants to merge
1
commit into
14.0
Choose a base branch
from
14.0-account_invoice_batches-report_intermediary_service
base: 14.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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 |
---|---|---|
|
@@ -3,8 +3,11 @@ | |
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) | ||
|
||
import base64 | ||
import io | ||
import logging | ||
|
||
from PyPDF2 import PdfFileReader | ||
|
||
from odoo import _, fields, models | ||
from odoo.exceptions import UserError | ||
|
||
|
@@ -152,8 +155,52 @@ def process_invoices(self): | |
if invoices_pdf: | ||
if not self.company_id.report_service_id: | ||
raise UserError(_("There's no report defined on invoice company")) | ||
report_action = self.company_id.report_service_id.report_action( | ||
invoices_pdf | ||
) | ||
invoices_pdf.write({"is_move_sent": True}) | ||
return report_action | ||
report_service = self.company_id.report_service_id | ||
if invoices_pdf.filtered(lambda x: x.partner_id.service_intermediary): | ||
if not self.company_id.report_intermediary_service_id: | ||
raise UserError( | ||
_( | ||
"The report for service intermediary partners is not " | ||
"defined in the configuration settings. Please go to " | ||
"the billing configuration and specify which report " | ||
"will be used." | ||
) | ||
) | ||
report_intermediary = self.company_id.report_intermediary_service_id | ||
pdf_streams = [] | ||
for invoice in invoices_pdf: | ||
if invoice.partner_id.service_intermediary: | ||
if not report_intermediary: | ||
raise UserError( | ||
_( | ||
"The report for service intermediary partners is not " | ||
"defined in the configuration settings. Please go to " | ||
"the billing configuration and specify which report " | ||
"will be used." | ||
) | ||
) | ||
report = report_intermediary | ||
else: | ||
report = report_service | ||
|
||
pdf_content, _p = report._render_qweb_pdf([invoice.id]) | ||
pdf_stream = io.BytesIO(pdf_content) | ||
pdf_streams.append(pdf_stream) | ||
|
||
if pdf_streams: | ||
merged_pdf_stream = io.BytesIO() | ||
pdf_merger = PdfFileReader(pdf_content) | ||
for pdf_stream in pdf_streams: | ||
pdf_merger.append(pdf_stream) | ||
pdf_merger.write(merged_pdf_stream) | ||
pdf_merger.close() | ||
|
||
return { | ||
"type": "ir.actions.report", | ||
"report_type": "qweb-pdf", | ||
"data": {"pdf_content": merged_pdf_stream.getvalue()}, | ||
"report_name": "Merged_Invoices", | ||
"name": _("Merged Invoices"), | ||
} | ||
else: | ||
raise UserError(_("No PDFs were generated for the selected invoices.")) | ||
Comment on lines
+158
to
+206
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Very messy code, copy pasted, please, try to use functions and reuse code. The original code was very clean with a few branches with little code. Please clean the code |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We cannot make this dependent, we have to allow having batches without move service.