Skip to content

Commit

Permalink
Merge branch '16.0' into 16.0-mig-partner_equal_ref_barcode
Browse files Browse the repository at this point in the history
  • Loading branch information
unaiberis committed Jul 15, 2024
2 parents da6c4d3 + 0ef484d commit b40734f
Show file tree
Hide file tree
Showing 145 changed files with 3,012 additions and 1,062 deletions.
1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
luxon: readonly

# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ __pycache__/
*.py[cod]
/.venv
/.pytest_cache
/.ruff_cache

# C extensions
*.so
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ repos:
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://github.com/avanzosc/odoo-addons"]
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/myint/autoflake
rev: v2.3.1
hooks:
Expand Down
1 change: 0 additions & 1 deletion account_asset_line_menu/views/account_asset_line_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<field name="model">account.asset.line</field>
<field name="arch" type="xml">
<tree
string="Assets Lines"
decoration-info="(move_check == False) and (init_entry == False)"
create="false"
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="report_invoice_document" inherit_id="account.report_invoice_document">
<template
id="report_invoice_document"
inherit_id="account.report_invoice_document"
priority="100"
>
<span t-field="line.name" position="replace">
<span t-field="line.product_display_name" t-options="{'widget': 'text'}" />
</span>
Expand Down
1 change: 1 addition & 0 deletions account_invoice_usability/views/account_move_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<record id="view_move_form" model="ir.ui.view">
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_move_form" />
<field name="priority">100</field>
<field name="arch" type="xml">
<xpath
expr="//field[@name='invoice_line_ids']/tree/field[@name='product_id']"
Expand Down
15 changes: 10 additions & 5 deletions account_stock_lot_origin_global_gap/models/account_move_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,29 @@ class AccountMoveLine(models.Model):
_inherit = "account.move.line"

lot_id = fields.Many2one(
string="Lot", comodel_name="stock.lot", compute="_compute_country_global_gap"
string="Lot",
comodel_name="stock.lot",
compute="_compute_country_global_gap",
)
lot_country_id = fields.Many2one(
string="Lot Origin",
comodel_name="res.country",
compute="_compute_country_global_gap",
)
lot_global_gap = fields.Char(
string="Lot Global Gap", compute="_compute_country_global_gap"
compute="_compute_country_global_gap",
)
lot_country_to_print = fields.Text(
string="Lot Origin OF", compute="_compute_country_global_gap"
string="Lot Origin OF",
compute="_compute_country_global_gap",
)
lot_global_gap_to_print = fields.Text(
string="Lot Global Gap OF", compute="_compute_country_global_gap"
string="Lot Global Gap OF",
compute="_compute_country_global_gap",
)
lot_country_gloval_gap_of = fields.Text(
string="Lot Origin/Global Gap OF", compute="_compute_country_global_gap"
string="Lot Origin/Global Gap OF",
compute="_compute_country_global_gap",
)

def _compute_country_global_gap(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<template
id="stock_account_report_invoice_document_inh_origin_global_gap"
inherit_id="stock_account.stock_account_report_invoice_document"
priority="100"
>
<t t-set="lot_values" position="replace" />
<t t-if="lot_values" position="replace" />
Expand Down
39 changes: 39 additions & 0 deletions base_import_wizard/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
==================
Base Import Wizard
==================

.. |badge1| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3

|badge1|

Base abstract module for implementing different import wizards.

**Table of contents**

.. contents::
:local:

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/avanzosc/odoo-addons/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
feedback.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
~~~~~~~

* AvanzOSC

Contributors
~~~~~~~~~~~~

* Oihane Crucelaegui <[email protected]>
96 changes: 47 additions & 49 deletions base_location_usability/views/res_city_zip_views.xml
Original file line number Diff line number Diff line change
@@ -1,57 +1,55 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data>
<record id="res_city_zip_view_tree" model="ir.ui.view">
<field name="model">res.city.zip</field>
<field name="inherit_id" ref="base_location.city_zip_tree" />
<field name="arch" type="xml">
<field name="city_id" position="after">
<field name="state_id" />
<field name="country_id" />
</field>
<record id="res_city_zip_view_tree" model="ir.ui.view">
<field name="model">res.city.zip</field>
<field name="inherit_id" ref="base_location.city_zip_tree" />
<field name="arch" type="xml">
<field name="city_id" position="after">
<field name="state_id" />
<field name="country_id" />
</field>
</record>
</field>
</record>

<record id="res_city_zip_view_search" model="ir.ui.view">
<field name="model">res.city.zip</field>
<field name="inherit_id" ref="base_location.view_city_zip_filter" />
<field name="arch" type="xml">
<field name="city_id" position="after">
<field name="state_id" />
<field name="country_id" />
<group expand="0" string="Group By">
<filter
name="city"
string="City"
domain="[]"
context="{'group_by':'city_id'}"
/>
<filter
name="state"
string="State"
domain="[]"
context="{'group_by':'state_id'}"
/>
<filter
name="country"
string="Country"
domain="[]"
context="{'group_by':'country_id'}"
/>
</group>
</field>
<record id="res_city_zip_view_search" model="ir.ui.view">
<field name="model">res.city.zip</field>
<field name="inherit_id" ref="base_location.view_city_zip_filter" />
<field name="arch" type="xml">
<field name="city_id" position="after">
<field name="state_id" />
<field name="country_id" />
<group expand="0" string="Group By">
<filter
name="city"
string="City"
domain="[]"
context="{'group_by':'city_id'}"
/>
<filter
name="state"
string="State"
domain="[]"
context="{'group_by':'state_id'}"
/>
<filter
name="country"
string="Country"
domain="[]"
context="{'group_by':'country_id'}"
/>
</group>
</field>
</record>
</field>
</record>

<record id="res_city_zip_view_form" model="ir.ui.view">
<field name="model">res.city.zip</field>
<field name="inherit_id" ref="base_location.city_zip_form" />
<field name="arch" type="xml">
<field name="city_id" position="after">
<field name="state_id" />
<field name="country_id" />
</field>
<record id="res_city_zip_view_form" model="ir.ui.view">
<field name="model">res.city.zip</field>
<field name="inherit_id" ref="base_location.city_zip_form" />
<field name="arch" type="xml">
<field name="city_id" position="after">
<field name="state_id" />
<field name="country_id" />
</field>
</record>
</data>
</field>
</record>
</odoo>
40 changes: 40 additions & 0 deletions contacts_import_wizard/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
======================
Contacts Import Wizard
======================

.. |badge1| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3

|badge1|

Module to import contacts, it allows to create / update contacts.

**Table of contents**

.. contents::
:local:

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/avanzosc/odoo-addons/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
feedback.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
~~~~~~~

* AvanzOSC

Contributors
~~~~~~~~~~~~

* Oihane Crucelaegui <[email protected]>
* Ana Juaristi <[email protected]>
28 changes: 28 additions & 0 deletions event_registration_sale_line_contract/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3

=====================================
Event registration sale line contract
=====================================

* In event registration 2 new fields, sale contract line, and sale contract.

Bug Tracker
===========

Bugs are tracked on `GitHub Issues
<https://github.com/avanzosc/odoo-addons/issues>`_. In case of trouble,
please check there if your issue has already been reported. If you spotted
it first, help us smash it by providing detailed and welcomed feedback.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Contributors
------------

* Berezi Amubieta <[email protected]>
* Alfredo de la Fuente <[email protected]>
1 change: 1 addition & 0 deletions event_registration_sale_line_contract/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
19 changes: 19 additions & 0 deletions event_registration_sale_line_contract/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright 2021 Alfredo de la Fuente - AvanzOSC
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
"name": "Event Registration Sale Line Contract",
"version": "16.0.1.0.0",
"author": "Avanzosc",
"website": "https://github.com/avanzosc/odoo-addons",
"category": "Marketing/Events",
"depends": [
"event_sale",
"sale_order_line_contract",
],
"data": [
"views/event_registration_views.xml",
],
"license": "AGPL-3",
"installable": True,
"auto_install": True,
}
49 changes: 49 additions & 0 deletions event_registration_sale_line_contract/i18n/es.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * event_registration_sale_line_contract
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-25 12:40+0000\n"
"PO-Revision-Date: 2021-05-25 12:40+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: event_registration_sale_line_contract
#: model:ir.model.fields,field_description:event_registration_sale_line_contract.field_event_registration__contract_id
#: model_terms:ir.ui.view,arch_db:event_registration_sale_line_contract.view_registration_search
msgid "Contract"
msgstr "Contrato"

#. module: event_registration_sale_line_contract
#: model:ir.model.fields,field_description:event_registration_sale_line_contract.field_event_registration__contract_line_id
#: model_terms:ir.ui.view,arch_db:event_registration_sale_line_contract.view_registration_search
msgid "Contract line"
msgstr "Línea contrato"

#. module: event_registration_sale_line_contract
#: model:ir.model.fields,field_description:event_registration_sale_line_contract.field_event_registration__display_name
msgid "Display Name"
msgstr "Nombre mostrado"

#. module: event_registration_sale_line_contract
#: model:ir.model,name:event_registration_sale_line_contract.model_event_registration
msgid "Event Registration"
msgstr "Registro de eventos"

#. module: event_registration_sale_line_contract
#: model:ir.model.fields,field_description:event_registration_sale_line_contract.field_event_registration__id
msgid "ID"
msgstr ""

#. module: event_registration_sale_line_contract
#: model:ir.model.fields,field_description:event_registration_sale_line_contract.field_event_registration____last_update
msgid "Last Modified on"
msgstr "Última modificación el"

Loading

0 comments on commit b40734f

Please sign in to comment.