Skip to content

Commit

Permalink
Merge pull request #1210 from OCA/18.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/product-attribute (18.0)
  • Loading branch information
bt-admin authored Dec 28, 2024
2 parents 01acc03 + ae31ff4 commit bdff68a
Show file tree
Hide file tree
Showing 31 changed files with 1,165 additions and 20 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ addon | version | maintainers | summary
[product_main_supplierinfo](product_main_supplierinfo/) | 18.0.1.0.0 | [![sebalix](https://github.com/sebalix.png?size=30px)](https://github.com/sebalix) | Display the main vendor of a product.
[product_manufacturer](product_manufacturer/) | 18.0.1.0.0 | | Adds manufacturers and attributes on the product view.
[product_medical](product_medical/) | 18.0.1.0.0 | | Base structure to handle medical products
[product_net_weight](product_net_weight/) | 18.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Add 'Net Weight' on product models
[product_pricelist_fixed_currency_rate](product_pricelist_fixed_currency_rate/) | 18.0.1.0.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) [![kobros-tech](https://github.com/kobros-tech.png?size=30px)](https://github.com/kobros-tech) | Set a fixed currency rate between pricelists
[product_print_category](product_print_category/) | 18.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Define print categories for products and automate products print, when data has changed
[product_set](product_set/) | 18.0.1.0.0 | | Product set
Expand Down
14 changes: 12 additions & 2 deletions product_logistics_uom/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ msgstr "Dies ist die Standard-Mengeneinheit für Produktgewichte."
msgid "Define your length unit of measure"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
msgid "Gross Weight"
msgstr ""

#. module: product_logistics_uom
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.res_config_settings_view_form
msgid "Length"
Expand Down Expand Up @@ -175,8 +181,6 @@ msgid "Volume unit of measure label"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.product_template_form_view
msgid "Weight"
msgstr ""
Expand All @@ -193,6 +197,12 @@ msgstr "Gewicht-ME"
msgid "Weight in product UOM"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,help:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,help:product_logistics_uom.field_product_template__weight
msgid "Weight of the product with its container and packaging."
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight_uom_name
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight_uom_name
Expand Down
17 changes: 12 additions & 5 deletions product_logistics_uom/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ msgstr "Unidad de medida del peso del producto predeterminada"
msgid "Define your length unit of measure"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
msgid "Gross Weight"
msgstr "Peso bruto"

#. module: product_logistics_uom
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.res_config_settings_view_form
msgid "Length"
Expand Down Expand Up @@ -179,8 +185,6 @@ msgid "Volume unit of measure label"
msgstr "Etiqueta de unidad de medida de volumen"

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.product_template_form_view
msgid "Weight"
msgstr "Peso"
Expand All @@ -197,15 +201,18 @@ msgstr "Unidad de medida del peso"
msgid "Weight in product UOM"
msgstr "Peso en la UM del producto"

#. module: product_logistics_uom
#: model:ir.model.fields,help:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,help:product_logistics_uom.field_product_template__weight
msgid "Weight of the product with its container and packaging."
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight_uom_name
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight_uom_name
msgid "Weight unit of measure label"
msgstr "Etiqueta de unidad de medida del peso"

#~ msgid "Gross Weight"
#~ msgstr "Peso bruto"

#~ msgid ""
#~ "<span attrs=\"{'invisible':[('show_volume_uom_warning', '=', False)]}\" "
#~ "groups=\"!uom.group_uom\">\n"
Expand Down
17 changes: 12 additions & 5 deletions product_logistics_uom/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ msgstr "Unità di misura predefinita per esprimere il peso di prodotto"
msgid "Define your length unit of measure"
msgstr "Definire l'unità di misura della lunghezza"

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
msgid "Gross Weight"
msgstr "Peso lordo"

#. module: product_logistics_uom
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.res_config_settings_view_form
msgid "Length"
Expand Down Expand Up @@ -200,8 +206,6 @@ msgid "Volume unit of measure label"
msgstr "Etichetta unità di misura volume"

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.product_template_form_view
msgid "Weight"
msgstr "Peso"
Expand All @@ -218,15 +222,18 @@ msgstr "Unità di misura del peso"
msgid "Weight in product UOM"
msgstr "Peso nell'UdM del prodotto"

#. module: product_logistics_uom
#: model:ir.model.fields,help:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,help:product_logistics_uom.field_product_template__weight
msgid "Weight of the product with its container and packaging."
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight_uom_name
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight_uom_name
msgid "Weight unit of measure label"
msgstr "Etichetta unità di misura peso"

#~ msgid "Gross Weight"
#~ msgstr "Peso lordo"

#~ msgid ""
#~ "<span attrs=\"{'invisible':[('show_volume_uom_warning', '=', False)]}\" "
#~ "groups=\"!uom.group_uom\">\n"
Expand Down
14 changes: 12 additions & 2 deletions product_logistics_uom/i18n/product_logistics_uom.pot
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ msgstr ""
msgid "Define your length unit of measure"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
msgid "Gross Weight"
msgstr ""

#. module: product_logistics_uom
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.res_config_settings_view_form
msgid "Length"
Expand Down Expand Up @@ -164,8 +170,6 @@ msgid "Volume unit of measure label"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.product_template_form_view
msgid "Weight"
msgstr ""
Expand All @@ -182,6 +186,12 @@ msgstr ""
msgid "Weight in product UOM"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,help:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,help:product_logistics_uom.field_product_template__weight
msgid "Weight of the product with its container and packaging."
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight_uom_name
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight_uom_name
Expand Down
14 changes: 12 additions & 2 deletions product_logistics_uom/i18n/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ msgstr ""
msgid "Define your length unit of measure"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
msgid "Gross Weight"
msgstr ""

#. module: product_logistics_uom
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.res_config_settings_view_form
msgid "Length"
Expand Down Expand Up @@ -173,8 +179,6 @@ msgid "Volume unit of measure label"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight
#: model_terms:ir.ui.view,arch_db:product_logistics_uom.product_template_form_view
msgid "Weight"
msgstr ""
Expand All @@ -191,6 +195,12 @@ msgstr ""
msgid "Weight in product UOM"
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,help:product_logistics_uom.field_product_product__weight
#: model:ir.model.fields,help:product_logistics_uom.field_product_template__weight
msgid "Weight of the product with its container and packaging."
msgstr ""

#. module: product_logistics_uom
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_product__weight_uom_name
#: model:ir.model.fields,field_description:product_logistics_uom.field_product_template__weight_uom_name
Expand Down
6 changes: 3 additions & 3 deletions product_medical/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2023-11-06 08:37+0000\n"
"PO-Revision-Date: 2024-12-27 11:06+0000\n"
"Last-Translator: mymage <[email protected]>\n"
"Language-Team: none\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.17\n"
"X-Generator: Weblate 5.6.2\n"

#. module: product_medical
#: model:ir.model.fields,field_description:product_medical.field_product_product__medical_ce_certificate_class_ids
Expand Down Expand Up @@ -297,7 +297,7 @@ msgstr "Categoria DPI già esistente"
#. module: product_medical
#: model:ir.model,name:product_medical.model_product_template
msgid "Product"
msgstr ""
msgstr "Prodotto"

#. module: product_medical
#: model:ir.model.fields,field_description:product_medical.field_product_product__medical_doc_validity_date
Expand Down
114 changes: 114 additions & 0 deletions product_net_weight/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
=====================
Products - Net Weight
=====================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:9eaa8b5a2e4d76a9504da39c8d4e17f370d737bc6e3716bd8ae18f8085255d17
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |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%2Fproduct--attribute-lightgray.png?logo=github
:target: https://github.com/OCA/product-attribute/tree/18.0/product_net_weight
:alt: OCA/product-attribute
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_net_weight
: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/product-attribute&target_branch=18.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

This module extends the functionality of stock module to support net
weight. (container excluded)

**Table of contents**

.. contents::
:local:

Usage
=====

- Go to 'Inventory > Master Data > Product' and edit items.
- Go to 'Inventory' tab, and fill the "Net Weight" value.

|image1|

**Note**: The original weight field is renamed to "Gross Weight", to be
more explicit.

.. |image1| image:: https://raw.githubusercontent.com/OCA/product-attribute/18.0/product_net_weight/static/description/product_form.png

Known issues / Roadmap
======================

In futur version (> 12.0), allow to compute Weight Price (Net weight /
Price). For that purpose, refactor with ``product_logistics_uom``.

Ref :
https://github.com/OCA/product-attribute/pull/894#issuecomment-895930887

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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 <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_net_weight%0Aversion:%2018.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
-------

* GRAP

Contributors
------------

- Sylvain LE GAL (https://www.twitter.com/legalsylvain)
- `Greenice <https://www.greenice.com>`__:

- Fernando La Chica <[email protected]>

- `Tecnativa <https://www.tecnativa.com>`__:

- 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.

.. |maintainer-legalsylvain| image:: https://github.com/legalsylvain.png?size=40px
:target: https://github.com/legalsylvain
:alt: legalsylvain

Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-legalsylvain|

This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/18.0/product_net_weight>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
1 change: 1 addition & 0 deletions product_net_weight/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
25 changes: 25 additions & 0 deletions product_net_weight/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright (C) 2021 - Today: GRAP (http://www.grap.coop)
# @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Products - Net Weight",
"summary": "Add 'Net Weight' on product models",
"version": "18.0.1.0.0",
"category": "Product",
"author": "GRAP,Odoo Community Association (OCA)",
"maintainers": ["legalsylvain"],
"website": "https://github.com/OCA/product-attribute",
"license": "AGPL-3",
"depends": ["stock"],
"data": [
"views/view_product_product.xml",
"views/view_product_template.xml",
],
"demo": [
"demo/product_product.xml",
],
"images": [
"static/description/product_product_form.png",
],
"installable": True,
}
17 changes: 17 additions & 0 deletions product_net_weight/demo/product_product.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright (C) 2021 - Today: GRAP (http://www.grap.coop)
@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
deLicense AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-->
<odoo>
<record id="product_strawberry_jam" model="product.product">
<field name="name">Strawberry Jam (Jar of 250 grams)</field>
<field name="uom_id" ref="uom.product_uom_unit" />
<field name="uom_po_id" ref="uom.product_uom_unit" />
<field name="net_weight">0.250</field>
<field name="weight">0.410</field>
<field name="standard_price">1.97</field>
<field name="list_price">2.70</field>
</record>
</odoo>
Loading

0 comments on commit bdff68a

Please sign in to comment.