Merge commit 'refs/pull/1701/head' of https://github.com/oca/stock-lo…

…gistics-warehouse into 16.0-3455

setup/stock_secondary_unit/odoo/addons/stock_secondary_unit

@@ -0,0 +1 @@
+../../../../stock_secondary_unit

setup/stock_secondary_unit/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

stock_secondary_unit/README.rst

@@ -0,0 +1,93 @@
+====================
+Stock Secondary Unit
+====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Production/Stable
+.. |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--warehouse-lightgray.png?logo=github
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_secondary_unit
+    :alt: OCA/stock-logistics-warehouse
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-15-0/stock-logistics-warehouse-15-0-stock_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/153/15.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module extends the functionality of stock module to allow define
+other units with their conversion factor.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To use this module you need to:
+
+#. Go to a *Product > General Information tab*.
+#. Create any record in "Secondary unit of measure".
+#. Set the conversion factor.
+#. Go to *Inventory tab* and set a second unit of measure.
+#. Push button 'Quantity on hand' and set quantities in stock for this product.
+#. Go to product list and you can see the secondary unit value.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/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 <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_secondary_unit%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Tecnativa
+
+Contributors
+~~~~~~~~~~~~
+
+* `Tecnativa <https://www.tecnativa.com>`_
+
+  * Carlos Dauden
+  * Sergio Teruel
+  * Carlos Roca
+* Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+* Pimolnat Suntian <pimolnats@ecosoft.co.th>
+* Alan Ramos <alan.ramos@jarsa.com.mx>
+
+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-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_secondary_unit>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

stock_secondary_unit/__init__.py

@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import models

stock_secondary_unit/__manifest__.py

@@ -0,0 +1,21 @@
+# Copyright 2018 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+{
+    "name": "Stock Secondary Unit",
+    "summary": "Get product quantities in a secondary unit",
+    "version": "16.0.1.0.0",
+    "development_status": "Production/Stable",
+    "category": "stock",
+    "website": "https://github.com/OCA/stock-logistics-warehouse",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": ["stock", "product_secondary_unit"],
+    "data": [
+        "views/product_views.xml",
+        "views/stock_move_views.xml",
+        "views/stock_picking_views.xml",
+        "report/report_deliveryslip.xml",
+    ],
+}

stock_secondary_unit/i18n/es.po

@@ -0,0 +1,123 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-09-11 06:27+0000\n"
+"PO-Revision-Date: 2018-09-11 08:28+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: es_ES\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.0.6\n"
+
+#. module: stock_secondary_unit
+#: model_terms:ir.ui.view,arch_db:stock_secondary_unit.report_delivery_document
+msgid "<strong>Secondary Qty</strong>"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__product_uom_qty
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_reservation__product_uom_qty
+msgid "Demand"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__qty_done
+msgid "Done"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_move_line
+msgid "Product Moves (Stock Move Line)"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_product__secondary_unit_qty_available
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_template__secondary_unit_qty_available
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_product_secondary_unit__secondary_unit_qty_available
+msgid "Quantity On Hand (2Unit)"
+msgstr "Cantidad a mano (2Ud.)"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__secondary_uom_id
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__secondary_uom_id
+#, fuzzy
+msgid "Second unit"
+msgstr "Unidad Secundaria"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_product__stock_secondary_uom_id
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_template__stock_secondary_uom_id
+msgid "Second unit for inventory"
+msgstr "Segunda unidad de medida para inventario"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__secondary_uom_qty
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__secondary_uom_qty
+#, fuzzy
+msgid "Secondary Qty"
+msgstr "Unidad Secundaria"
+
+#. module: stock_secondary_unit
+#: model_terms:ir.ui.view,arch_db:stock_secondary_unit.view_template_property_form
+msgid "Secondary unit"
+msgstr "Unidad Secundaria"
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_product_secondary_unit
+#, fuzzy
+msgid "Stock Product Secondary Unit"
+msgstr "Unidad Secundaria"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,help:stock_secondary_unit.field_stock_move__product_uom_qty
+#: model:ir.model.fields,help:stock_secondary_unit.field_stock_reservation__product_uom_qty
+msgid ""
+"This is the quantity of products from an inventory point of view. For moves "
+"in the state 'done', this is the quantity of products that were actually "
+"moved. For other moves, this is the quantity of product that is planned to "
+"be moved. Lowering this quantity does not generate a backorder. Changing "
+"this quantity on assigned moves affects the product reservation, and should "
+"be done with care."
+msgstr ""
+
+#~ msgid "Display Name"
+#~ msgstr "Mostrar Nombre"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última modificación en"
+
+#, fuzzy
+#~ msgid "Stock Secondary Unit Mixin"
+#~ msgstr "Unidad Secundaria"
+
+#~ msgid "On Hand (2unit)"
+#~ msgstr "A mano (2Ud.)"
+
+#~ msgid "Second Unit Quantity On Hand"
+#~ msgstr "Segunda unidad de medida por defecto"

stock_secondary_unit/i18n/stock_secondary_unit.pot

@@ -0,0 +1,97 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.0\n"
+"Report-Msgid-Bugs-To: \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_secondary_unit
+#: model_terms:ir.ui.view,arch_db:stock_secondary_unit.report_delivery_document
+msgid "<strong>Secondary Qty</strong>"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__product_uom_qty
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_reservation__product_uom_qty
+msgid "Demand"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__qty_done
+msgid "Done"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_move_line
+msgid "Product Moves (Stock Move Line)"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_product__secondary_unit_qty_available
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_template__secondary_unit_qty_available
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_product_secondary_unit__secondary_unit_qty_available
+msgid "Quantity On Hand (2Unit)"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__secondary_uom_id
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_product__stock_secondary_uom_id
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_template__stock_secondary_uom_id
+msgid "Second unit for inventory"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__secondary_uom_qty
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model_terms:ir.ui.view,arch_db:stock_secondary_unit.view_template_property_form
+msgid "Secondary unit"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_product_secondary_unit
+msgid "Stock Product Secondary Unit"
+msgstr ""
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,help:stock_secondary_unit.field_stock_move__product_uom_qty
+#: model:ir.model.fields,help:stock_secondary_unit.field_stock_reservation__product_uom_qty
+msgid ""
+"This is the quantity of products from an inventory point of view. For moves "
+"in the state 'done', this is the quantity of products that were actually "
+"moved. For other moves, this is the quantity of product that is planned to "
+"be moved. Lowering this quantity does not generate a backorder. Changing "
+"this quantity on assigned moves affects the product reservation, and should "
+"be done with care."
+msgstr ""