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

Syncing from upstream OCA/server-tools (16.0) #1385

Merged
merged 6 commits into from
Dec 25, 2023
Merged
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ addon | version | maintainers | summary
[base_time_window](base_time_window/) | 16.0.1.0.0 | | Base model to handle time windows
[base_view_inheritance_extension](base_view_inheritance_extension/) | 16.0.1.1.0 | | Adds more operators for view inheritance
[dbfilter_from_header](dbfilter_from_header/) | 16.0.1.0.0 | | Filter databases with HTTP headers
[excel_import_export](excel_import_export/) | 16.0.1.0.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/) | 16.0.1.1.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.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
[html_text](html_text/) | 16.0.1.0.0 | | Generate excerpts from any HTML field
Expand Down
14 changes: 6 additions & 8 deletions auto_backup/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-03 10:08+0000\n"
"PO-Revision-Date: 2023-06-13 16:10+0000\n"
"PO-Revision-Date: 2023-12-24 19:40+0000\n"
"Last-Translator: mymage <[email protected]>\n"
"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
"Language: it\n"
Expand Down Expand Up @@ -104,9 +104,8 @@ msgstr ""

#. module: auto_backup
#: model:ir.model.fields,help:auto_backup.field_db_backup__backup_format
#, fuzzy
msgid "Choose the format for this backup."
msgstr "Scegliere il tipo di archiviazione per questo metodo di backup. "
msgstr "Scegliere il tipo di archiviazione per questo metodo di backup."

#. module: auto_backup
#: model:ir.model.fields,help:auto_backup.field_db_backup__method
Expand All @@ -124,13 +123,13 @@ msgstr "Pulizia dei vecchi backup del database non riuscita."
#: code:addons/auto_backup/models/db_backup.py:0
#, python-format
msgid "Connection Test Failed!"
msgstr "Prova di connessione non riuscita."
msgstr "Prova di connessione non riuscita!"

#. module: auto_backup
#: code:addons/auto_backup/models/db_backup.py:0
#, python-format
msgid "Connection Test Succeeded!"
msgstr "Prova di connessione superata."
msgstr "Prova di connessione superata!"

#. module: auto_backup
#: model:ir.model.fields,field_description:auto_backup.field_db_backup__count_pending_changeset_changes
Expand Down Expand Up @@ -188,7 +187,7 @@ msgid ""
"Do not save backups on your filestore, or you will backup your backups too!"
msgstr ""
"Non salvare i backup nel proprio filestore altrimenti verrà effettuato anche "
"un backup degli stessi backup."
"un backup degli stessi backup!"

#. module: auto_backup
#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_conf_form
Expand Down Expand Up @@ -217,10 +216,9 @@ msgstr "Seguito da (partner)"

#. module: auto_backup
#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_conf_form
#, fuzzy
msgid "Go to Settings / Technical / Automation / Scheduled Actions."
msgstr ""
"Andare in Configurazione / Funzioni Tecniche / Automazione / Azioni "
"Andare in Configurazione / Funzioni Tecniche / Automazione / Azioni "
"Programmate."

#. module: auto_backup
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:d2156d3772802c846393876984dabe1aa56b21b425b564039b0663b901b0e121
!! source digest: sha256:71e187de9ab7723f404469d47ee695cf540260f860ccdd3ec12963a1a4b52ea7
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |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": "16.0.1.0.1",
"version": "16.0.1.1.0",
"author": "Ecosoft,Odoo Community Association (OCA)",
"license": "AGPL-3",
"website": "https://github.com/OCA/server-tools",
Expand Down
5 changes: 5 additions & 0 deletions excel_import_export/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,11 @@ msgstr "Importar Excel"
msgid "Import File (*.xlsx)"
msgstr "Importar archivo (*.xlsx)"

#. module: excel_import_export
#: model:ir.model.fields,field_description:excel_import_export.field_import_xlsx_wizard__filename
msgid "Import File Name"
msgstr ""

#. module: excel_import_export
#: model_terms:ir.ui.view,arch_db:excel_import_export.import_xlsx_wizard
msgid "Import File Template"
Expand Down
5 changes: 5 additions & 0 deletions excel_import_export/i18n/excel_import_export.pot
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,11 @@ msgstr ""
msgid "Import File (*.xlsx)"
msgstr ""

#. module: excel_import_export
#: model:ir.model.fields,field_description:excel_import_export.field_import_xlsx_wizard__filename
msgid "Import File Name"
msgstr ""

#. module: excel_import_export
#: model_terms:ir.ui.view,arch_db:excel_import_export.import_xlsx_wizard
msgid "Import File Template"
Expand Down
5 changes: 5 additions & 0 deletions excel_import_export/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,11 @@ msgstr "Importa Excel"
msgid "Import File (*.xlsx)"
msgstr "Importa File (*.xlsx)"

#. module: excel_import_export
#: model:ir.model.fields,field_description:excel_import_export.field_import_xlsx_wizard__filename
msgid "Import File Name"
msgstr ""

#. module: excel_import_export
#: model_terms:ir.ui.view,arch_db:excel_import_export.import_xlsx_wizard
msgid "Import File Template"
Expand Down
5 changes: 5 additions & 0 deletions excel_import_export/i18n/zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,11 @@ msgstr "导入Excel"
msgid "Import File (*.xlsx)"
msgstr "导入文件 (*.xlsx)"

#. module: excel_import_export
#: model:ir.model.fields,field_description:excel_import_export.field_import_xlsx_wizard__filename
msgid "Import File Name"
msgstr ""

#. module: excel_import_export
#: model_terms:ir.ui.view,arch_db:excel_import_export.import_xlsx_wizard
msgid "Import File Template"
Expand Down
3 changes: 1 addition & 2 deletions excel_import_export/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>
Expand Down Expand Up @@ -367,7 +366,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:d2156d3772802c846393876984dabe1aa56b21b425b564039b0663b901b0e121
!! source digest: sha256:71e187de9ab7723f404469d47ee695cf540260f860ccdd3ec12963a1a4b52ea7
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/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-16-0/server-tools-16-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=16.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
1 change: 1 addition & 0 deletions excel_import_export/wizard/import_xlsx_wizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class ImportXLSXWizard(models.TransientModel):
_description = "Wizard for importing excel"

import_file = fields.Binary(string="Import File (*.xlsx)")
filename = fields.Char("Import File Name")
template_id = fields.Many2one(
"xlsx.template",
string="Template",
Expand Down
2 changes: 2 additions & 0 deletions excel_import_export/wizard/import_xlsx_wizard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
<field name="id" invisible="1" />
<field name="state" invisible="1" />
<field name="fname" invisible="1" />
<field name="filename" invisible="1" />
<field name="res_model" invisible="1" />
<field name="res_id" invisible="1" />
<group states="choose">
<group>
<field
name="import_file"
attrs="{'invisible': [('res_id', '=', False)]}"
filename="filename"
/>
<field
name="attachment_ids"
Expand Down
Loading