summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis González <lgonzalez@vauxoo.com>2019-05-07 16:25:56 +0000
committerLuis González <lgonzalez@vauxoo.com>2019-05-08 21:35:02 +0000
commit6afec6b6b8d2a95264f1a775f8dcee9a90d3fda7 (patch)
tree89e751f2c12f928423e3e67496967c4ad9b736b7
parent2c366acbf01664c4f8d3230d402aa5f2fb46e078 (diff)
[I18N] sale: Remove duplicated term from pot
Commit c7773f9f introduced a duplicated term to the file .pot, which causes the following error when trying to re-load translations: ``` ON CONFLICT DO UPDATE command cannot affect row a second time HINT: Ensure that no rows proposed for insertion within the same command have duplicate constrained values. ``` This commit removes on eof the duplicates, leaving only the valid one. In addition, field string is modified to match the one defined at the `website_sale` module, to prevent this from happening again, as had also in 6af6da5c. closes odoo/odoo#33223 Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
-rw-r--r--addons/sale/i18n/sale.pot5
-rw-r--r--addons/sale/models/res_config_settings.py2
2 files changed, 1 insertions, 6 deletions
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index b4334b0e18c..a5902319ab7 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -3072,11 +3072,6 @@ msgid "Sell and purchase products in different units of measure"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_website_sale_digital
-msgid "Sell digital products - provide downloadable content on your customer portal"
-msgstr ""
-
-#. module: sale
#: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Sell products by multiple of unit # per package"
msgstr ""
diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py
index 9af48d1a011..7cf532f2b8c 100644
--- a/addons/sale/models/res_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -47,7 +47,7 @@ class ResConfigSettings(models.TransientModel):
oldname='default_deposit_product_id',
help='Default product used for payment advances')
auto_done_setting = fields.Boolean("Lock Confirmed Sales", config_parameter='sale.auto_done_setting')
- module_website_sale_digital = fields.Boolean("Sell digital products - provide downloadable content on your customer portal")
+ module_website_sale_digital = fields.Boolean("Digital Content")
auth_signup_uninvited = fields.Selection([
('b2b', 'On invitation'),