Merge branch '16.0' of github.com:Mint-System/Odoo-Development into 16.0
This commit is contained in:
Kurt Gisler committed
commit
d69c3ee196
49 files changed
+204
-127
No files matched your search
@@ -202,10 +202,6 @@
|
||||
path = addons/social
|
||||
url = git@github.com:Mint-System/Odoo-Apps-Social.git
|
||||
branch = 16.0
|
||||
[submodule "addons/vertical_job_portal"]
|
||||
path = addons/vertical_job_portal
|
||||
url = git@github.com:sozialinfo/odoo-apps-vertical-job-portal.git
|
||||
branch = 16.0
|
||||
[submodule "oca/management-system"]
|
||||
path = oca/management-system
|
||||
url = git@github.com:OCA/management-system.git
|
||||
|
||||
+1
-1
Submodule addons/account_invoicing updated: 2fa54c1abe...99e5eff4ae.
+1
-1
Submodule addons/sale_workflow updated: 746930eb54...bfb0e304a3.
+1
-1
Submodule addons/server_tools updated: 9bfbe890ed...878ed7f905.
Submodule addons/vertical_job_portal deleted from 539367507f.
+1
-1
Submodule enterprise updated: 0a39088d57...674bb58415.
Submodule oca/account-financial-tools updated: da515faddb...11f8628173.
+1
-1
Submodule oca/account-invoicing updated: 018393fcf8...935e845f9d.
+1
-1
Submodule oca/bank-payment updated: 9f3f2cdd15...55718af9a4.
+1
-1
Submodule oca/contract updated: d5f7585d2e...a657a08ead.
+1
-1
Submodule oca/crm updated: ad5820be65...4f58b20f3e.
+1
-1
Submodule oca/dms updated: dc12b219e9...639272a09d.
+1
-1
Submodule oca/e-commerce updated: 010d9312cc...c6dd7463e9.
+1
-1
Submodule oca/helpdesk updated: 877e6ae06f...3ffa651044.
+1
-1
Submodule oca/hr updated: cac44efba2...cf984e48fa.
+1
-1
Submodule oca/hr-attendance updated: a313d1fcd1...0719b69513.
+1
-1
Submodule oca/l10n-switzerland updated: 1a12f04081...6ae4e3cd10.
+1
-1
Submodule oca/maintenance updated: 0dfb6ab17e...e7d96bb6c1.
+1
-1
Submodule oca/management-system updated: bc38bd4f63...cbcfaed22f.
+1
-1
Submodule oca/manufacture updated: c704c2ae6d...cecfff9144.
+1
-1
Submodule oca/partner-contact updated: a9999df1dc...d890989cbd.
+1
-1
Submodule oca/product-attribute updated: 3d4ee16b8b...6d6baa2508.
+1
-1
Submodule oca/project updated: 805cfc9366...5eac7f7ae5.
+1
-1
Submodule oca/purchase-workflow updated: 2ef0973287...2349c4d992.
+1
-1
Submodule oca/reporting-engine updated: e745a97019...79d67362da.
+1
-1
Submodule oca/rest-framework updated: fecc1ef47d...1dbe80b673.
+1
-1
Submodule oca/sale-reporting updated: 8dcd1b2fab...362e1e34fe.
+1
-1
Submodule oca/sale-workflow updated: 7eefd71dfd...4a72d88125.
+1
-1
Submodule oca/server-auth updated: df106880ce...dbebd70053.
+1
-1
Submodule oca/server-tools updated: 590cf43c30...54a7c67bd8.
+1
-1
Submodule oca/server-ux updated: f8b6b2b1f8...ee3b80ab76.
+1
-1
Submodule oca/social updated: 59160ffbb8...6306a34981.
Submodule oca/stock-logistics-warehouse updated: 6131cf7d4c...9cefd5dbe3.
Submodule oca/stock-logistics-workflow updated: 0eabc1e920...929b1624ed.
+1
-1
Submodule oca/web updated: 0cb7387ae4...dada4dc42e.
+1
-1
Submodule odoo updated: 4a4b597384...a809e63eae.
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="account.view_move_form" priority="50" >
|
||||
|
||||
<xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='partner_id']" position="replace">
|
||||
<field name="partner_id" optional="hide"/>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="hr_timesheet.hr_timesheet_line_tree" priority="50">
|
||||
|
||||
<xpath expr="//field[@name='task_id']" position="after">
|
||||
<field name="helpdesk_ticket_id" optional="hide" />
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="purchase.purchase_order_form" priority="50">
|
||||
|
||||
<xpath expr="//field[@name='qty_received']" position="attributes">
|
||||
<attribute name="optional"></attribute>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,17 @@
|
||||
<data inherit_id="sale.report_saleorder_document" priority="50">
|
||||
|
||||
<!-- <p name="order_note" position="before">
|
||||
<p>
|
||||
<strong>Remark:</strong>
|
||||
<span t-field="doc.comment" name="order_note" />
|
||||
</p>
|
||||
</p> -->
|
||||
|
||||
<div id="informations" position="inside">
|
||||
<div t-if="doc.comment" class="col-auto col-3 mw-100 mb-2">
|
||||
<strong>Remark:</strong>
|
||||
<p class="m-0" t-field="doc.comment"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="sale.view_order_form" priority="50">
|
||||
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="after">
|
||||
<field name="state" optional="hide" />
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<data inherit_id="web.external_layout_standard" priority="50">
|
||||
|
||||
<xpath expr="//div[hasclass('pt-5')]" position="attributes">
|
||||
<attribute name="class"></attribute>
|
||||
</xpath>
|
||||
|
||||
</data>
|
||||
@@ -133,7 +133,7 @@ function disable-auto-install() {
|
||||
|
||||
function build() {
|
||||
echo "Run Docker build with tag ${DOCKER_REGISTRY}${DOCKER_TAG}"
|
||||
docker build . --build-arg TARGETARCH="$TARGETARCH" -t "${DOCKER_REGISTRY}${DOCKER_TAG}"
|
||||
docker build . --build-arg TARGETARCH="$TARGETARCH" --build-arg ODOO_IMAGE="odoo:$GIT_BRANCH" -t "${DOCKER_REGISTRY}${DOCKER_TAG}"
|
||||
}
|
||||
|
||||
function install-odoo-scripts() {
|
||||
@@ -170,7 +170,7 @@ function install-native() {
|
||||
pip install -r odoo/requirements.txt
|
||||
|
||||
echo "Install oca dev tools"
|
||||
pip install pre-commit pyyaml rst2html5 odoorpc
|
||||
pip install pre-commit pyyaml rst2html5 odoorpc coverage
|
||||
|
||||
echo "Install graphql dependencies"
|
||||
pip install graphene graphql-server-core
|
||||
@@ -409,6 +409,22 @@ function test-module() {
|
||||
odoo-bin -d "$DATABASE" -i "$MODULE_NAME" --config 'config/odoo.conf' --addons-path="$ADDONS_PATH" --stop-after-init --test-tags /"$MODULE_NAME"
|
||||
}
|
||||
|
||||
function test-coverage-module() {
|
||||
DATABASE="$1"
|
||||
MODULE_NAME=$(basename "$2")
|
||||
|
||||
# Use default database if second param is not given
|
||||
if test -z "$2"; then
|
||||
DATABASE="$GIT_BRANCH"
|
||||
MODULE_NAME=$(basename "$1")
|
||||
fi
|
||||
|
||||
activate-venv
|
||||
set-addons-path
|
||||
echo "Testing module $MODULE_NAME on $DATABASE ..."
|
||||
coverage run odoo-bin -d "$DATABASE" -i "$MODULE_NAME" --config 'config/odoo.conf' --addons-path="$ADDONS_PATH" --stop-after-init --test-tags /"$MODULE_NAME"
|
||||
}
|
||||
|
||||
function remove-module() {
|
||||
if test -z "$1"; then echo "\$1 is empty."; exit; fi
|
||||
|
||||
@@ -1027,6 +1043,9 @@ case "$1" in
|
||||
test-module)
|
||||
test-module "$2" "$3"
|
||||
;;
|
||||
test-coverage-module)
|
||||
test-coverage-module "$2" "$3"
|
||||
;;
|
||||
create-module)
|
||||
create-module "$2"
|
||||
;;
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
| git-switch-branch | [branch] | Switch submodules to target branch. |
|
||||
| test-jsonrpc | [env] | Test json rpc connection. |
|
||||
| test-module | [db][name,path] | Test target Odoo module. |
|
||||
| test-coverage-module | [db][name,path] | Generate test coverage report for target Odoo module. |
|
||||
| update-app-list | [db] | Update app list. |
|
||||
| update-docs | | Update project docs. |
|
||||
| update-module | [db][name,path] | Update target Odoo module. |
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import logging
|
||||
from odoo import fields, models, api, _
|
||||
|
||||
from odoo import _, api, fields, models
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<odoo>
|
||||
|
||||
<field name="name">{{ name }}.report_invoice_document</field>
|
||||
<field name="name">{{ name }}.report_invoice_document</field>
|
||||
<field name="model">{{ name }}</field>
|
||||
<field name="inherit_id" ref="purchase.purchase_order_form"/>
|
||||
<field name="inherit_id" ref="purchase.purchase_order_form" />
|
||||
<field name="priority">50</field>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="/t/t/div/h2" position="after">
|
||||
<t t-if="o.description">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<br/>
|
||||
<span t-field="o.description"/>
|
||||
<br/>
|
||||
<br/>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</xpath>
|
||||
<xpath expr="/t/t/div/h2" position="attributes">
|
||||
<attribute name="style" separator=";" add="margin-top:15px"/>
|
||||
</xpath>
|
||||
</data>
|
||||
<data>
|
||||
<xpath expr="/t/t/div/h2" position="after">
|
||||
<t t-if="o.description">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<br />
|
||||
<span t-field="o.description" />
|
||||
<br />
|
||||
<br />
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</xpath>
|
||||
<xpath expr="/t/t/div/h2" position="attributes">
|
||||
<attribute name="style" separator=";" add="margin-top:15px" />
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -1,16 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<template id="widget" inherit_id="web.assets_backend">
|
||||
<xpath expr="//script[last()]" position="after">
|
||||
<script type="text/javascript" src="/{{ name }}/static/js/widget.js" />
|
||||
</xpath>
|
||||
</template>
|
||||
<template id="widget" inherit_id="web.assets_backend">
|
||||
<xpath expr="//script[last()]" position="after">
|
||||
<script type="text/javascript" src="/{{ name }}/static/js/widget.js" />
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="assets_backend" name="Assets Backend" inherit_id="web.assets_backend">
|
||||
<xpath expr="." position="inside">
|
||||
<link rel="stylesheet" href="/{ name }}/static/src/css/style.css"/>
|
||||
</xpath>
|
||||
</template>
|
||||
<template id="assets_backend" name="Assets Backend" inherit_id="web.assets_backend">
|
||||
<xpath expr="." position="inside">
|
||||
<link rel="stylesheet" href="/{ name }}/static/src/css/style.css" />
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
</odoo>
|
||||
@@ -1,65 +1,68 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<record id="view_order_form" model="ir.ui.view">
|
||||
<field name="name">{{ name }}.view_order_form</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='order_line']/tree[1]/field[@name='sequence']" position="after">
|
||||
<field name="position"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_order_form" model="ir.ui.view">
|
||||
<field name="name">{{ name }}.view_order_form</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='order_line']/tree[1]/field[@name='sequence']"
|
||||
position="after">
|
||||
<field name="position" />
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_tree" model="ir.ui.view">
|
||||
<field name="name">{{ name }}.view_tree</field>
|
||||
<field name="model">{{ name }}</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="name"/>
|
||||
<field name="value"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_tree" model="ir.ui.view">
|
||||
<field name="name">{{ name }}.view_tree</field>
|
||||
<field name="model">{{ name }}</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="name" />
|
||||
<field name="value" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_pivot" model="ir.ui.view">
|
||||
<field name="name">{{ name }}.view_pivot</field>
|
||||
<field name="model">{{ name }}</field>
|
||||
<field name="arch" type="xml">
|
||||
<pivot>
|
||||
<field name="value" type="col"/>
|
||||
<field name="name" type="row"/>
|
||||
<field name="value" type="measure" />
|
||||
</pivot>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_pivot" model="ir.ui.view">
|
||||
<field name="name">{{ name }}.view_pivot</field>
|
||||
<field name="model">{{ name }}</field>
|
||||
<field name="arch" type="xml">
|
||||
<pivot>
|
||||
<field name="value" type="col" />
|
||||
<field name="name" type="row" />
|
||||
<field name="value" type="measure" />
|
||||
</pivot>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="open_view_tree" model="ir.actions.act_window">
|
||||
<field name="name">{{ name }}.open_view_tree</field>
|
||||
<field name="res_model">{{ name }}</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<record id="open_view_tree" model="ir.actions.act_window">
|
||||
<field name="name">{{ name }}.open_view_tree</field>
|
||||
<field name="res_model">{{ name }}</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<record id="document_server_action" model="ir.actions.server">
|
||||
<field name="name">{{ name }}.document_server_action</field>
|
||||
<field name="model_id" ref="model_{{ name }}_document"/>
|
||||
<field name="state">code</field>
|
||||
<field name="code">
|
||||
action = {
|
||||
"type": "ir.actions.act_window",
|
||||
"view_mode": "tree,form",
|
||||
"res_model": model._name,
|
||||
}
|
||||
</field>
|
||||
</record>
|
||||
<record id="document_server_action" model="ir.actions.server">
|
||||
<field name="name">{{ name }}.document_server_action</field>
|
||||
<field name="model_id" ref="model_{{ name }}_document" />
|
||||
<field name="state">code</field>
|
||||
<field name="code">
|
||||
action = {
|
||||
"type": "ir.actions.act_window",
|
||||
"view_mode": "tree,form",
|
||||
"res_model": model._name,
|
||||
}
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<menuitem name="{{ name }}" id="{{ name }}.menu_root"/>
|
||||
<menuitem name="{{ name }}" id="{{ name }}.menu_root" />
|
||||
|
||||
<menuitem name="Documents" id="{{ name }}.menu_document" parent="{{ name }}.menu_root"/>
|
||||
<menuitem name="Configurations" id="{{ name }}.menu_configuration" parent="{{ name }}.menu_root"/>
|
||||
<menuitem name="Documents" id="{{ name }}.menu_document" parent="{{ name }}.menu_root" />
|
||||
<menuitem name="Configurations" id="{{ name }}.menu_configuration" parent="{{ name }}.menu_root" />
|
||||
|
||||
<menuitem name="Documents" id="{{ name }}.menu_document" parent="{{ name }}.documents_menu" action="{{ name }}.open_view_tree"/>
|
||||
<menuitem name="Server to list" id="{{ name }}.menu_server_action" parent="{{ name }}.menu_configuration" action="{{ name }}.document_server_action"/>
|
||||
<menuitem name="Documents" id="{{ name }}.menu_document" parent="{{ name }}.documents_menu"
|
||||
action="{{ name }}.open_view_tree" />
|
||||
<menuitem name="Server to list" id="{{ name }}.menu_server_action"
|
||||
parent="{{ name }}.menu_configuration" action="{{ name }}.document_server_action" />
|
||||
|
||||
</odoo>
|
||||
+1
-1
Submodule themes updated: b6d64c7595...5beef00dfb.
Reference in new issue
Block a user