Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OCA/server-tools
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0fe7d3ad0dfba72d60e2e47fab979af80777d1cd
Choose a base ref
..
head repository: OCA/server-tools
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d2398900b35ded326ff1d9da1028159596b9a285
Choose a head ref
Showing with 149 additions and 136 deletions.
  1. +2 −1 .copier-answers.yml
  2. +3 −3 .github/workflows/pre-commit.yml
  3. +2 −2 .github/workflows/test.yml
  4. +13 −0 .gitignore
  5. +23 −11 .pre-commit-config.yaml
  6. +4 −4 README.md
  7. +1 −1 base_remote/README.rst
  8. +1 −1 base_remote/__manifest__.py
  9. +1 −1 base_remote/models/base.py
  10. +8 −6 base_remote/static/description/index.html
  11. +7 −1 excel_import_export/README.rst
  12. +1 −1 excel_import_export/__manifest__.py
  13. +2 −0 excel_import_export/readme/CONFIGURE.rst
  14. +27 −21 excel_import_export/static/description/index.html
  15. +1 −1 excel_import_export_demo/README.rst
  16. +1 −0 excel_import_export_demo/__init__.py
  17. +2 −1 excel_import_export_demo/__manifest__.py
  18. +11 −0 excel_import_export_demo/hooks.py
  19. +0 −6 excel_import_export_demo/i18n/ca.po
  20. +3 −6 excel_import_export_demo/i18n/es.po
  21. +0 −6 excel_import_export_demo/i18n/excel_import_export_demo.pot
  22. +3 −6 excel_import_export_demo/i18n/it.po
  23. +3 −6 excel_import_export_demo/i18n/zh_CN.po
  24. +0 −15 excel_import_export_demo/import_export_purchase_order/actions.xml
  25. +0 −4 excel_import_export_demo/import_export_purchase_order/templates.xml
  26. +0 −18 excel_import_export_demo/import_export_sale_order/actions.xml
  27. +1 −2 excel_import_export_demo/import_export_sale_order/templates.xml
  28. +8 −5 excel_import_export_demo/static/description/index.html
  29. +1 −1 requirements.txt
  30. +1 −1 session_db/README.rst
  31. +1 −1 session_db/__manifest__.py
  32. +1 −1 session_db/static/description/index.html
  33. +15 −3 session_db/tests/test_pg_session_store.py
  34. +2 −0 test-requirements.txt
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: {}
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -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') }}
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -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
@@ -62,7 +62,7 @@ jobs:
INCLUDE: "${{ matrix.include }}"
EXCLUDE: "${{ matrix.exclude }}"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Install addons and dependencies
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
34 changes: 23 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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)
@@ -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
@@ -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:
@@ -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:
- "prettier@2.7.1"
- "@prettier/plugin-xml@2.2.0"
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:
- "eslint@8.24.0"
- "eslint-plugin-jsdoc@"
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
hooks:
@@ -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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ addon | version | maintainers | summary
[base_multi_image](base_multi_image/) | 16.0.1.0.1 | | Allow multiple images for database objects
[base_name_search_improved](base_name_search_improved/) | 16.0.1.0.2 | | Friendlier search when typing in relation fields
[base_partition](base_partition/) | 16.0.1.0.0 | | Base module that provide the partition method on all models
[base_remote](base_remote/) | 16.0.1.0.0 | | Remote Base
[base_remote](base_remote/) | 16.0.1.0.1 | | Remote Base
[base_search_fuzzy](base_search_fuzzy/) | 16.0.1.0.0 | | Fuzzy search with the PostgreSQL trigram extension
[base_sequence_default](base_sequence_default/) | 16.0.1.0.2 | [![Shide](https://github.com/Shide.png?size=30px)](https://github.com/Shide) [![yajo](https://github.com/yajo.png?size=30px)](https://github.com/yajo) [![rafaelbn](https://github.com/rafaelbn.png?size=30px)](https://github.com/rafaelbn) | Use sequences for default values of fields when creating a new record
[base_sequence_option](base_sequence_option/) | 16.0.1.0.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Alternative sequence options for specific models
@@ -53,8 +53,8 @@ addon | version | maintainers | summary
[database_cleanup](database_cleanup/) | 16.0.1.2.1 | | Database cleanup
[datetime_formatter](datetime_formatter/) | 16.0.1.0.0 | | Helper functions to give correct format to date[time] fields
[dbfilter_from_header](dbfilter_from_header/) | 16.0.1.0.1 | | Filter databases with HTTP headers
[excel_import_export](excel_import_export/) | 16.0.1.3.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Base module for developing Excel import/export/report
[excel_import_export_demo](excel_import_export_demo/) | 16.0.1.0.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Excel Import/Export/Report Demo
[excel_import_export](excel_import_export/) | 16.0.1.3.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Base module for developing Excel import/export/report
[excel_import_export_demo](excel_import_export_demo/) | 16.0.1.1.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Excel Import/Export/Report Demo
[excel_import_export_unidecode](excel_import_export_unidecode/) | 16.0.1.0.1 | | Add unidecode option to excel import/export/report
[fetchmail_attach_from_folder](fetchmail_attach_from_folder/) | 16.0.1.5.0 | [![NL66278](https://github.com/NL66278.png?size=30px)](https://github.com/NL66278) | Attach mails in an IMAP folder to existing objects
[html_text](html_text/) | 16.0.1.0.1 | | Generate excerpts from any HTML field
@@ -72,7 +72,7 @@ addon | version | maintainers | summary
[sentry](sentry/) | 16.0.3.0.3 | [![barsi](https://github.com/barsi.png?size=30px)](https://github.com/barsi) [![naglis](https://github.com/naglis.png?size=30px)](https://github.com/naglis) [![versada](https://github.com/versada.png?size=30px)](https://github.com/versada) [![moylop260](https://github.com/moylop260.png?size=30px)](https://github.com/moylop260) [![fernandahf](https://github.com/fernandahf.png?size=30px)](https://github.com/fernandahf) | Report Odoo errors to Sentry
[sequence_python](sequence_python/) | 16.0.1.0.0 | | Calculate a sequence number from a Python expression
[server_action_logging](server_action_logging/) | 16.0.1.0.0 | | Module that provides a logging mechanism for server actions
[session_db](session_db/) | 16.0.1.0.6 | [![sbidoul](https://github.com/sbidoul.png?size=30px)](https://github.com/sbidoul) | Store sessions in DB
[session_db](session_db/) | 16.0.1.0.7 | [![sbidoul](https://github.com/sbidoul.png?size=30px)](https://github.com/sbidoul) | Store sessions in DB
[tracking_manager](tracking_manager/) | 16.0.1.1.8 | [![Kev-Roche](https://github.com/Kev-Roche.png?size=30px)](https://github.com/Kev-Roche) [![sebastienbeau](https://github.com/sebastienbeau.png?size=30px)](https://github.com/sebastienbeau) | This module tracks all fields of a model, including one2many and many2many ones.
[upgrade_analysis](upgrade_analysis/) | 16.0.1.2.0 | [![StefanRijnhart](https://github.com/StefanRijnhart.png?size=30px)](https://github.com/StefanRijnhart) [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Performs a difference analysis between modules installed on two different Odoo instances
[url_attachment_search_fuzzy](url_attachment_search_fuzzy/) | 16.0.1.0.0 | [![mariadforgelow](https://github.com/mariadforgelow.png?size=30px)](https://github.com/mariadforgelow) | Fuzzy Search of URL in Attachments
2 changes: 1 addition & 1 deletion base_remote/README.rst
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Remote Base
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ea67cc2d0f89e980cd5e547aa5e5f51332a3c3e3a14d92daa92cfe8004ff9429
!! source digest: sha256:4285be2014dfd94cf777edc2fd32c52dc2cac9d6a09a9278c51410b06bf43fe0
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
2 changes: 1 addition & 1 deletion base_remote/__manifest__.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

{
"name": "Remote Base",
"version": "16.0.1.0.0",
"version": "16.0.1.0.1",
"category": "Generic Modules/Base",
"author": "Creu Blanca, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/server-tools",
2 changes: 1 addition & 1 deletion base_remote/models/base.py
Original file line number Diff line number Diff line change
@@ -13,6 +13,6 @@ class Base(models.AbstractModel):
def remote(self):
try:
remote_addr = http.request.httprequest.remote_addr
except (KeyError, AttributeError):
except (KeyError, AttributeError, RuntimeError):
return self.env["res.remote"]
return self.env["res.remote"]._get_remote(remote_addr)
14 changes: 8 additions & 6 deletions base_remote/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>
@@ -9,10 +8,11 @@

/*
:Author: David Goodger (goodger@python.org)
: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.
@@ -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 {
@@ -367,7 +367,7 @@ <h1 class="title">Remote Base</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ea67cc2d0f89e980cd5e547aa5e5f51332a3c3e3a14d92daa92cfe8004ff9429
!! source digest: sha256:4285be2014dfd94cf777edc2fd32c52dc2cac9d6a09a9278c51410b06bf43fe0
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/server-tools/tree/16.0/base_remote"><img alt="OCA/server-tools" src="https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-tools-16-0/server-tools-16-0-base_remote"><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/server-tools&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 allows to store all the connected remotes (external ip addresses) to Odoo.
@@ -416,7 +416,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<div class="section" id="maintainers">
<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>
8 changes: 7 additions & 1 deletion excel_import_export/README.rst
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Excel Import/Export/Report
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:90fc204eb5ba2d2947c522bdc8e261026910c51a797320fc63b67f7891abda70
!! source digest: sha256:40c58b91ccaaaa2b5ead94e8975df9d77a9ae3d08e29f5647422c2a3e1dafd6b
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -51,6 +51,12 @@ Then, simply install **excel_import_export**.

For demo, install **excel_import_export_demo**

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

If you have existing templates from the version 16.0.1.2.0 or earlier, you need to click 'REMOVE EXPORT ACTION'
and then click 'ADD EXPORT ACTION' in these templates for export actions to work as expected.

Usage
=====

2 changes: 1 addition & 1 deletion excel_import_export/__manifest__.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
{
"name": "Excel Import/Export/Report",
"summary": "Base module for developing Excel import/export/report",
"version": "16.0.1.3.0",
"version": "16.0.1.3.1",
"author": "Ecosoft,Odoo Community Association (OCA)",
"license": "AGPL-3",
"website": "https://github.com/OCA/server-tools",
2 changes: 2 additions & 0 deletions excel_import_export/readme/CONFIGURE.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
If you have existing templates from the version 16.0.1.2.0 or earlier, you need to click 'REMOVE EXPORT ACTION'
and then click 'ADD EXPORT ACTION' in these templates for export actions to work as expected.
Loading