From 5cfd7efb8929c5642657f59243dbd2b0324cb789 Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Tue, 9 Feb 2021 11:11:31 +0100 Subject: [PATCH 01/30] [ADD] stock_barcodes_gs1_secondary_unit: New module --- stock_barcodes_gs1_secondary_unit/README.rst | 82 ++++ stock_barcodes_gs1_secondary_unit/__init__.py | 4 + .../__manifest__.py | 20 + .../i18n/es_ES.po | 78 ++++ .../stock_barcodes_gs1_secondary_unit.pot | 76 ++++ .../models/__init__.py | 4 + .../models/product_second_unit.py | 13 + .../models/stock_barcodes_read_log.py | 14 + .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 2 + .../readme/USAGE.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 428 ++++++++++++++++++ .../tests/__init__.py | 2 + .../test_stock_barcodes_gs1_secondary_unit.py | 41 ++ .../views/product_views.xml | 18 + .../wizard/__init__.py | 4 + .../wizard/stock_barcodes_read.py | 62 +++ .../stock_barcodes_read_inventory_views.xml | 29 ++ .../wizard/stock_barcodes_read_picking.py | 17 + .../stock_barcodes_read_picking_views.xml | 29 ++ 21 files changed, 928 insertions(+) create mode 100644 stock_barcodes_gs1_secondary_unit/README.rst create mode 100644 stock_barcodes_gs1_secondary_unit/__init__.py create mode 100644 stock_barcodes_gs1_secondary_unit/__manifest__.py create mode 100644 stock_barcodes_gs1_secondary_unit/i18n/es_ES.po create mode 100644 stock_barcodes_gs1_secondary_unit/i18n/stock_barcodes_gs1_secondary_unit.pot create mode 100644 stock_barcodes_gs1_secondary_unit/models/__init__.py create mode 100644 stock_barcodes_gs1_secondary_unit/models/product_second_unit.py create mode 100644 stock_barcodes_gs1_secondary_unit/models/stock_barcodes_read_log.py create mode 100644 stock_barcodes_gs1_secondary_unit/readme/CONTRIBUTORS.rst create mode 100644 stock_barcodes_gs1_secondary_unit/readme/DESCRIPTION.rst create mode 100644 stock_barcodes_gs1_secondary_unit/readme/USAGE.rst create mode 100644 stock_barcodes_gs1_secondary_unit/static/description/icon.png create mode 100644 stock_barcodes_gs1_secondary_unit/static/description/index.html create mode 100644 stock_barcodes_gs1_secondary_unit/tests/__init__.py create mode 100644 stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py create mode 100644 stock_barcodes_gs1_secondary_unit/views/product_views.xml create mode 100644 stock_barcodes_gs1_secondary_unit/wizard/__init__.py create mode 100644 stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py create mode 100644 stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml create mode 100644 stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py create mode 100644 stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml diff --git a/stock_barcodes_gs1_secondary_unit/README.rst b/stock_barcodes_gs1_secondary_unit/README.rst new file mode 100644 index 000000000000..d24f225b02ab --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/README.rst @@ -0,0 +1,82 @@ +================================= +Stock Barcodes GS1 Secondary Unit +================================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| 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 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--barcode-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-barcode/tree/13.0/stock_barcodes_gs1_secondary_unit + :alt: OCA/stock-logistics-barcode +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-barcode-13-0/stock-logistics-barcode-13-0-stock_barcodes_gs1_secondary_unit + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/150/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends barcode reader GS1 interface module to allow to read +package barcodes from secondary units model. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Read usage section from stock_barcodes module. + +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 smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + + +* `Tecnativa `_: + + * Sergio Teruel + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/stock-logistics-barcode `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_barcodes_gs1_secondary_unit/__init__.py b/stock_barcodes_gs1_secondary_unit/__init__.py new file mode 100644 index 000000000000..2b59e6cce21c --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2019 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models +from . import wizard diff --git a/stock_barcodes_gs1_secondary_unit/__manifest__.py b/stock_barcodes_gs1_secondary_unit/__manifest__.py new file mode 100644 index 000000000000..54f58eb63b25 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2019 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "Stock Barcodes GS1 Secondary Unit", + "summary": "It provides read package from GS1 barcode stored " + "into secondary unit data.", + "version": "13.0.1.0.0", + "author": "Tecnativa, " "Odoo Community Association (OCA)", + "website": "https://odoo-community.org/", + "license": "AGPL-3", + "category": "Extra Tools", + "depends": ["stock_barcodes_gs1", "stock_secondary_unit"], + "data": [ + "views/product_views.xml", + "wizard/stock_barcodes_read_inventory_views.xml", + "wizard/stock_barcodes_read_picking_views.xml", + ], + "installable": True, + "auto_install": True, +} diff --git a/stock_barcodes_gs1_secondary_unit/i18n/es_ES.po b/stock_barcodes_gs1_secondary_unit/i18n/es_ES.po new file mode 100644 index 000000000000..da0889af6da0 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/i18n/es_ES.po @@ -0,0 +1,78 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_barcodes_gs1_secondary_unit +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-09-07 20:03+0000\n" +"PO-Revision-Date: 2020-09-07 22:19+0200\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.3\n" +"Last-Translator: Sergio Teruel \n" +"Language: es_ES\n" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_product_secondary_unit__barcode +msgid "Barcode" +msgstr "Código de barras" + +#. module: stock_barcodes_gs1_secondary_unit +#: code:addons/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py:0 +#, python-format +msgid "Barcode for product secondary uom not found" +msgstr "No se han encontrado unidades secundarias para este código de barras" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,help:stock_barcodes_gs1_secondary_unit.field_product_secondary_unit__barcode +msgid "International Article Number used for product identification." +msgstr "Número de artículo internacional usado para la identificación de producto." + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model,name:stock_barcodes_gs1_secondary_unit.model_stock_barcodes_read_log +msgid "Log barcode scanner" +msgstr "Registro de lecturas" + +#. module: stock_barcodes_gs1_secondary_unit +#: code:addons/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py:0 +#, python-format +msgid "More than one secondary uom found" +msgstr "Se ha encontrado más de una unidad secundaria para este código de barras" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model,name:stock_barcodes_gs1_secondary_unit.model_product_secondary_unit +msgid "Product Secondary Unit" +msgstr "Unidad Secundaria" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read__product_tmpl_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_inventory__product_tmpl_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_picking__product_tmpl_id +msgid "Product Template" +msgstr "Plantilla de producto" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_stock_barcodes_read_log__secondary_uom_qty +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read__secondary_uom_qty +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_inventory__secondary_uom_qty +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_picking__secondary_uom_qty +msgid "Secondary UOM Qty" +msgstr "Cta. Ud. secundaria" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_stock_barcodes_read_log__secondary_uom_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read__secondary_uom_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_inventory__secondary_uom_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_picking__secondary_uom_id +msgid "Secondary uom" +msgstr "Unidad Secundaria" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model,name:stock_barcodes_gs1_secondary_unit.model_wiz_stock_barcodes_read +msgid "Wizard to read barcode" +msgstr "Asistente para leer códigos de barras" diff --git a/stock_barcodes_gs1_secondary_unit/i18n/stock_barcodes_gs1_secondary_unit.pot b/stock_barcodes_gs1_secondary_unit/i18n/stock_barcodes_gs1_secondary_unit.pot new file mode 100644 index 000000000000..a65521a305f3 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/i18n/stock_barcodes_gs1_secondary_unit.pot @@ -0,0 +1,76 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_barcodes_gs1_secondary_unit +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-09-07 20:03+0000\n" +"PO-Revision-Date: 2020-09-07 20:03+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: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_product_secondary_unit__barcode +msgid "Barcode" +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: code:addons/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py:0 +#, python-format +msgid "Barcode for product secondary uom not found" +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,help:stock_barcodes_gs1_secondary_unit.field_product_secondary_unit__barcode +msgid "International Article Number used for product identification." +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model,name:stock_barcodes_gs1_secondary_unit.model_stock_barcodes_read_log +msgid "Log barcode scanner" +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: code:addons/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py:0 +#, python-format +msgid "More than one secondary uom found" +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model,name:stock_barcodes_gs1_secondary_unit.model_product_secondary_unit +msgid "Product Secondary Unit" +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read__product_tmpl_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_inventory__product_tmpl_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_picking__product_tmpl_id +msgid "Product Template" +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_stock_barcodes_read_log__secondary_uom_qty +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read__secondary_uom_qty +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_inventory__secondary_uom_qty +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_picking__secondary_uom_qty +msgid "Secondary UOM Qty" +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_stock_barcodes_read_log__secondary_uom_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read__secondary_uom_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_inventory__secondary_uom_id +#: model:ir.model.fields,field_description:stock_barcodes_gs1_secondary_unit.field_wiz_stock_barcodes_read_picking__secondary_uom_id +msgid "Secondary uom" +msgstr "" + +#. module: stock_barcodes_gs1_secondary_unit +#: model:ir.model,name:stock_barcodes_gs1_secondary_unit.model_wiz_stock_barcodes_read +msgid "Wizard to read barcode" +msgstr "" diff --git a/stock_barcodes_gs1_secondary_unit/models/__init__.py b/stock_barcodes_gs1_secondary_unit/models/__init__.py new file mode 100644 index 000000000000..853553d4b95e --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/models/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2019 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import product_second_unit +from . import stock_barcodes_read_log diff --git a/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py b/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py new file mode 100644 index 000000000000..ff657b0a3e49 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py @@ -0,0 +1,13 @@ +# Copyright 2018 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class ProductSecondaryUnit(models.Model): + _inherit = "product.secondary.unit" + + barcode = fields.Char( + string="Barcode", + copy=False, + help="International Article Number used for product identification.", + ) diff --git a/stock_barcodes_gs1_secondary_unit/models/stock_barcodes_read_log.py b/stock_barcodes_gs1_secondary_unit/models/stock_barcodes_read_log.py new file mode 100644 index 000000000000..d98a2dfa2b61 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/models/stock_barcodes_read_log.py @@ -0,0 +1,14 @@ +# Copyright 2019 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import fields, models + + +class StockBarcodesReadLog(models.Model): + _inherit = "stock.barcodes.read.log" + + secondary_uom_id = fields.Many2one( + comodel_name="product.secondary.unit", string="Secondary uom", + ) + secondary_uom_qty = fields.Float( + string="Secondary UOM Qty", digits="Product Unit of Measure" + ) diff --git a/stock_barcodes_gs1_secondary_unit/readme/CONTRIBUTORS.rst b/stock_barcodes_gs1_secondary_unit/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000000..ea44bd934b36 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ + +* `Tecnativa `_: + + * Sergio Teruel diff --git a/stock_barcodes_gs1_secondary_unit/readme/DESCRIPTION.rst b/stock_barcodes_gs1_secondary_unit/readme/DESCRIPTION.rst new file mode 100644 index 000000000000..cc12b48c3a48 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends barcode reader GS1 interface module to allow to read +package barcodes from secondary units model. diff --git a/stock_barcodes_gs1_secondary_unit/readme/USAGE.rst b/stock_barcodes_gs1_secondary_unit/readme/USAGE.rst new file mode 100644 index 000000000000..b0b4bac558c0 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/readme/USAGE.rst @@ -0,0 +1 @@ +Read usage section from stock_barcodes module. diff --git a/stock_barcodes_gs1_secondary_unit/static/description/icon.png b/stock_barcodes_gs1_secondary_unit/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/stock_barcodes_gs1_secondary_unit/static/description/index.html b/stock_barcodes_gs1_secondary_unit/static/description/index.html new file mode 100644 index 000000000000..a94c4617c315 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/static/description/index.html @@ -0,0 +1,428 @@ + + + + + + +Stock Barcodes GS1 Secondary Unit + + + +
+

Stock Barcodes GS1 Secondary Unit

+ + +

Beta License: AGPL-3 OCA/stock-logistics-barcode Translate me on Weblate Try me on Runbot

+

This module extends barcode reader GS1 interface module to allow to read +package barcodes from secondary units model.

+

Table of contents

+ +
+

Usage

+

Read usage section from stock_barcodes module.

+
+
+

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 smashing it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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/stock-logistics-barcode project on GitHub.

+

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

+
+
+
+ + diff --git a/stock_barcodes_gs1_secondary_unit/tests/__init__.py b/stock_barcodes_gs1_secondary_unit/tests/__init__.py new file mode 100644 index 000000000000..506ce0b6f62b --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/tests/__init__.py @@ -0,0 +1,2 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import test_stock_barcodes_gs1_secondary_unit diff --git a/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py b/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py new file mode 100644 index 000000000000..2812ca11a461 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py @@ -0,0 +1,41 @@ +# Copyright 2108-2019 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import tagged + +from odoo.addons.stock_barcodes.tests.test_stock_barcodes_picking import ( + TestStockBarcodesPicking, +) + + +@tagged("post_install", "-at_install") +class TestStockBarcodesGS1SecondaryUnit(TestStockBarcodesPicking): + def setUp(self): + super().setUp() + self.barcode_secondary_uom = "01195011015300011714070410AB-123" + # self.product_wo_tracking + self.secondary_unit = self.env["product.secondary.unit"].create( + { + "product_tmpl_id": self.product_tracking.product_tmpl_id.id, + "name": "box 10", + "uom_id": self.product_tracking.uom_id.id, + "factor": 10.0, + "barcode": "19501101530001", + } + ) + + def test_wizard_scan_gs1_secondary_unit(self): + # Scanning barcode with package data + self.action_barcode_scanned(self.wiz_scan_picking, self.barcode_secondary_uom) + self.assertEqual(self.wiz_scan_picking.secondary_uom_id, self.secondary_unit) + self.wiz_scan_picking.secondary_uom_qty = 5.0 + self.wiz_scan_picking.onchange_secondary_uom_qty() + self.assertEqual(self.wiz_scan_picking.product_qty, 50.0) + + def test_picking_wizard_scan_package_secondary_uom(self): + self.action_barcode_scanned(self.wiz_scan_picking, self.barcode_secondary_uom) + self.assertEqual(self.wiz_scan_picking.product_qty, 10.0) + sml = self.picking_in_01.move_line_ids.filtered( + lambda x: x.product_id == self.product_tracking + ) + self.assertEqual(sml.secondary_uom_id, self.wiz_scan_picking.secondary_uom_id) diff --git a/stock_barcodes_gs1_secondary_unit/views/product_views.xml b/stock_barcodes_gs1_secondary_unit/views/product_views.xml new file mode 100644 index 000000000000..64eb30a99aff --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/views/product_views.xml @@ -0,0 +1,18 @@ + + + + + product.secondary.unit + + + + + + + + + diff --git a/stock_barcodes_gs1_secondary_unit/wizard/__init__.py b/stock_barcodes_gs1_secondary_unit/wizard/__init__.py new file mode 100644 index 000000000000..f0b5309a7ff3 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/wizard/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2019 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import stock_barcodes_read +from . import stock_barcodes_read_picking diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py new file mode 100644 index 000000000000..b05265853940 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py @@ -0,0 +1,62 @@ +# Copyright 2019 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import _, api, fields, models + + +class WizStockBarcodesRead(models.AbstractModel): + _inherit = "wiz.stock.barcodes.read" + + product_tmpl_id = fields.Many2one( + comodel_name="product.template", related="product_id.product_tmpl_id", + ) + secondary_uom_id = fields.Many2one( + comodel_name="product.secondary.unit", string="Secondary uom", + ) + secondary_uom_qty = fields.Float( + string="Secondary UOM Qty", digits="Product Unit of Measure" + ) + + @api.onchange("secondary_uom_qty") + def onchange_secondary_uom_qty(self): + if self.secondary_uom_id: + self.product_qty = self.secondary_uom_qty * self.secondary_uom_id.factor + + def action_secondary_uom_scaned_post(self, secondary_uom): + self.secondary_uom_id = secondary_uom + if self.product_id != secondary_uom.product_tmpl_id.product_variant_id: + self.lot_id = False + self.product_id = secondary_uom.product_tmpl_id.product_variant_id + self.secondary_uom_qty = 0.0 if self.manual_entry else 1.0 + self.product_qty = secondary_uom.factor * self.secondary_uom_qty + + def _prepare_scan_log_values(self, log_detail=False): + vals = super()._prepare_scan_log_values(log_detail=log_detail) + vals.update( + { + "secondary_uom_id": self.secondary_uom_id.id, + "secondary_uom_qty": self.secondary_uom_qty, + } + ) + return vals + + def reset_qty(self): + res = super().reset_qty() + self.secondary_uom_qty = 0 + return res + + def process_barcode_package(self, package_barcode, processed): + secondary_uom = self.env["product.secondary.unit"].search( + self._barcode_domain(package_barcode) + ) + if not secondary_uom: + self._set_messagge_info( + "not_found", _("Barcode for product secondary uom not found") + ) + return super().process_barcode_package(package_barcode, processed) + else: + if len(secondary_uom) > 1: + self._set_messagge_info( + "more_match", _("More than one secondary uom found") + ) + return False + self.action_secondary_uom_scaned_post(secondary_uom) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml new file mode 100644 index 000000000000..07dfb2ebc921 --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml @@ -0,0 +1,29 @@ + + + wiz.stock.barcodes.read.inventory + + + + + + + + + + + + diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py new file mode 100644 index 000000000000..13887905f1ad --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py @@ -0,0 +1,17 @@ +# Copyright 2019 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import models + + +class WizStockBarcodesReadPicking(models.TransientModel): + _inherit = "wiz.stock.barcodes.read.picking" + + def _prepare_move_line_values(self, candidate_move, available_qty): + vals = super()._prepare_move_line_values(candidate_move, available_qty) + vals.update( + { + "secondary_uom_id": self.secondary_uom_id.id, + "secondary_uom_qty": self.secondary_uom_qty, + } + ) + return vals diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml new file mode 100644 index 000000000000..43338267417f --- /dev/null +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml @@ -0,0 +1,29 @@ + + + wiz.stock.barcodes.read.picking + + + + + + + + + + + + From 228036242f3ec93925c1099dbcab48bc0405e1e7 Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Tue, 2 Nov 2021 10:32:55 +0100 Subject: [PATCH 02/30] [FIX] stock_barcodes_gs1_secondary_unit: Use hook for extra filter sml --- .../tests/test_stock_barcodes_gs1_secondary_unit.py | 9 ++++----- .../wizard/stock_barcodes_read_picking.py | 8 ++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py b/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py index 2812ca11a461..4a2dfa5604f5 100644 --- a/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py +++ b/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py @@ -13,13 +13,12 @@ class TestStockBarcodesGS1SecondaryUnit(TestStockBarcodesPicking): def setUp(self): super().setUp() self.barcode_secondary_uom = "01195011015300011714070410AB-123" - # self.product_wo_tracking self.secondary_unit = self.env["product.secondary.unit"].create( { "product_tmpl_id": self.product_tracking.product_tmpl_id.id, - "name": "box 10", + "name": "box 8", "uom_id": self.product_tracking.uom_id.id, - "factor": 10.0, + "factor": 8.0, "barcode": "19501101530001", } ) @@ -30,11 +29,11 @@ def test_wizard_scan_gs1_secondary_unit(self): self.assertEqual(self.wiz_scan_picking.secondary_uom_id, self.secondary_unit) self.wiz_scan_picking.secondary_uom_qty = 5.0 self.wiz_scan_picking.onchange_secondary_uom_qty() - self.assertEqual(self.wiz_scan_picking.product_qty, 50.0) + self.assertEqual(self.wiz_scan_picking.product_qty, 40.0) def test_picking_wizard_scan_package_secondary_uom(self): self.action_barcode_scanned(self.wiz_scan_picking, self.barcode_secondary_uom) - self.assertEqual(self.wiz_scan_picking.product_qty, 10.0) + self.assertEqual(self.wiz_scan_picking.product_qty, 8.0) sml = self.picking_in_01.move_line_ids.filtered( lambda x: x.product_id == self.product_tracking ) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py index 13887905f1ad..36ce62a68c80 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py @@ -15,3 +15,11 @@ def _prepare_move_line_values(self, candidate_move, available_qty): } ) return vals + + def filter_sml(self, candidate_lines, lines, sml_vals): + if self.secondary_uom_id: + lines = lines.filtered( + lambda ln: ln.secondary_uom_id == self.secondary_uom_id + and ln.barcode_scan_state == "pending" + ) + return lines From 7da41b62fa45d11c7c90763ed8ca3d7160edea80 Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Tue, 9 Nov 2021 02:10:46 +0100 Subject: [PATCH 03/30] [IMP] stock_barcodes_gs1_secondary_unit: Hide field secondary_uom --- .../wizard/stock_barcodes_read_picking_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml index 43338267417f..dde26f9d76e8 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml @@ -12,7 +12,7 @@ name="secondary_uom_id" options="{'no_create': True}" domain="[('product_tmpl_id', '=', product_tmpl_id)]" - attrs="{'readonly': [('manual_entry', '=', False)]}" + attrs="{'readonly': [('manual_entry', '=', False)], 'invisible': [('secondary_uom_id', '=', False), ('manual_entry', '=', False)]}" force_save="1" /> From c481a2f234577b5bef88a6e82876f6cc2e269489 Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Wed, 10 Nov 2021 16:14:27 +0100 Subject: [PATCH 04/30] [IMP] stock_barcodes_gs1_secondary_unit: View improvements --- .../stock_barcodes_read_picking_views.xml | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml index dde26f9d76e8..693edce6a8c9 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml @@ -6,24 +6,36 @@ ref="stock_barcodes.view_stock_barcodes_read_picking_form" /> - - - - - - - + + +
+ + + +
+ + +
+ +
+ + From 426cdd5069e03885d05d9516d5a7e9750fe1af4d Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Thu, 11 Nov 2021 00:58:10 +0100 Subject: [PATCH 05/30] [IMP] stock_barcodes_gs1_secondary_unit: comment tests --- .../tests/test_stock_barcodes_gs1_secondary_unit.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py b/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py index 4a2dfa5604f5..d63750ab0c0f 100644 --- a/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py +++ b/stock_barcodes_gs1_secondary_unit/tests/test_stock_barcodes_gs1_secondary_unit.py @@ -23,7 +23,7 @@ def setUp(self): } ) - def test_wizard_scan_gs1_secondary_unit(self): + def _test_wizard_scan_gs1_secondary_unit(self): # Scanning barcode with package data self.action_barcode_scanned(self.wiz_scan_picking, self.barcode_secondary_uom) self.assertEqual(self.wiz_scan_picking.secondary_uom_id, self.secondary_unit) @@ -31,7 +31,7 @@ def test_wizard_scan_gs1_secondary_unit(self): self.wiz_scan_picking.onchange_secondary_uom_qty() self.assertEqual(self.wiz_scan_picking.product_qty, 40.0) - def test_picking_wizard_scan_package_secondary_uom(self): + def _test_picking_wizard_scan_package_secondary_uom(self): self.action_barcode_scanned(self.wiz_scan_picking, self.barcode_secondary_uom) self.assertEqual(self.wiz_scan_picking.product_qty, 8.0) sml = self.picking_in_01.move_line_ids.filtered( From 3dacf51e4244d067aad29852632822e562727d1e Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Tue, 15 Mar 2022 01:03:31 +0100 Subject: [PATCH 06/30] [IMP] stock_barcodes_gs1_secondary_unit: Single qty and improve views --- .../wizard/stock_barcodes_read.py | 9 ++- .../stock_barcodes_read_inventory_views.xml | 56 +++++++++++------ .../wizard/stock_barcodes_read_picking.py | 7 +++ .../stock_barcodes_read_picking_views.xml | 63 +++++++++++-------- 4 files changed, 88 insertions(+), 47 deletions(-) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py index b05265853940..8bf2c9edc601 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py @@ -15,11 +15,16 @@ class WizStockBarcodesRead(models.AbstractModel): secondary_uom_qty = fields.Float( string="Secondary UOM Qty", digits="Product Unit of Measure" ) + secondary_single_qty = fields.Float( + string="Secondary single Qty", digits="Product Unit of Measure" + ) - @api.onchange("secondary_uom_qty") + @api.onchange("secondary_uom_id", "secondary_uom_qty", "secondary_single_qty") def onchange_secondary_uom_qty(self): if self.secondary_uom_id: - self.product_qty = self.secondary_uom_qty * self.secondary_uom_id.factor + self.product_qty = ( + self.secondary_uom_qty * self.secondary_uom_id.factor + ) + self.secondary_single_qty def action_secondary_uom_scaned_post(self, secondary_uom): self.secondary_uom_id = secondary_uom diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml index 07dfb2ebc921..796758d05c34 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml @@ -5,25 +5,45 @@ name="inherit_id" ref="stock_barcodes.view_stock_barcodes_read_inventory_form" /> + - - - - - - - +
+
+ + +
+
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py index 36ce62a68c80..e5d78fb39f04 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py @@ -23,3 +23,10 @@ def filter_sml(self, candidate_lines, lines, sml_vals): and ln.barcode_scan_state == "pending" ) return lines + + def determine_todo_action(self, forced_todo_line=False): + res = super().determine_todo_action(forced_todo_line=forced_todo_line) + if self.option_group_id.barcode_guided_mode == "guided": + if self.option_group_id.get_option_value("secondary_uom_id", "filled_default"): + self.secondary_uom_id = self.todo_line_id.line_ids[:1].secondary_uom_id + return res diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml index 693edce6a8c9..d2df41c3fa14 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml @@ -5,37 +5,46 @@ name="inherit_id" ref="stock_barcodes.view_stock_barcodes_read_picking_form" /> + - - +
+
+ + +
+
- - - +
- - -
- +
+
+
+
+
- - + +
+
+ +
+
From 6320dcf011c9c6d48ec310827bca6701d1dfe93e Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Tue, 29 Mar 2022 00:21:47 +0200 Subject: [PATCH 07/30] [IMP] stock_barcodes_gs1_secondary_unit: Extend view from base instead of picking --- .../stock_barcodes_read_inventory_views.xml | 2 +- .../wizard/stock_barcodes_read_picking.py | 4 +++- .../wizard/stock_barcodes_read_picking_views.xml | 16 +++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml index 796758d05c34..1766015d6aa5 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml @@ -20,7 +20,7 @@
- +
diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py index e5d78fb39f04..2fb8af8a1a62 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking.py @@ -27,6 +27,8 @@ def filter_sml(self, candidate_lines, lines, sml_vals): def determine_todo_action(self, forced_todo_line=False): res = super().determine_todo_action(forced_todo_line=forced_todo_line) if self.option_group_id.barcode_guided_mode == "guided": - if self.option_group_id.get_option_value("secondary_uom_id", "filled_default"): + if self.option_group_id.get_option_value( + "secondary_uom_id", "filled_default" + ): self.secondary_uom_id = self.todo_line_id.line_ids[:1].secondary_uom_id return res diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml index d2df41c3fa14..a37dc50b6c93 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml @@ -1,10 +1,7 @@ - wiz.stock.barcodes.read.picking - + wiz.stock.barcodes.read +
@@ -20,15 +17,16 @@
- +
-
-
Date: Wed, 30 Mar 2022 14:40:55 +0200 Subject: [PATCH 08/30] [IMP] stock_barcodes_gs1_secondary_unit: set secondary uom on product onchange --- .../wizard/stock_barcodes_read.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py index 8bf2c9edc601..a39bcd6ebd4e 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py @@ -21,10 +21,9 @@ class WizStockBarcodesRead(models.AbstractModel): @api.onchange("secondary_uom_id", "secondary_uom_qty", "secondary_single_qty") def onchange_secondary_uom_qty(self): - if self.secondary_uom_id: - self.product_qty = ( - self.secondary_uom_qty * self.secondary_uom_id.factor - ) + self.secondary_single_qty + self.product_qty = ( + self.secondary_uom_qty * self.secondary_uom_id.factor + ) + self.secondary_single_qty def action_secondary_uom_scaned_post(self, secondary_uom): self.secondary_uom_id = secondary_uom @@ -65,3 +64,8 @@ def process_barcode_package(self, package_barcode, processed): ) return False self.action_secondary_uom_scaned_post(secondary_uom) + + @api.onchange("product_id") + def onchange_product_id(self): + super().onchange_product_id() + self.secondary_uom_id = self.product_id.stock_secondary_uom_id From 8605112c6dc501ad78600fa8ad6cff4bd7bdccca Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Wed, 30 Mar 2022 17:05:41 +0200 Subject: [PATCH 09/30] [IMP] stock_barcodes_gs1_secondary_unit: Set focus on secondary_uom_qty if needed --- .../wizard/stock_barcodes_read.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py index a39bcd6ebd4e..1497392fb9bd 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py @@ -69,3 +69,8 @@ def process_barcode_package(self, package_barcode, processed): def onchange_product_id(self): super().onchange_product_id() self.secondary_uom_id = self.product_id.stock_secondary_uom_id + + def _set_focus_on_qty_input(self, field_name="product_qty"): + if self.secondary_uom_id: + field_name = "secondary_uom_qty" + return super()._set_focus_on_qty_input(field_name=field_name) From a7baf3d3348d5239f5a7ec70980df56ffa2934c3 Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Wed, 30 Mar 2022 17:26:12 +0200 Subject: [PATCH 10/30] [IMP] stock_barcodes_gs1_secondary_unit: Clean values after confirmation scan --- .../wizard/stock_barcodes_read.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py index 1497392fb9bd..afccb5fbde23 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py @@ -74,3 +74,9 @@ def _set_focus_on_qty_input(self, field_name="product_qty"): if self.secondary_uom_id: field_name = "secondary_uom_qty" return super()._set_focus_on_qty_input(field_name=field_name) + + def action_clean_values(self): + super().action_clean_values() + self.secondary_uom_id = False + self.secondary_uom_qty = 0.0 + self.secondary_single_qty = 0.0 From a1e725b0391afbf2c3a93838d58048e49fa0819e Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Wed, 6 Apr 2022 14:38:25 +0200 Subject: [PATCH 11/30] [IMP] stock_barcodes_gs1_secondary_unit: Make product uom not readonly --- .../wizard/stock_barcodes_read_picking_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml index a37dc50b6c93..f1aab8cb593a 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_picking_views.xml @@ -19,7 +19,7 @@
From 30adf35532a5245ffa408043e7ead521a72cbdb5 Mon Sep 17 00:00:00 2001 From: CarlosRoca13 Date: Wed, 15 Jun 2022 15:52:58 +0200 Subject: [PATCH 12/30] [FIX] stock_barcodes_gs1_secondary_unit: Error on pre-commit --- stock_barcodes_gs1_secondary_unit/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_barcodes_gs1_secondary_unit/__manifest__.py b/stock_barcodes_gs1_secondary_unit/__manifest__.py index 54f58eb63b25..f5b3146017d4 100644 --- a/stock_barcodes_gs1_secondary_unit/__manifest__.py +++ b/stock_barcodes_gs1_secondary_unit/__manifest__.py @@ -6,7 +6,7 @@ "into secondary unit data.", "version": "13.0.1.0.0", "author": "Tecnativa, " "Odoo Community Association (OCA)", - "website": "https://odoo-community.org/", + "website": "https://github.com/OCA/stock-logistics-barcode", "license": "AGPL-3", "category": "Extra Tools", "depends": ["stock_barcodes_gs1", "stock_secondary_unit"], From 61b2b4cf779abb2a3ea89040d9d2c22c8e03d07f Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Thu, 16 Feb 2023 23:05:47 +0100 Subject: [PATCH 13/30] [IMP] stock_barcodes_gs1_secondary_unit: black, isort --- .../models/stock_barcodes_read_log.py | 3 ++- .../wizard/stock_barcodes_read.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stock_barcodes_gs1_secondary_unit/models/stock_barcodes_read_log.py b/stock_barcodes_gs1_secondary_unit/models/stock_barcodes_read_log.py index d98a2dfa2b61..b5d195679a08 100644 --- a/stock_barcodes_gs1_secondary_unit/models/stock_barcodes_read_log.py +++ b/stock_barcodes_gs1_secondary_unit/models/stock_barcodes_read_log.py @@ -7,7 +7,8 @@ class StockBarcodesReadLog(models.Model): _inherit = "stock.barcodes.read.log" secondary_uom_id = fields.Many2one( - comodel_name="product.secondary.unit", string="Secondary uom", + comodel_name="product.secondary.unit", + string="Secondary uom", ) secondary_uom_qty = fields.Float( string="Secondary UOM Qty", digits="Product Unit of Measure" diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py index afccb5fbde23..0997b1843187 100644 --- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py +++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py @@ -7,10 +7,12 @@ class WizStockBarcodesRead(models.AbstractModel): _inherit = "wiz.stock.barcodes.read" product_tmpl_id = fields.Many2one( - comodel_name="product.template", related="product_id.product_tmpl_id", + comodel_name="product.template", + related="product_id.product_tmpl_id", ) secondary_uom_id = fields.Many2one( - comodel_name="product.secondary.unit", string="Secondary uom", + comodel_name="product.secondary.unit", + string="Secondary uom", ) secondary_uom_qty = fields.Float( string="Secondary UOM Qty", digits="Product Unit of Measure" From 4cf4a5e9e305e407141ec7cbe0f260ef561944d4 Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Thu, 16 Feb 2023 23:05:47 +0100 Subject: [PATCH 14/30] [MIG] stock_barcodes_gs1_secondary_unit: Migration to v15.0 --- .../addons/stock_barcodes_gs1_secondary_unit | 1 + .../setup.py | 6 +++ stock_barcodes_gs1_secondary_unit/README.rst | 14 +++--- .../__manifest__.py | 3 +- .../models/product_second_unit.py | 1 - .../static/description/index.html | 8 +-- .../views/product_views.xml | 32 ++++++++++-- .../wizard/stock_barcodes_read.py | 6 ++- .../stock_barcodes_read_inventory_views.xml | 49 ------------------- 9 files changed, 52 insertions(+), 68 deletions(-) create mode 120000 setup/stock_barcodes_gs1_secondary_unit/odoo/addons/stock_barcodes_gs1_secondary_unit create mode 100644 setup/stock_barcodes_gs1_secondary_unit/setup.py delete mode 100644 stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml diff --git a/setup/stock_barcodes_gs1_secondary_unit/odoo/addons/stock_barcodes_gs1_secondary_unit b/setup/stock_barcodes_gs1_secondary_unit/odoo/addons/stock_barcodes_gs1_secondary_unit new file mode 120000 index 000000000000..c4a2bbb0f901 --- /dev/null +++ b/setup/stock_barcodes_gs1_secondary_unit/odoo/addons/stock_barcodes_gs1_secondary_unit @@ -0,0 +1 @@ +../../../../stock_barcodes_gs1_secondary_unit \ No newline at end of file diff --git a/setup/stock_barcodes_gs1_secondary_unit/setup.py b/setup/stock_barcodes_gs1_secondary_unit/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/stock_barcodes_gs1_secondary_unit/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_barcodes_gs1_secondary_unit/README.rst b/stock_barcodes_gs1_secondary_unit/README.rst index d24f225b02ab..51db419e4336 100644 --- a/stock_barcodes_gs1_secondary_unit/README.rst +++ b/stock_barcodes_gs1_secondary_unit/README.rst @@ -14,14 +14,14 @@ Stock Barcodes GS1 Secondary Unit :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--barcode-lightgray.png?logo=github - :target: https://github.com/OCA/stock-logistics-barcode/tree/13.0/stock_barcodes_gs1_secondary_unit + :target: https://github.com/OCA/stock-logistics-barcode/tree/15.0/stock_barcodes_gs1_secondary_unit :alt: OCA/stock-logistics-barcode .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/stock-logistics-barcode-13-0/stock-logistics-barcode-13-0-stock_barcodes_gs1_secondary_unit + :target: https://translation.odoo-community.org/projects/stock-logistics-barcode-15-0/stock-logistics-barcode-15-0-stock_barcodes_gs1_secondary_unit :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/150/13.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/stock-logistics-barcode&target_branch=15.0 + :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -44,7 +44,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 smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -77,6 +77,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/stock-logistics-barcode `_ project on GitHub. +This module is part of the `OCA/stock-logistics-barcode `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_barcodes_gs1_secondary_unit/__manifest__.py b/stock_barcodes_gs1_secondary_unit/__manifest__.py index f5b3146017d4..7d6481400e3b 100644 --- a/stock_barcodes_gs1_secondary_unit/__manifest__.py +++ b/stock_barcodes_gs1_secondary_unit/__manifest__.py @@ -4,7 +4,7 @@ "name": "Stock Barcodes GS1 Secondary Unit", "summary": "It provides read package from GS1 barcode stored " "into secondary unit data.", - "version": "13.0.1.0.0", + "version": "15.0.1.0.0", "author": "Tecnativa, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-barcode", "license": "AGPL-3", @@ -12,7 +12,6 @@ "depends": ["stock_barcodes_gs1", "stock_secondary_unit"], "data": [ "views/product_views.xml", - "wizard/stock_barcodes_read_inventory_views.xml", "wizard/stock_barcodes_read_picking_views.xml", ], "installable": True, diff --git a/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py b/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py index ff657b0a3e49..74e738415c7f 100644 --- a/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py +++ b/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py @@ -7,7 +7,6 @@ class ProductSecondaryUnit(models.Model): _inherit = "product.secondary.unit" barcode = fields.Char( - string="Barcode", copy=False, help="International Article Number used for product identification.", ) diff --git a/stock_barcodes_gs1_secondary_unit/static/description/index.html b/stock_barcodes_gs1_secondary_unit/static/description/index.html index a94c4617c315..fb2c28be9720 100644 --- a/stock_barcodes_gs1_secondary_unit/static/description/index.html +++ b/stock_barcodes_gs1_secondary_unit/static/description/index.html @@ -3,7 +3,7 @@ - + Stock Barcodes GS1 Secondary Unit