summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorAlexis de Lattre <alexis.delattre@akretion.com>2017-04-25 17:57:07 +0200
committerMartin Trigaux <mat@odoo.com>2017-04-26 15:37:20 +0200
commit7e1a523fbff1df45e41fb24b71ea6d0bbb86d0e9 (patch)
tree2520008b6b9cb7c15ec6f2edb6ab9d7e2ff8bdde /addons
parent482fec483874337a5df7d1b19d950273727036c0 (diff)
[FIX] product: missing string on field
Closes #16640
Diffstat (limited to 'addons')
-rw-r--r--addons/product/i18n/product.pot12
-rw-r--r--addons/product/models/product.py3
2 files changed, 6 insertions, 9 deletions
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 842fd0356db..5669c10274f 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 14:00+0000\n"
-"PO-Revision-Date: 2016-09-29 14:00+0000\n"
+"POT-Creation-Date: 2017-04-26 13:35+0000\n"
+"PO-Revision-Date: 2017-04-26 13:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -602,6 +602,7 @@ msgid "Companies"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_price_history_company_id
#: model:ir.model.fields,field_description:product.field_product_pricelist_company_id
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_company_id
#: model:ir.model.fields,field_description:product.field_product_product_company_id
@@ -611,11 +612,6 @@ msgid "Company"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_price_history_company_id
-msgid "Company id"
-msgstr ""
-
-#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
msgid "Compute Price"
msgstr ""
diff --git a/addons/product/models/product.py b/addons/product/models/product.py
index 39505563ba9..ca31a71f90b 100644
--- a/addons/product/models/product.py
+++ b/addons/product/models/product.py
@@ -94,7 +94,8 @@ class ProductPriceHistory(models.Model):
def _get_default_company_id(self):
return self._context.get('force_company', self.env.user.company_id.id)
- company_id = fields.Many2one('res.company', default=_get_default_company_id, required=True)
+ company_id = fields.Many2one('res.company', string='Company',
+ default=_get_default_company_id, required=True)
product_id = fields.Many2one('product.product', 'Product', ondelete='cascade', required=True)
datetime = fields.Datetime('Date', default=fields.Datetime.now)
cost = fields.Float('Cost', digits=dp.get_precision('Product Price'))