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 authored Jul 8, 2024
2 parents da6c4d3 + 0ef484d commit e780e9c
Show file tree
Hide file tree
Showing 65 changed files with 1,216 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]>
14 changes: 6 additions & 8 deletions machine_manager/demo/machine_model_demo.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<openerp>
<data>
<record id="machine_model_1" model="machine.model">
<field name="name">Personal Computer</field>
<field name="model_type">PC</field>
</record>
</data>
</openerp>
<odoo>
<record id="machine_model_1" model="machine.model">
<field name="name">Personal Computer</field>
<field name="model_type">PC</field>
</record>
</odoo>
56 changes: 27 additions & 29 deletions machine_manager/demo/machinery_demo.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
<?xml version="1.0" encoding="utf-8" ?>
<openerp>
<data>
<!--
Stock production lot for product
-->
<record id="production_lot_1" model="stock.lot">
<field name="name">L0004</field>
<field name="product_id" ref="product.product_product_3" />
</record>
<!--
Product converted to machine
-->
<record id="product.product_product_3" model="product.product">
<field name="machine_ok" eval="True" />
</record>
<!--
machinery resources
-->
<record id="machinery_1" model="machinery">
<field name="name">Personal PC</field>
<field name="purch_cost">800.0</field>
<field name="year">2013</field>
<field name="model">SC234</field>
<field name="product_id" ref="product.product_product_3" />
<field name="serial_id" ref="production_lot_1" />
<field name="user_ids" eval="[(4, ref('machinery_user_1'))]" />
</record>
</data>
</openerp>
<odoo>
<!--
Stock production lot for product
-->
<record id="production_lot_1" model="stock.lot">
<field name="name">L0004</field>
<field name="product_id" ref="product.product_product_3" />
</record>
<!--
Product converted to machine
-->
<record id="product.product_product_3" model="product.product">
<field name="machine_ok" eval="True" />
</record>
<!--
machinery resources
-->
<record id="machinery_1" model="machinery">
<field name="name">Personal PC</field>
<field name="purch_cost">800.0</field>
<field name="year">2013</field>
<field name="model">SC234</field>
<field name="product_id" ref="product.product_product_3" />
<field name="serial_id" ref="production_lot_1" />
<field name="user_ids" eval="[(4, ref('machinery_user_1'))]" />
</record>
</odoo>
34 changes: 16 additions & 18 deletions machine_manager/security/machine_manager_security.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<openerp>
<data noupdate="0">
<record model="ir.module.category" id="module_machinery_category">
<field name="name">Machine Management</field>
<field name="sequence">20</field>
</record>
<record id="group_machine_user" model="res.groups">
<field name="name">User</field>
<field name="category_id" ref="module_machinery_category" />
</record>
<record id="group_machine_manager" model="res.groups">
<field name="name">Manager</field>
<field name="implied_ids" eval="[(4, ref('group_machine_user'))]" />
<field name="category_id" ref="module_machinery_category" />
<field name="users" eval="[(4, ref('base.user_root'))]" />
</record>
</data>
</openerp>
<odoo noupdate="0">
<record model="ir.module.category" id="module_machinery_category">
<field name="name">Machine Management</field>
<field name="sequence">20</field>
</record>
<record id="group_machine_user" model="res.groups">
<field name="name">User</field>
<field name="category_id" ref="module_machinery_category" />
</record>
<record id="group_machine_manager" model="res.groups">
<field name="name">Manager</field>
<field name="implied_ids" eval="[(4, ref('group_machine_user'))]" />
<field name="category_id" ref="module_machinery_category" />
<field name="users" eval="[(4, ref('base.user_root'))]" />
</record>
</odoo>
Loading

0 comments on commit e780e9c

Please sign in to comment.