pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website,website_sale: improve settings view

Browse Source 
rename options, add radio widget
This commit is contained in:
Denis Vermylen (dve)
2016-09-02 17:42:42 +02:00
parent 7ace88f6a9
commit 07a1ed406f
3 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/views/res_config_views.xml
+22 -22
View File
@@ -34,6 +34,28 @@
</div>
</div>
</group>
<group string="Language">
<label for="language_ids"/>
<div name="language_ids">
<div>
<div name="language_ids" class="oe_inline">
<field name="language_ids" widget="many2many_checkboxes"/>
</div>
</div>
</div>
<label for="default_lang_id"/>
<div name="default_lang_id">
<div>
<div name="default_lang_id" class="oe_inline">
<field name="default_lang_id" widget="selection"/>
</div>
</div>
</div>
<label for="id" string="New Language"/>
<div>
<button type="action" name="%(base.action_view_base_language_install)d" string="Install a language" class="oe_link"/>
</div>
</group>
<group name="social" string="Social Media">
<label for="social_twitter"/>
<div name="social_twitter">
@@ -74,28 +96,6 @@
</group>
<group>
</group>
<group string="Language">
<label for="language_ids"/>
<div name="language_ids">
<div>
<div name="language_ids" class="oe_inline">
<field name="language_ids" widget="many2many_checkboxes"/>
</div>
</div>
</div>
<label for="default_lang_id"/>
<div name="default_lang_id">
<div>
<div name="default_lang_id" class="oe_inline">
<field name="default_lang_id" widget="selection"/>
</div>
</div>
</div>
<label for="id" string="New Language"/>
<div>
<button type="action" name="%(base.action_view_base_language_install)d" string="Install a language" class="oe_link"/>
</div>
</group>
<group string="Menu" groups="base.group_no_one">
<button type="action"
addons/website_sale/models/res_config.py
+7 -4
View File
@@ -20,8 +20,8 @@ class WebsiteConfigSettings(models.TransientModel):
# field used to have a nice radio in form view, resuming the 2 fields above
sale_delivery_settings = fields.Selection([
('none', 'No shipping management on website'),
('internal', 'Shipping methods not selectable in the customer checkout but managed internally'),
('website', 'Shipping methods available in the customer checkout (adds shipping costs to orders)'),
('internal', "Delivery methods are only used internally: the customer doesn't pay for shipping costs"),
('website', "Delivery methods are selectable on the website: the customer pays for shipping costs"),
], string="Shipping Management")
module_delivery_dhl = fields.Boolean("DHL integration")
module_delivery_fedex = fields.Boolean("Fedex integration")
@@ -29,7 +29,10 @@ class WebsiteConfigSettings(models.TransientModel):
module_delivery_ups = fields.Boolean("UPS integration")
module_delivery_usps = fields.Boolean("USPS integration")
module_sale_ebay = fields.Boolean("eBay connector")
group_website_multiimage = fields.Boolean('Multi Image', implied_group='website_sale.group_website_multi_image', group='base.group_portal,base.group_user,base.group_public')
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')
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.)')
@@ -58,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)
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")
@api.model
def get_default_sale_delivery_settings(self, fields):
addons/website_sale/views/res_config_view.xml
+1 -1
View File
@@ -7,6 +7,7 @@
<field name="arch" type="xml">
<group name="social" position="before">
<group name="delivery" string="eCommerce">
<field name="group_website_multiimage" widget="radio"/>
<field name="module_website_sale_options" widget="radio"/>
<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)]}"/>
@@ -46,7 +47,6 @@
<div groups="base.group_no_one" class="oe_inline">
<field name="salesperson_id"/>
</div>
<field name="group_website_multiimage"/>
<field name="order_mail_template"/>
</group>
</group>