Skip to content
Extraits de code Groupes Projets
Valider 02988531 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

[MIG] version 17.0

parent e8ffb75e
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -4,7 +4,7 @@ env: ...@@ -4,7 +4,7 @@ env:
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 # See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
parserOptions: parserOptions:
ecmaVersion: 2019 ecmaVersion: 2022
overrides: overrides:
- files: - files:
......
...@@ -26,6 +26,15 @@ var/ ...@@ -26,6 +26,15 @@ var/
*.eggs *.eggs
.copier-answers.yml .copier-answers.yml
# Debian packages
*.deb
# Redhat packages
*.rpm
# MacOS packages
*.dmg
# Installer logs # Installer logs
pip-log.txt pip-log.txt
pip-delete-this-directory.txt pip-delete-this-directory.txt
......
...@@ -16,6 +16,8 @@ exclude: | ...@@ -16,6 +16,8 @@ exclude: |
readme/.*\.(rst|md)$| readme/.*\.(rst|md)$|
# Ignore build and dist directories in addons # Ignore build and dist directories in addons
/build/|/dist/| /build/|/dist/|
# Ignore test files in addons
/tests/samples/.*|
# You don't usually want a bot to modify your legal texts # You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*) (LICENSE.*|COPYING.*)
default_language_version: default_language_version:
...@@ -35,9 +37,14 @@ repos: ...@@ -35,9 +37,14 @@ repos:
name: en.po files cannot exist name: en.po files cannot exist
entry: found a en.po file entry: found a en.po file
language: fail language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$' files:
'[a-zA-Z0-9_]*/i18n/en\.po$'
# - repo: https://github.com/sbidoul/whool
# rev: v0.5
# hooks:
# - id: whool-init
- repo: https://github.com/oca/maintainer-tools - repo: https://github.com/oca/maintainer-tools
rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60 rev: d5fab7ee87fceee858a3d01048c78a548974d935
hooks: hooks:
# update the NOT INSTALLABLE ADDONS section above # update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons - id: oca-update-pre-commit-excluded-addons
...@@ -46,11 +53,13 @@ repos: ...@@ -46,11 +53,13 @@ repos:
- id: oca-gen-addon-readme - id: oca-gen-addon-readme
args: args:
- --addons-dir=. - --addons-dir=.
- --branch=16.0 - --branch=17.0
- --org-name=lefilament - --org-name=lefilament
- --repo-name=template_module - --repo-name=template_module
- --if-source-changed - --if-source-changed
- --keep-source-digest - --keep-source-digest
- --convert-fragments-to-markdown
# - id: oca-gen-external-dependencies
- repo: https://github.com/OCA/odoo-pre-commit-hooks - repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25 rev: v0.0.25
hooks: hooks:
...@@ -104,7 +113,7 @@ repos: ...@@ -104,7 +113,7 @@ repos:
args: [--fix, --exit-non-zero-on-fix] args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format - id: ruff-format
- repo: https://github.com/OCA/pylint-odoo - repo: https://github.com/OCA/pylint-odoo
rev: v8.0.19 rev: v9.0.4
hooks: hooks:
- id: pylint_odoo - id: pylint_odoo
name: pylint with optional checks name: pylint with optional checks
......
...@@ -5,12 +5,12 @@ load-plugins=pylint_odoo ...@@ -5,12 +5,12 @@ load-plugins=pylint_odoo
score=n score=n
[ODOOLINT] [ODOOLINT]
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Le Filament manifest-required-authors=Le Filament
manifest_required_keys=license manifest-required-keys=license
manifest_deprecated_keys=description,active manifest-deprecated-keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=16.0 valid-odoo-versions=17.0
[MESSAGES CONTROL] [MESSAGES CONTROL]
disable=all disable=all
......
...@@ -9,7 +9,7 @@ manifest-required-authors=Le Filament ...@@ -9,7 +9,7 @@ manifest-required-authors=Le Filament
manifest-required-keys=license manifest-required-keys=license
manifest-deprecated-keys=description,active manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=16.0 valid-odoo-versions=17.0
[MESSAGES CONTROL] [MESSAGES CONTROL]
disable=all disable=all
......
...@@ -11,9 +11,10 @@ This module depends upon *sale* module. ...@@ -11,9 +11,10 @@ This module depends upon *sale* module.
This module provides: This module provides:
* Updated quotation tree view to display untaxed amount instead of taxed amount * Updated quotation views to display untaxed amount instead of taxed amount
* Updated sale order tree view to display untaxed amount instead of taxed amount * Updated sale order views to display untaxed amount instead of taxed amount
* Updated sale order tree view to display amount that remains to be invoiced * Updated sale order tree/form views to display untax amount that remains to be invoiced
* beneficiary_id (initialized with partner_id) on invoices
Credits Credits
...@@ -23,7 +24,7 @@ Contributors ...@@ -23,7 +24,7 @@ Contributors
------------ ------------
* Benjamin Rivier <benjamin@le-filament.com> * Benjamin Rivier <benjamin@le-filament.com>
* Remi Cazenave <remi@le-filament.com> * Rémi Cazenave <remi@le-filament.com>
* Juliana Poudou <juliana@le-filament.com> * Juliana Poudou <juliana@le-filament.com>
......
{ {
"name": "Le Filament - Sales", "name": "Le Filament - Sales",
"summary": "Generic Sales views update by Le Filament", "summary": "Generic Sales views update by Le Filament",
"version": "16.0.1.0.0", "version": "17.0.1.0.0",
"license": "AGPL-3", "license": "AGPL-3",
"author": "Le Filament", "author": "Le Filament",
"category": "Sales/Sales", "category": "Sales/Sales",
......
# Copyright 2018-2022 Le Filament (<https://le-filament.com>) # Copyright 2018- Le Filament (https://le-filament.com)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import api, fields, models from odoo import api, fields, models
......
# Copyright 2018-2022 Le Filament (<https://le-filament.com>) # Copyright 2018- Le Filament (https://le-filament.com)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import api, fields, models from odoo import api, fields, models
......
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2022 Le Filament (<https://le-filament.com>) <!-- Copyright 2022- Le Filament (https://le-filament.com)
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<record model="ir.ui.view" id="view_move_form_filament"> <record model="ir.ui.view" id="view_move_form_filament">
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<field name="partner_shipping_id" position="after"> <field name="partner_shipping_id" position="after">
<field <field
name="beneficiary_id" name="beneficiary_id"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))]}" invisible="move_type not in ('out_invoice', 'out_refund')"
/> />
</field> </field>
</field> </field>
......
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2022- Le Filament (<https://le-filament.com>) <!-- Copyright 2022- Le Filament (https://le-filament.com)
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<record id="lf_view_sale_order_calendar" model="ir.ui.view"> <record id="lf_view_sale_order_calendar" model="ir.ui.view">
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<record id="lf_view_order_tree" model="ir.ui.view"> <record id="lf_view_order_tree" model="ir.ui.view">
<field name="inherit_id" ref="sale.view_order_tree" /> <field name="inherit_id" ref="sale.view_order_tree" />
<field name="name">sale.order.tree</field> <field name="name">sale.order.tree (orders)</field>
<field name="model">sale.order</field> <field name="model">sale.order</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="amount_untaxed" position="attributes"> <field name="amount_untaxed" position="attributes">
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<field name="amount_total" position="attributes"> <field name="amount_total" position="attributes">
<attribute name="optional">hide</attribute> <attribute name="optional">hide</attribute>
</field> </field>
<field name="amount_total" position="after"> <field name="amount_to_invoice" position="after">
<field <field
name="untaxed_amount_to_invoice" name="untaxed_amount_to_invoice"
widget="monetary" widget="monetary"
...@@ -81,9 +81,12 @@ ...@@ -81,9 +81,12 @@
<record id="lf_view_quotation_tree" model="ir.ui.view"> <record id="lf_view_quotation_tree" model="ir.ui.view">
<field name="inherit_id" ref="sale.view_quotation_tree" /> <field name="inherit_id" ref="sale.view_quotation_tree" />
<field name="name">sale.order.tree</field> <field name="name">sale.order.tree (quotes)</field>
<field name="model">sale.order</field> <field name="model">sale.order</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="amount_to_invoice" position="attributes">
<attribute name="column_invisible">1</attribute>
</field>
<field name="amount_untaxed" position="attributes"> <field name="amount_untaxed" position="attributes">
<attribute name="optional">show</attribute> <attribute name="optional">show</attribute>
</field> </field>
...@@ -93,4 +96,19 @@ ...@@ -93,4 +96,19 @@
</field> </field>
</record> </record>
<record id="lf_view_order_form" model="ir.ui.view">
<field name="inherit_id" ref="sale.view_order_form" />
<field name="name">sale.order.form</field>
<field name="model">sale.order</field>
<field name="arch" type="xml">
<group name="sale_total" position="inside">
<field
name="untaxed_amount_to_invoice"
widget="monetary"
invisible="state != 'sale'"
readonly="1"
/>
</group>
</field>
</record>
</odoo> </odoo>
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter