diff options
| author | dip-odoo <dip@odoo.com> | 2017-10-23 17:48:27 +0530 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2017-12-01 14:52:28 +0100 |
| commit | a582f00dfa2cfde70c726dfd31acde7c6f32681c (patch) | |
| tree | 587b26ff5e67bc92f6bbf026cd3fbcd3cc76412b | |
| parent | 00b6b26b44dbc7f0332f85976e074652038c59ef (diff) | |
[IMP] product,stock,lunch: Uniformize 'Product Category' accross views and menus
PURPOSE
=======
Ensure terms consistency across Odoo
Specification
=============
All the menus and fields labels which are related to product.category should be named "Product Category" (if field label) and "Product Categories" (if menu entry)
| -rw-r--r-- | addons/lunch/models/lunch.py | 4 | ||||
| -rw-r--r-- | addons/lunch/views/lunch_views.xml | 2 | ||||
| -rw-r--r-- | addons/product/models/product_template.py | 2 | ||||
| -rw-r--r-- | addons/product/views/product_views.xml | 2 | ||||
| -rw-r--r-- | addons/stock/models/stock_inventory.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/addons/lunch/models/lunch.py b/addons/lunch/models/lunch.py index f539e6d8881..0108165c2b0 100644 --- a/addons/lunch/models/lunch.py +++ b/addons/lunch/models/lunch.py @@ -231,7 +231,7 @@ class LunchProduct(models.Model): _description = 'lunch product' name = fields.Char('Product', required=True) - category_id = fields.Many2one('lunch.product.category', 'Category', required=True) + category_id = fields.Many2one('lunch.product.category', 'Product Category', required=True) description = fields.Text('Description') price = fields.Float('Price', digits=dp.get_precision('Account')) supplier = fields.Many2one('res.partner', 'Vendor') @@ -243,7 +243,7 @@ class LunchProductCategory(models.Model): _name = 'lunch.product.category' _description = 'lunch product category' - name = fields.Char('Category', required=True) + name = fields.Char('Product Category', required=True) class LunchCashMove(models.Model): diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml index 22069009380..28462b54d3f 100644 --- a/addons/lunch/views/lunch_views.xml +++ b/addons/lunch/views/lunch_views.xml @@ -562,7 +562,7 @@ <field name="description"/> <group expand="0" string="Group By"> <filter name="supplier" string="Vendor" context="{'group_by': 'supplier'}"/> - <filter name="category" string="Category" context="{'group_by': 'category_id'}"/> + <filter name="category" string="Product Category" context="{'group_by': 'category_id'}"/> <filter name="inactive" string="Archived" domain="[('active','=',False)]"/> </group> </search> diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py index 9ef10ae5317..11afb5add1d 100644 --- a/addons/product/models/product_template.py +++ b/addons/product/models/product_template.py @@ -56,7 +56,7 @@ class ProductTemplate(models.Model): 'the e-commerce such as e-books, music, pictures,... The "Digital Product" module has to be installed.') rental = fields.Boolean('Can be Rent') categ_id = fields.Many2one( - 'product.category', 'Internal Category', + 'product.category', 'Product Category', change_default=True, default=_get_default_category_id, required=True, help="Select category for the current product") diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml index d976fc12806..3ca8266069a 100644 --- a/addons/product/views/product_views.xml +++ b/addons/product/views/product_views.xml @@ -44,7 +44,7 @@ <group> <group name="group_general"> <field name="type"/> - <field name="categ_id" string="Category"/> + <field name="categ_id" string="Product Category"/> </group> <group name="group_standard_price"> <field name="list_price" widget='monetary' options="{'currency_field': 'currency_id'}"/> diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py index 38c23b33b57..f024d28367b 100644 --- a/addons/stock/models/stock_inventory.py +++ b/addons/stock/models/stock_inventory.py @@ -83,7 +83,7 @@ class Inventory(models.Model): "system propose for a single product / lot /... ") total_qty = fields.Float('Total Quantity', compute='_compute_total_qty') category_id = fields.Many2one( - 'product.category', 'Inventoried Category', + 'product.category', 'Product Category', readonly=True, states={'draft': [('readonly', False)]}, help="Specify Product Category to focus your inventory on a particular Category.") exhausted = fields.Boolean('Include Exhausted Products', readonly=True, states={'draft': [('readonly', False)]}) |
