Skip to content

Commit

Permalink
Merge remote-tracking branch 'fork/16.0' into 16.0-fork
Browse files Browse the repository at this point in the history
  • Loading branch information
mohs8421 committed Feb 10, 2025
2 parents f23f268 + f2ac26a commit d80ac29
Show file tree
Hide file tree
Showing 86 changed files with 2,608 additions and 131 deletions.
3 changes: 2 additions & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.21.1
_commit: v1.29
_src_path: gh:oca/oca-addons-repo-template
ci: GitHub
convert_readme_fragments_to_markdown: false
enable_checklog_odoo: false
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
- uses: actions/cache@v4
with:
path: ~/.cache/pre-commit
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Install addons and dependencies
Expand Down
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@ var/
*.egg
*.eggs

# Windows installers
*.msi

# Debian packages
*.deb

# Redhat packages
*.rpm

# MacOS packages
*.dmg
*.pkg

# Installer logs
pip-log.txt
pip-delete-this-directory.txt
Expand Down
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": {
"OCA/report-print-send#275": "It's the migration PR..."
}
}
34 changes: 23 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exclude: |
# Files and folders generated by bots, to avoid loops
^setup/|/static/description/index\.html$|
# We don't want to mess with tool-generated files
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
# Maybe reactivate this when all README files include prettier ignore tags?
^README\.md$|
# Library files can have extraneous formatting (even minimized)
Expand Down Expand Up @@ -39,7 +39,7 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: 9a170331575a265c092ee6b24b845ec508e8ef75
rev: d5fab7ee87fceee858a3d01048c78a548974d935
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
Expand All @@ -58,6 +58,8 @@ repos:
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
args:
- --disable=po-pretty-format
- repo: https://github.com/myint/autoflake
rev: v1.6.1
hooks:
Expand All @@ -73,25 +75,35 @@ repos:
rev: 22.8.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
- repo: local
hooks:
- id: prettier
name: prettier (with plugin-xml)
entry: prettier
args:
- --write
- --list-different
- --ignore-unknown
types: [text]
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
language: node
additional_dependencies:
- "[email protected]"
- "@prettier/[email protected]"
args:
- --plugin=@prettier/plugin-xml
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.24.0
- repo: local
hooks:
- id: eslint
verbose: true
name: eslint
entry: eslint
args:
- --color
- --fix
verbose: true
types: [javascript]
language: node
additional_dependencies:
- "[email protected]"
- "eslint-plugin-jsdoc@"
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
hooks:
Expand Down Expand Up @@ -138,7 +150,7 @@ repos:
- --header
- "# generated from manifests external_dependencies"
- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
rev: 5.0.0
hooks:
- id: flake8
name: flake8
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ addon | version | maintainers
[zpl_printer](zpl_printer/) | 16.0.0.0.1 | [![mohs8421](https://github.com/mohs8421.png?size=30px)](https://github.com/mohs8421) | Directly connect label printers to Odoo
[zpl_printer_mrp](zpl_printer_mrp/) | 16.0.0.0.1 | [![mohs8421](https://github.com/mohs8421.png?size=30px)](https://github.com/mohs8421) | Connects zpl_printer module with mrp module
[zpl_printer_stock](zpl_printer_stock/) | 16.0.0.0.1 | [![mohs8421](https://github.com/mohs8421.png?size=30px)](https://github.com/mohs8421) | Connects zpl_printer module with mrp module, add option to specify printer on product
[remote_report_to_printer](remote_report_to_printer/) | 16.0.1.0.0 | | Report to printer on remotes

[//]: # (end addons)

Expand Down
2 changes: 1 addition & 1 deletion base_report_to_label_printer/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Report to label printer
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:4bf684cbc8b3611e4978597bb436aa423426d49b0eb4c55c79d26353343077e9
!! source digest: sha256:3021d98ed30999ead9159935545acd37327442d0b11258a8773951a0fe2186e6
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion base_report_to_label_printer/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "Report to label printer",
"version": "16.0.1.0.0",
"version": "16.0.1.0.1",
"category": "Generic Modules/Base",
"author": "Raumschmiede GmbH - Christopher Hansen,"
" Odoo Community Association (OCA)",
Expand Down
13 changes: 8 additions & 5 deletions base_report_to_label_printer/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">Report to label printer</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:4bf684cbc8b3611e4978597bb436aa423426d49b0eb4c55c79d26353343077e9
!! source digest: sha256:3021d98ed30999ead9159935545acd37327442d0b11258a8773951a0fe2186e6
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/report-print-send/tree/16.0/base_report_to_label_printer"><img alt="OCA/report-print-send" src="https://img.shields.io/badge/github-OCA%2Freport--print--send-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/report-print-send-16-0/report-print-send-16-0-base_report_to_label_printer"><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/report-print-send&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 makes it possible to print specific reports to a label printer that is configured on the user.</p>
Expand Down Expand Up @@ -412,7 +413,9 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-5">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
4 changes: 3 additions & 1 deletion base_report_to_label_printer/tests/test_ir_actions_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ def setUpClass(cls):
super().setUpClass()
cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))

cls.Model = cls.env["ir.actions.report"]
cls.Model = cls.env["ir.actions.report"].with_context(
skip_printer_exception=True
)
cls.server = cls.env["printing.server"].create({})

def new_printer(self):
Expand Down
14 changes: 13 additions & 1 deletion base_report_to_printer/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Report to printer
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:eee0b79c69c9fe1f8218f1635923fd10e6a4682391133575d1239a58d53e822e
!! source digest: sha256:b6075c1e1dd7cdecda74534f415e34eff210a7eb45270a9f9b086cb2c06563b1
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -106,6 +106,13 @@ Guidelines for use:
When no tray is configured for a report and a user, the
default tray setup on the CUPS server is used.

Known issues / Roadmap
======================

- With threaded printing there's no download fallback when the issue isn't detected by
the CUPS Odoo backend. To able to do it, we would need to notify the bus or use
web_notify for it.

Changelog
=========

Expand Down Expand Up @@ -163,6 +170,11 @@ Contributors
* Akim Juillerat <[email protected]>
* Jacques-Etienne Baudoux (BCIM) <[email protected]>

* `Tecnativa <https://www.tecnativa.com>`_:

* Sergio Teruel
* David Vidal

Maintainers
~~~~~~~~~~~

Expand Down
3 changes: 2 additions & 1 deletion base_report_to_printer/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

{
"name": "Report to printer",
"version": "16.0.1.1.7",
"version": "16.0.1.2.0",
"category": "Generic Modules/Base",
"author": "Agile Business Group & Domsense, Pegueroles SCP, NaN,"
" LasLabs, Camptocamp, Odoo Community Association (OCA),"
Expand All @@ -18,6 +18,7 @@
"data": [
"data/printing_data.xml",
"security/security.xml",
"security/ir.model.access.csv",
"views/printing_printer.xml",
"views/printing_server.xml",
"views/printing_job.xml",
Expand Down
32 changes: 31 additions & 1 deletion base_report_to_printer/i18n/am.po
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ msgstr ""
#. odoo-javascript
#: code:addons/base_report_to_printer/static/src/js/qweb_action_manager.esm.js:0
#, python-format
msgid "Could not send to printer!"
msgid "Could not sent to printer!"
msgstr ""

#. module: base_report_to_printer
Expand Down Expand Up @@ -396,6 +396,13 @@ msgstr ""
msgid "If checked, this server is useable."
msgstr ""

#. module: base_report_to_printer
#. odoo-javascript
#: code:addons/base_report_to_printer/static/src/js/qweb_action_manager.esm.js:0
#, python-format
msgid "Issue on"
msgstr ""

#. module: base_report_to_printer
#: model_terms:ir.ui.view,arch_db:base_report_to_printer.printing_job_view_form
msgid "Job"
Expand Down Expand Up @@ -481,6 +488,12 @@ msgstr ""
msgid "Model"
msgstr ""

#. module: base_report_to_printer
#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__multi_thread
#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__multi_thread
msgid "Multi Thread"
msgstr ""

#. module: base_report_to_printer
#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_action__name
#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__name
Expand Down Expand Up @@ -564,8 +577,11 @@ msgid "Port of the server."
msgstr ""

#. module: base_report_to_printer
#. odoo-javascript
#: code:addons/base_report_to_printer/static/src/js/qweb_action_manager.esm.js:0
#: model_terms:ir.ui.view,arch_db:base_report_to_printer.act_report_xml_view
#: model_terms:ir.ui.view,arch_db:base_report_to_printer.wizard_print_attachment_form
#, python-format
msgid "Print"
msgstr ""

Expand Down Expand Up @@ -841,6 +857,13 @@ msgstr ""
msgid "The id of the job must be unique per server !"
msgstr ""

#. module: base_report_to_printer
#. odoo-javascript
#: code:addons/base_report_to_printer/static/src/js/qweb_action_manager.esm.js:0
#, python-format
msgid "The report"
msgstr ""

#. module: base_report_to_printer
#: model:ir.model.fields,help:base_report_to_printer.field_ir_actions_report__printing_action_ids
msgid "This field allows configuring action and printer on a per user basis"
Expand Down Expand Up @@ -940,6 +963,13 @@ msgstr ""
msgid "Wizard"
msgstr ""

#. module: base_report_to_printer
#. odoo-javascript
#: code:addons/base_report_to_printer/static/src/js/qweb_action_manager.esm.js:0
#, python-format
msgid "couldn't be printed. Click on the button below to download it"
msgstr ""

#. module: base_report_to_printer
#. odoo-python
#: code:addons/base_report_to_printer/wizards/print_attachment_report.py:0
Expand Down
Loading

0 comments on commit d80ac29

Please sign in to comment.