Skip to content
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

[17.0][FW] oca-port: forward missing commits from 14.0 #370

Open
wants to merge 3 commits into
base: 17.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .oca/oca-port/blacklist/base_report_to_printer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"pull_requests": {
"242": "(auto) Nothing to port from PR #242"
}
}
2 changes: 1 addition & 1 deletion base_report_to_printer/i18n/sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ msgstr "Guide"
#: code:addons/base_report_to_printer/wizards/print_attachment_report.py:0
#, python-format
msgid "{name} ({copies} copies)"
msgstr "{namn} ({kopior} kopior)"
msgstr "{name} ({copies} kopior)"

#~ msgid "Job"
#~ msgstr "Jobb"
Expand Down
3 changes: 2 additions & 1 deletion base_report_to_printer/models/ir_actions_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
# Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
# Copyright (C) 2013-2014 Camptocamp (<http://www.camptocamp.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from time import time

from odoo import _, api, exceptions, fields, models
from odoo.tools.safe_eval import safe_eval, time
from odoo.tools.safe_eval import safe_eval

REPORT_TYPES = {"qweb-pdf": "pdf", "qweb-text": "text"}

Expand Down
1 change: 1 addition & 0 deletions base_report_to_printer/security/security.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
<field eval="1" name="perm_read" />
<field eval="1" name="perm_unlink" />
<field eval="1" name="perm_write" />
<field eval="1" name="perm_create" />
</record>
<record id="access_wizard_print_attachment_user" model="ir.model.access">
<field name="name">Print Attachment User</field>
Expand Down
Loading