Skip to content

Commit

Permalink
Merge pull request #1337 from OCA/14.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/server-tools (14.0)
  • Loading branch information
bt-admin authored Nov 2, 2023
2 parents 2fd9124 + c5e0963 commit 4c8094a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ addon | version | maintainers | summary
[database_cleanup](database_cleanup/) | 14.0.1.0.3 | | Database cleanup
[datetime_formatter](datetime_formatter/) | 14.0.1.0.0 | | Helper functions to give correct format to date[time] fields
[dbfilter_from_header](dbfilter_from_header/) | 14.0.1.0.0 | | Filter databases with HTTP headers
[excel_import_export](excel_import_export/) | 14.0.1.1.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Base module for developing Excel import/export/report
[excel_import_export](excel_import_export/) | 14.0.1.1.2 | [![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/) | 14.0.1.0.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Excel Import/Export/Report Demo
[fetchmail_incoming_log](fetchmail_incoming_log/) | 14.0.1.0.0 | | Log all messages received, before they start to be processed.
[fetchmail_notify_error_to_sender](fetchmail_notify_error_to_sender/) | 14.0.1.0.0 | | If fetching mails gives error, send an email to sender
Expand Down
2 changes: 1 addition & 1 deletion excel_import_export/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Excel Import/Export/Report
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:c09e9a06b7721784c4eccadbef593c323c252861cab3f9ce142b53f0934ea128
!! source digest: sha256:55949783bbfe724febe56bcf6b3e91464534888d227224adddcccf4b1bc2e70a
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion excel_import_export/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"name": "Excel Import/Export/Report",
"summary": "Base module for developing Excel import/export/report",
"version": "14.0.1.1.1",
"version": "14.0.1.1.2",
"author": "Ecosoft,Odoo Community Association (OCA)",
"license": "AGPL-3",
"website": "https://github.com/OCA/server-tools",
Expand Down
2 changes: 1 addition & 1 deletion excel_import_export/models/xlsx_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def get_external_id(self, record):
ModelData.create(
{
"name": "{}_{}".format(record._table, record.id),
"module": "excel_import_export",
"module": "__excel_import_export__",
"model": record._name,
"res_id": record.id,
}
Expand Down
2 changes: 1 addition & 1 deletion excel_import_export/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Excel Import/Export/Report</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:c09e9a06b7721784c4eccadbef593c323c252861cab3f9ce142b53f0934ea128
!! source digest: sha256:55949783bbfe724febe56bcf6b3e91464534888d227224adddcccf4b1bc2e70a
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/14.0/excel_import_export"><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-14-0/server-tools-14-0-excel_import_export"><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=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>The module provide pre-built functions and wizards for developer to build excel import / export / report with ease.</p>
Expand Down
6 changes: 3 additions & 3 deletions module_analysis/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 13.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2023-10-09 07:52+0000\n"
"Last-Translator: mymage <[email protected]>\n"
"PO-Revision-Date: 2023-11-02 17:38+0000\n"
"Last-Translator: Francesco Foresti <[email protected]>\n"
"Language-Team: none\n"
"Language: it\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -101,7 +101,7 @@ msgstr "Quantità Codice JS"
#: model:ir.model.fields,field_description:module_analysis.field_ir_module_type____last_update
#: model:ir.model.fields,field_description:module_analysis.field_ir_module_type_rule____last_update
msgid "Last Modified on"
msgstr "Ultima Modifica il"
msgstr "Ultima modifica il"

#. module: module_analysis
#: model:ir.model.fields,field_description:module_analysis.field_ir_module_author__write_uid
Expand Down

0 comments on commit 4c8094a

Please sign in to comment.