summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vermylen (dve) <dve@odoo.com>2016-09-02 17:19:07 +0200
committerDenis Vermylen (dve) <dve@odoo.com>2016-09-02 17:42:42 +0200
commitf31b2c8a8302fcb5d6624fcf005ce2a7fad46768 (patch)
treeba019639d46a1b4eae2deb84642dbaaa19db32cb
parentb4d7b7e6dc91d92e9f57479ddf5f691d1fc04ba8 (diff)
[FIX] website_sale: add invisible fields to view to update them
in "Website Admin" settings pricelist groups were not updated because they were not declared in the view. added now. Also added group to pricelists menu and fix typos.
-rw-r--r--addons/website_sale/models/res_config.py4
-rw-r--r--addons/website_sale/views/backend.xml2
-rw-r--r--addons/website_sale/views/res_config_view.xml3
3 files changed, 6 insertions, 3 deletions
diff --git a/addons/website_sale/models/res_config.py b/addons/website_sale/models/res_config.py
index e504c2dcaa8..1b59d6fb19a 100644
--- a/addons/website_sale/models/res_config.py
+++ b/addons/website_sale/models/res_config.py
@@ -32,7 +32,7 @@ class WebsiteConfigSettings(models.TransientModel):
group_website_multiimage = fields.Selection([
(0, 'One image per product'),
(1, 'Several images per product')
- ], string='Multi Image', implied_group='website_sale.group_website_multi_image', group='base.group_portal,base.group_user,base.group_public')
+ ], string='Multi Images', implied_group='website_sale.group_website_multi_image', group='base.group_portal,base.group_user,base.group_public')
module_website_sale_options = fields.Selection([
(0, 'One-step "add to cart"'),
(1, 'Suggest optional products when adding to cart (e.g. for a computer: warranty, software, etc.)')
@@ -61,7 +61,7 @@ class WebsiteConfigSettings(models.TransientModel):
implied_group='product.group_pricelist_item')
group_product_pricelist = fields.Boolean("Show pricelists On Products",
implied_group='product.group_product_pricelist')
- order_mail_template = fields.Many2one('mail.template', string='Order Confirmation Mail', readonly=True, default=_default_order_mail_template, help="Email sent to customer at the end of the checkout process")
+ order_mail_template = fields.Many2one('mail.template', string='Order Confirmation Email', readonly=True, default=_default_order_mail_template, help="Email sent to customer at the end of the checkout process")
@api.model
def get_default_sale_delivery_settings(self, fields):
diff --git a/addons/website_sale/views/backend.xml b/addons/website_sale/views/backend.xml
index 3c112f338a4..690175e0c7d 100644
--- a/addons/website_sale/views/backend.xml
+++ b/addons/website_sale/views/backend.xml
@@ -89,7 +89,7 @@
<!-- Configuration sub-menus -->
<menuitem id="menu_ecommerce_settings" parent="website.menu_website_global_configuration" name="e-Commerce"/>
<menuitem id="menu_ecommerce_payment_acquirers" parent="menu_ecommerce_settings" name="Payment Acquirers" action="payment.action_payment_acquirer"/>
- <menuitem id="menu_catalog_pricelists" name="Pricelists" parent="menu_ecommerce_settings" action="product.product_pricelist_action2" sequence="3"/>
+ <menuitem id="menu_catalog_pricelists" name="Pricelists" parent="menu_ecommerce_settings" action="product.product_pricelist_action2" groups="product.group_pricelist_item" sequence="3"/>
</odoo>
diff --git a/addons/website_sale/views/res_config_view.xml b/addons/website_sale/views/res_config_view.xml
index 261fb899663..5592c321644 100644
--- a/addons/website_sale/views/res_config_view.xml
+++ b/addons/website_sale/views/res_config_view.xml
@@ -9,6 +9,9 @@
<group name="delivery" string="e-Commerce">
<field name="group_website_multiimage" widget="radio"/>
<field name="module_website_sale_options" widget="radio"/>
+ <field name="group_sale_pricelist" class="oe_inline" invisible="1"/>
+ <field name="group_pricelist_item" class="oe_inline" invisible="1"/>
+ <field name="group_product_pricelist" class="oe_inline" invisible="1"/>
<field name="sale_pricelist_setting_split_1" widget="radio"/>
<field name="sale_pricelist_setting_split_2" widget="radio" attrs="{'invisible': [('sale_pricelist_setting_split_1', '=', False)]}"/>
<field name="module_website_sale_delivery" invisible="1"/>