diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-09-20 14:16:48 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-09-20 14:33:54 +0000 |
| commit | 58a83d12228fbbd4e9dde542e133d264204ee0f3 (patch) | |
| tree | 60aaf45e3281e88fddc58fea8fe75de0ad4e2f46 /addons/product | |
| parent | f6da4d57bcc8e19ae0bd6d571926706bee46e08f (diff) | |
| parent | 4a1321bc99dd7d8d153aceb2d0076161ce28bcd7 (diff) | |
[MERGE] forward port branch saas-12.4 up to 4a1321bc99d
closes odoo/odoo#37127
Signed-off-by: Christophe Simonis <chs@odoo.com>
Diffstat (limited to 'addons/product')
| -rw-r--r-- | addons/product/models/product.py | 1 | ||||
| -rw-r--r-- | addons/product/report/product_pricelist_templates.xml | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/product/models/product.py b/addons/product/models/product.py index fe3fac09f76..6e0fdaa206e 100644 --- a/addons/product/models/product.py +++ b/addons/product/models/product.py @@ -710,6 +710,7 @@ class SupplierInfo(models.Model): 'res.partner', 'Vendor', ondelete='cascade', required=True, help="Vendor of this product", check_company=True) + active = fields.Boolean(related='name.active', readonly=True) product_name = fields.Char( 'Vendor Product Name', help="This vendor's product name will be used when printing a request for quotation. Keep empty to use the internal one.") diff --git a/addons/product/report/product_pricelist_templates.xml b/addons/product/report/product_pricelist_templates.xml index 0f7d54db714..41ba6092f31 100644 --- a/addons/product/report/product_pricelist_templates.xml +++ b/addons/product/report/product_pricelist_templates.xml @@ -53,9 +53,9 @@ </td> <t t-foreach="data['quantities']" t-as="quantity"> <td><strong t-esc="categ_data['prices'][product.id][quantity]" - t-esc-options="{ - 'widget': 'monetary', - 'display_currency': data['pricelist'].currency_id}"/> + t-options="{ + 'widget': 'float', + 'decimal_precision': 'Product Price'}"/> </td> </t> </tr> |