diff options
| -rw-r--r-- | addons/sale/models/sale_config_settings.py | 1 | ||||
| -rw-r--r-- | addons/sale/views/sale_config_settings_views.xml | 16 | ||||
| -rw-r--r-- | addons/stock/models/stock_config_settings.py | 1 | ||||
| -rw-r--r-- | addons/stock/views/stock_config_settings_views.xml | 16 | ||||
| -rw-r--r-- | addons/website_sale/models/res_config.py | 1 | ||||
| -rw-r--r-- | addons/website_sale/views/res_config_view.xml | 11 |
6 files changed, 46 insertions, 0 deletions
diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/sale_config_settings.py index 13f997764ec..30e2d09702f 100644 --- a/addons/sale/models/sale_config_settings.py +++ b/addons/sale/models/sale_config_settings.py @@ -77,6 +77,7 @@ class SaleConfiguration(models.TransientModel): module_delivery_fedex = fields.Boolean("FedEx") module_delivery_ups = fields.Boolean("UPS") module_delivery_usps = fields.Boolean("USPS") + module_delivery_bpost = fields.Boolean("bpost") module_sale_timesheet = fields.Boolean("Timesheets") module_sale_ebay = fields.Boolean("eBay") diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml index 4b4316df662..0faf12227a2 100644 --- a/addons/sale/views/sale_config_settings_views.xml +++ b/addons/sale/views/sale_config_settings_views.xml @@ -398,6 +398,22 @@ </div> </div> </div> + <div class="col-xs-12 col-md-6 o_setting_box"> + <div class="o_setting_left_pane"> + <field name="module_delivery_bpost" widget="upgrade_boolean"/> + </div> + <div class="o_setting_right_pane"> + <label for="module_delivery_bpost"/> + <div class="text-muted"> + Ship with bpost + </div> + <div class="content-group"> + <div class="text-warning mt16" id="delivery_bpost" attrs="{'invisible': [('module_delivery_bpost','=',False)]}"> + Save this page and come back here to set up the feature. + </div> + </div> + </div> + </div> </div> </xpath> <xpath expr="//h2[@id='integration_h2']" position="attributes"> diff --git a/addons/stock/models/stock_config_settings.py b/addons/stock/models/stock_config_settings.py index 8ead9a928f7..dc3f228d593 100644 --- a/addons/stock/models/stock_config_settings.py +++ b/addons/stock/models/stock_config_settings.py @@ -40,6 +40,7 @@ class StockConfigSettings(models.TransientModel): module_delivery_fedex = fields.Boolean("FedEx") module_delivery_ups = fields.Boolean("UPS") module_delivery_usps = fields.Boolean("USPS") + module_delivery_bpost = fields.Boolean("bpost") group_uom = fields.Boolean("Units of Measure", implied_group='product.group_uom') group_product_variant = fields.Boolean("Attributes & Variants", implied_group='product.group_product_variant') group_stock_multi_locations = fields.Boolean('Storage Locations', implied_group='stock.group_stock_multi_locations', diff --git a/addons/stock/views/stock_config_settings_views.xml b/addons/stock/views/stock_config_settings_views.xml index d1ef1ce1444..9be8dd98ab7 100644 --- a/addons/stock/views/stock_config_settings_views.xml +++ b/addons/stock/views/stock_config_settings_views.xml @@ -130,6 +130,22 @@ </div> </div> </div> + <div class="col-xs-12 col-md-6 o_setting_box"> + <div class="o_setting_left_pane"> + <field name="module_delivery_bpost" widget="upgrade_boolean"/> + </div> + <div class="o_setting_right_pane"> + <label for="module_delivery_bpost"/> + <div class="text-muted"> + Ship with bpost + </div> + <div class="content-group"> + <div class="mt16 text-warning" id="delivery_bpost" attrs="{'invisible': [('module_delivery_bpost','=',False)]}"> + Save this page and come back here to set up the feature. + </div> + </div> + </div> + </div> </div> <h2>Products</h2> <div class="row mt16 o_settings_container"> diff --git a/addons/website_sale/models/res_config.py b/addons/website_sale/models/res_config.py index c6eeb9d328c..528c120e6dc 100644 --- a/addons/website_sale/models/res_config.py +++ b/addons/website_sale/models/res_config.py @@ -26,6 +26,7 @@ class WebsiteConfigSettings(models.TransientModel): module_delivery_fedex = fields.Boolean("Fedex integration") module_delivery_ups = fields.Boolean("UPS integration") module_delivery_usps = fields.Boolean("USPS integration") + module_delivery_bpost = fields.Boolean("bpost integration") module_sale_ebay = fields.Boolean("eBay connector") module_sale_coupon = fields.Boolean("Discount Programs") diff --git a/addons/website_sale/views/res_config_view.xml b/addons/website_sale/views/res_config_view.xml index 56ea5e36c31..2b3fe0bf604 100644 --- a/addons/website_sale/views/res_config_view.xml +++ b/addons/website_sale/views/res_config_view.xml @@ -322,6 +322,17 @@ </div> </div> </div> + <div class="col-xs-12 col-md-6 o_setting_box" id="shipping_provider_bpost_setting"> + <div class="o_setting_left_pane"> + <field name="module_delivery_bpost" widget="upgrade_boolean"/> + </div> + <div class="o_setting_right_pane"> + <label string="bpost" for="module_delivery_bpost"/> + <div class="text-muted"> + Ship with bpost + </div> + </div> + </div> </div> <h2>eCommerce Integrations</h2> <div class="row mt16 o_settings_container" id="sale_integration_settings"> |