From 78344dcde52d07a824c3a4efbbd72a056e5afe79 Mon Sep 17 00:00:00 2001 From: sergiocorato Date: Tue, 24 Sep 2024 15:52:06 +0200 Subject: [PATCH] [MIG] Backport pos_lot_selection from v. 15.0 --- pos_lot_selection/README.rst | 10 ++++---- pos_lot_selection/__manifest__.py | 10 +++----- .../models/stock_production_lot.py | 2 +- .../static/description/index.html | 7 +++--- .../static/src/xml/LotSelectorPopup.xml | 2 +- pos_lot_selection/templates/assets.xml | 25 +++++++++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 pos_lot_selection/templates/assets.xml diff --git a/pos_lot_selection/README.rst b/pos_lot_selection/README.rst index 1ea0c8c0b8..1841f999b2 100644 --- a/pos_lot_selection/README.rst +++ b/pos_lot_selection/README.rst @@ -17,13 +17,13 @@ POS Lot Selection :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github - :target: https://github.com/OCA/pos/tree/15.0/pos_lot_selection + :target: https://github.com/OCA/pos/tree/14.0/pos_lot_selection :alt: OCA/pos .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/pos-15-0/pos-15-0-pos_lot_selection + :target: https://translation.odoo-community.org/projects/pos-14-0/pos-14-0-pos_lot_selection :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=15.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=14.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -54,7 +54,7 @@ Bug Tracker Bugs are tracked on `GitHub 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -80,6 +80,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/pos `_ project on GitHub. +This module is part of the `OCA/pos `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pos_lot_selection/__manifest__.py b/pos_lot_selection/__manifest__.py index 811b165752..20905c33aa 100644 --- a/pos_lot_selection/__manifest__.py +++ b/pos_lot_selection/__manifest__.py @@ -4,7 +4,7 @@ { "name": "POS Lot Selection", - "version": "15.0.1.0.1", + "version": "14.0.1.0.0", "category": "Point of Sale", "author": "Tecnativa, Camptocamp, Odoo Community Association (OCA)", "website": "https://github.com/OCA/pos", @@ -12,12 +12,8 @@ "depends": [ "point_of_sale", ], - "assets": { - "web.assets_qweb": ["pos_lot_selection/static/src/xml/**/*.xml"], - "point_of_sale.assets": [ - "pos_lot_selection/static/src/js/**/*.js", - ], - }, + "data": ["templates/assets.xml"], + "qweb": ["static/src/xml/LotSelectorPopup.xml"], "application": False, "installable": True, } diff --git a/pos_lot_selection/models/stock_production_lot.py b/pos_lot_selection/models/stock_production_lot.py index 5f00a15e05..e0f5c8fbf0 100644 --- a/pos_lot_selection/models/stock_production_lot.py +++ b/pos_lot_selection/models/stock_production_lot.py @@ -22,7 +22,7 @@ def get_available_lots_for_pos(self, product_id, company_id): lots = lots.filtered( lambda l: float_compare( - l.product_qty, 0, precision_digits=l.product_uom_id.rounding + l.product_qty, 0, precision_rounding=l.product_uom_id.rounding ) > 0 ) diff --git a/pos_lot_selection/static/description/index.html b/pos_lot_selection/static/description/index.html index 977cee698b..aabc1463e8 100644 --- a/pos_lot_selection/static/description/index.html +++ b/pos_lot_selection/static/description/index.html @@ -1,4 +1,3 @@ - @@ -369,7 +368,7 @@

POS Lot Selection

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:bbdabf66a65199b6ec3d6b0b42e4b9754b6d93d0ee411f903c3c7c55db2ce777 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

This module allows to pick between existing lots in POS frontend.

Table of contents

@@ -402,7 +401,7 @@

Bug Tracker

Bugs are tracked on GitHub 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.

+feedback.

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

@@ -421,7 +420,7 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/pos project on GitHub.

+

This module is part of the OCA/pos project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/pos_lot_selection/static/src/xml/LotSelectorPopup.xml b/pos_lot_selection/static/src/xml/LotSelectorPopup.xml index 4636bb5d3a..9e3322fed5 100644 --- a/pos_lot_selection/static/src/xml/LotSelectorPopup.xml +++ b/pos_lot_selection/static/src/xml/LotSelectorPopup.xml @@ -1,6 +1,6 @@ + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> diff --git a/pos_lot_selection/templates/assets.xml b/pos_lot_selection/templates/assets.xml new file mode 100644 index 0000000000..c4a12e7f1b --- /dev/null +++ b/pos_lot_selection/templates/assets.xml @@ -0,0 +1,25 @@ + + + +