From 64294e14c4c4855eb03fbd1344dba61c0d5ade85 Mon Sep 17 00:00:00 2001 From: Manuel Claeys Bouuaert Date: Fri, 11 Sep 2020 20:35:17 +0200 Subject: [PATCH] [REM] beesdoo_product: 'exvat' in name of list_price and suggested_price --- beesdoo_product/models/beesdoo_product.py | 6 ++---- beesdoo_product/readme/DESCRIPTION.rst | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/beesdoo_product/models/beesdoo_product.py b/beesdoo_product/models/beesdoo_product.py index 9545f7e..75e5c06 100644 --- a/beesdoo_product/models/beesdoo_product.py +++ b/beesdoo_product/models/beesdoo_product.py @@ -72,10 +72,8 @@ class BeesdooProduct(models.Model): note = fields.Text("Comments") - # S0023 : List_price = Price HTVA, so add a suggested price - list_price = fields.Float(string="exVAT Price") suggested_price = fields.Float( - string="Suggested exVAT Price", compute="_compute_cost", readOnly=True, + string="Suggested Price", compute="_compute_cost", readOnly=True, help=""" This field computes a suggested price based on the 'Product Margin' field on Partners (Vendors), if it's set, or otherwise on the 'Product @@ -332,7 +330,7 @@ class BeesdooProductCategory(models.Model): class BeesdooProductSupplierInfo(models.Model): _inherit = "product.supplierinfo" - price = fields.Float("exVAT Price") + price = fields.Float("Price") class BeesdooUOMCateg(models.Model): diff --git a/beesdoo_product/readme/DESCRIPTION.rst b/beesdoo_product/readme/DESCRIPTION.rst index 297e02a..9b809d3 100644 --- a/beesdoo_product/readme/DESCRIPTION.rst +++ b/beesdoo_product/readme/DESCRIPTION.rst @@ -1,3 +1,3 @@ Modification of product module for the needs of beescoop - SOOO5 - Adds the label bio/ethique/provenance -- Add a 'Suggested exVAT Price' field on products, and a 'Product Margin' field on Partners (Vendors) and Product Categories. The first margin is used if set, otherwise the second margin (which has a default value) is used. +- Add a 'Suggested Price' field on products, and a 'Product Margin' field on Partners (Vendors) and Product Categories. The first margin is used if set, otherwise the second margin (which has a default value) is used.