diff options
| author | Richard Mathot <rim@odoo.com> | 2015-10-21 11:39:31 +0200 |
|---|---|---|
| committer | Richard Mathot <rim@odoo.com> | 2015-10-21 11:39:31 +0200 |
| commit | 2badc0f856bf4e95bd19bc74f47711fc0679326d (patch) | |
| tree | 81ccc1f97b660174107eaee547354785c8279a12 | |
| parent | edd388ffe564116680f8ee1c3e74134dc54645cc (diff) | |
[REV] edd388ffe564116680f8ee1c3e74134dc54645cc.
Should go to master, not to 9.0
| -rw-r--r-- | addons/stock/res_config.py | 1 | ||||
| -rw-r--r-- | addons/stock/res_config_view.xml | 4 | ||||
| -rw-r--r-- | addons/website_sale/res_config.py | 1 | ||||
| -rw-r--r-- | addons/website_sale/res_config_view.xml | 3 |
4 files changed, 0 insertions, 9 deletions
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py index e4cb9ed8d6d..c8a4efe2251 100644 --- a/addons/stock/res_config.py +++ b/addons/stock/res_config.py @@ -160,7 +160,6 @@ class stock_config_settings(osv.osv_memory): 'module_stock_barcode': fields.boolean("Barcode scanner support"), 'module_delivery_dhl': fields.boolean("DHL integration"), 'module_delivery_fedex': fields.boolean("Fedex integration"), - 'module_delivery_temando': fields.boolean("Temando integration"), 'module_delivery_ups': fields.boolean("UPS integration"), 'module_delivery_usps': fields.boolean("USPS integration"), } diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml index 672f16eb354..323a4289dca 100644 --- a/addons/stock/res_config_view.xml +++ b/addons/stock/res_config_view.xml @@ -45,10 +45,6 @@ <label for="module_delivery_fedex"/> </div> <div> - <field name="module_delivery_temando" widget="upgrade_boolean"/> - <label for="module_delivery_temando"/> - </div> - <div> <field name="module_delivery_ups" widget="upgrade_boolean"/> <label for="module_delivery_ups"/> </div> diff --git a/addons/website_sale/res_config.py b/addons/website_sale/res_config.py index d54c34848b8..a71fe42b458 100644 --- a/addons/website_sale/res_config.py +++ b/addons/website_sale/res_config.py @@ -8,7 +8,6 @@ class website_config_settings(models.TransientModel): salesteam_id = fields.Many2one('crm.team', related='website_id.salesteam_id', string='Sales Team') module_delivery_dhl = fields.Boolean("DHL integration") module_delivery_fedex = fields.Boolean("Fedex integration") - module_delivery_temando = fields.Boolean("Temando integration") module_delivery_ups = fields.Boolean("UPS integration") module_delivery_usps = fields.Boolean("USPS integration") module_sale_ebay = fields.Boolean("eBay connector") diff --git a/addons/website_sale/res_config_view.xml b/addons/website_sale/res_config_view.xml index 5d1010736a9..ac225579e36 100644 --- a/addons/website_sale/res_config_view.xml +++ b/addons/website_sale/res_config_view.xml @@ -16,9 +16,6 @@ <field name="module_delivery_fedex" widget="upgrade_boolean"/> <label for="module_delivery_fedex"/> </div><div> - <field name="module_delivery_temando" widget="upgrade_boolean"/> - <label for="module_delivery_temando"/> - </div><div> <field name="module_delivery_usps" widget="upgrade_boolean"/> <label for="module_delivery_usps"/> </div><div> |