From 58e83ab17811f1f6535253404f76ef36e4aa0df1 Mon Sep 17 00:00:00 2001 From: Chinmayi Vyas Date: Wed, 11 Apr 2018 13:40:45 +0530 Subject: [PATCH] [REM]Remove Enterprise Tags --- addons/auth_signup/data/auth_signup_data.xml | 9 -- addons/event/data/email_template_data.xml | 2 - addons/event/models/event_config_settings.py | 1 - .../event/views/res_config_settings_views.xml | 14 --- addons/gamification/data/goal_base.xml | 4 +- .../hr_payroll/models/res_config_settings.py | 1 - .../views/res_config_settings_views.xml | 14 --- .../data/hr_recruitment_data.xml | 3 - .../models/res_config_settings.py | 1 - .../views/res_config_settings_views.xml | 33 ------- addons/l10n_mx/__manifest__.py | 1 - addons/l10n_mx/models/__init__.py | 1 - addons/l10n_mx/models/res_config_settings.py | 9 -- .../views/res_config_settings_views.xml | 23 ----- addons/mrp/models/res_config_settings.py | 8 -- .../mrp/views/res_config_settings_views.xml | 46 ---------- addons/point_of_sale/models/pos_config.py | 1 - .../point_of_sale/views/pos_config_view.xml | 16 ---- addons/project/models/res_config_settings.py | 1 - .../views/res_config_settings_views.xml | 11 --- addons/purchase/models/res_config_settings.py | 1 - .../views/res_config_settings_views.xml | 11 --- addons/rating_project/data/project_data.xml | 1 - addons/stock/models/res_config_settings.py | 6 -- .../stock/views/res_config_settings_views.xml | 87 ------------------- addons/website/models/res_config_settings.py | 1 - .../views/res_config_settings_views.xml | 11 --- .../website_quote/data/website_quote_data.xml | 4 - 28 files changed, 2 insertions(+), 319 deletions(-) delete mode 100644 addons/l10n_mx/models/res_config_settings.py delete mode 100644 addons/l10n_mx/views/res_config_settings_views.xml diff --git a/addons/auth_signup/data/auth_signup_data.xml b/addons/auth_signup/data/auth_signup_data.xml index 6f3b6d2d..c3e2ccb7 100644 --- a/addons/auth_signup/data/auth_signup_data.xml +++ b/addons/auth_signup/data/auth_signup_data.xml @@ -45,9 +45,6 @@
${user.signature | safe} -

- Sent by ${user.company_id.name} using Flectra -

]]> @@ -84,9 +81,6 @@
${user.signature | safe} -

- Sent by ${user.company_id.name} using Flectra -

]]> @@ -128,9 +122,6 @@
${user.signature | safe} -

- Sent by ${user.company_id.name} using Flectra -

diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index 3d91bb4e..404be380 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -178,7 +178,6 @@ -
Sent by ${object.company_id.name}
% if 'website_url' in object.event_id and object.event_id.website_url:
Discover all our events. @@ -346,7 +345,6 @@ -

Sent by ${object.company_id.name}

% if 'website_url' in object.event_id and object.event_id.website_url:
Discover all our events. diff --git a/addons/event/models/event_config_settings.py b/addons/event/models/event_config_settings.py index 5216709d..92061248 100644 --- a/addons/event/models/event_config_settings.py +++ b/addons/event/models/event_config_settings.py @@ -8,5 +8,4 @@ class ResConfigSettings(models.TransientModel): module_event_sale = fields.Boolean("Tickets") module_website_event_track = fields.Boolean("Tracks and Agenda") module_website_event_questions = fields.Boolean("Registration Survey") - module_event_barcode = fields.Boolean("Barcode") module_website_event_sale = fields.Boolean("Online Ticketing") diff --git a/addons/event/views/res_config_settings_views.xml b/addons/event/views/res_config_settings_views.xml index 7e849999..4268a0df 100644 --- a/addons/event/views/res_config_settings_views.xml +++ b/addons/event/views/res_config_settings_views.xml @@ -48,20 +48,6 @@
-

Attendance

-
-
-
- -
-
-
-
-
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml index e0008327..306c2fed 100644 --- a/addons/gamification/data/goal_base.xml +++ b/addons/gamification/data/goal_base.xml @@ -243,11 +243,11 @@ - + diff --git a/addons/hr_payroll/models/res_config_settings.py b/addons/hr_payroll/models/res_config_settings.py index 703e9c86..645a9037 100644 --- a/addons/hr_payroll/models/res_config_settings.py +++ b/addons/hr_payroll/models/res_config_settings.py @@ -7,7 +7,6 @@ from flectra import fields, models class ResConfigSettings(models.TransientModel): _inherit = 'res.config.settings' - module_account_accountant = fields.Boolean(string='Account Accountant') module_l10n_fr_hr_payroll = fields.Boolean(string='French Payroll') module_l10n_be_hr_payroll = fields.Boolean(string='Belgium Payroll') module_l10n_in_hr_payroll = fields.Boolean(string='Indian Payroll') diff --git a/addons/hr_payroll/views/res_config_settings_views.xml b/addons/hr_payroll/views/res_config_settings_views.xml index 049f5777..31f0367d 100644 --- a/addons/hr_payroll/views/res_config_settings_views.xml +++ b/addons/hr_payroll/views/res_config_settings_views.xml @@ -33,20 +33,6 @@ -

Accounting

-
-
-
- -
-
-
-
-
diff --git a/addons/hr_recruitment/data/hr_recruitment_data.xml b/addons/hr_recruitment/data/hr_recruitment_data.xml index f041e111..72a24302 100644 --- a/addons/hr_recruitment/data/hr_recruitment_data.xml +++ b/addons/hr_recruitment/data/hr_recruitment_data.xml @@ -82,7 +82,6 @@ -
Sent by ${object.company_id.name}
% if 'website_url' in object.job_id and object.job_id.website_url:
Discover our others jobs. @@ -229,7 +228,6 @@ -
Sent by ${object.company_id.name}
% if 'website_url' in object.job_id and object.job_id.website_url:
Discover all our jobs. @@ -368,7 +366,6 @@ -
Sent by ${object.company_id.name}
% if 'website_url' in object.job_id and object.job_id.website_url:
Discover all our jobs. diff --git a/addons/hr_timesheet/models/res_config_settings.py b/addons/hr_timesheet/models/res_config_settings.py index d105384f..cd7940a0 100644 --- a/addons/hr_timesheet/models/res_config_settings.py +++ b/addons/hr_timesheet/models/res_config_settings.py @@ -7,6 +7,5 @@ from flectra import fields, models class ResConfigSettings(models.TransientModel): _inherit = 'res.config.settings' - module_project_timesheet_synchro = fields.Boolean("Awesome Timesheet") module_sale_timesheet = fields.Boolean("Time Billing") module_project_timesheet_holidays = fields.Boolean("Leaves") diff --git a/addons/hr_timesheet/views/res_config_settings_views.xml b/addons/hr_timesheet/views/res_config_settings_views.xml index 0caad614..3b66e0d6 100644 --- a/addons/hr_timesheet/views/res_config_settings_views.xml +++ b/addons/hr_timesheet/views/res_config_settings_views.xml @@ -11,39 +11,6 @@
-

Timesheet Apps

-
-
-
- -
-
-
-
-

Billing

diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py index b9e2f44c..e28cfe28 100644 --- a/addons/l10n_mx/__manifest__.py +++ b/addons/l10n_mx/__manifest__.py @@ -40,6 +40,5 @@ With this module you will have: "data/account_tax_data.xml", "data/fiscal_position_data.xml", "data/account_chart_template_data.yml", - "views/res_config_settings_views.xml", ], } diff --git a/addons/l10n_mx/models/__init__.py b/addons/l10n_mx/models/__init__.py index 2e1acea6..aac007e7 100644 --- a/addons/l10n_mx/models/__init__.py +++ b/addons/l10n_mx/models/__init__.py @@ -3,5 +3,4 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). from . import account -from . import res_config_settings from . import chart_template diff --git a/addons/l10n_mx/models/res_config_settings.py b/addons/l10n_mx/models/res_config_settings.py deleted file mode 100644 index 8a4bf0f4..00000000 --- a/addons/l10n_mx/models/res_config_settings.py +++ /dev/null @@ -1,9 +0,0 @@ -# -*- coding: utf-8 -*- - -from flectra import fields, models - - -class ResConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' - - module_l10n_mx_edi = fields.Boolean('Mexican Electronic Invoicing') diff --git a/addons/l10n_mx/views/res_config_settings_views.xml b/addons/l10n_mx/views/res_config_settings_views.xml deleted file mode 100644 index 6ebab648..00000000 --- a/addons/l10n_mx/views/res_config_settings_views.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - res.config.settings.view.form.inherit.l10n.mx - res.config.settings - - - -
-
- -
-
-
-
- - - - diff --git a/addons/mrp/models/res_config_settings.py b/addons/mrp/models/res_config_settings.py index d9851e70..789080b1 100644 --- a/addons/mrp/models/res_config_settings.py +++ b/addons/mrp/models/res_config_settings.py @@ -10,13 +10,9 @@ class ResConfigSettings(models.TransientModel): manufacturing_lead = fields.Float(related='company_id.manufacturing_lead', string="Manufacturing Lead Time") use_manufacturing_lead = fields.Boolean(string="Default Manufacturing Lead Time", oldname='default_use_manufacturing_lead') module_mrp_byproduct = fields.Boolean("By-Products") - module_mrp_mps = fields.Boolean("Master Production Schedule") module_mrp_plm = fields.Boolean("Product Lifecycle Management (PLM)") - module_mrp_maintenance = fields.Boolean("Maintenance") module_quality_mrp = fields.Boolean("Quality") module_mrp_repair = fields.Boolean("Repair") - group_mrp_routings = fields.Boolean("Work Orders & Quality", - implied_group='mrp.group_mrp_routings') @api.model def get_values(self): @@ -35,7 +31,3 @@ class ResConfigSettings(models.TransientModel): def _onchange_use_manufacturing_lead(self): if not self.use_manufacturing_lead: self.manufacturing_lead = 0.0 - - @api.onchange('group_mrp_routings') - def _onchange_group_mrp_routings(self): - self.module_quality_mrp = self.group_mrp_routings diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml index f2a956fa..8b91dea7 100644 --- a/addons/mrp/views/res_config_settings_views.xml +++ b/addons/mrp/views/res_config_settings_views.xml @@ -11,29 +11,6 @@

Operations

-
-
- - -
-
-
-
@@ -45,17 +22,6 @@
-
-
- -
-
-
-

Products

@@ -73,18 +39,6 @@

Planning

-
-
- -
-
-
diff --git a/addons/point_of_sale/models/pos_config.py b/addons/point_of_sale/models/pos_config.py index 0bba11b5..e0f17cde 100644 --- a/addons/point_of_sale/models/pos_config.py +++ b/addons/point_of_sale/models/pos_config.py @@ -158,7 +158,6 @@ class PosConfig(models.Model): start_category = fields.Boolean("Set Start Category") module_pos_restaurant = fields.Boolean("Is a Bar/Restaurant") module_pos_discount = fields.Boolean("Global Discounts") - module_pos_loyalty = fields.Boolean("Loyalty Program") module_pos_mercury = fields.Boolean(string="Integrated Card Payments") module_pos_reprint = fields.Boolean(string="Reprint Receipt") is_posbox = fields.Boolean("PosBox") diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml index d1d64b8e..d3e70b09 100644 --- a/addons/point_of_sale/views/pos_config_view.xml +++ b/addons/point_of_sale/views/pos_config_view.xml @@ -265,22 +265,6 @@
-
-
- -
-
-
-
diff --git a/addons/project/models/res_config_settings.py b/addons/project/models/res_config_settings.py index ce10c443..be349115 100644 --- a/addons/project/models/res_config_settings.py +++ b/addons/project/models/res_config_settings.py @@ -9,7 +9,6 @@ class ResConfigSettings(models.TransientModel): module_hr_timesheet = fields.Boolean("Timesheets") module_rating_project = fields.Boolean(string="Rating on Tasks") - module_project_forecast = fields.Boolean(string="Forecasts") group_subtask_project = fields.Boolean("Sub-tasks", implied_group="project.group_subtask_project") project_time_mode_id = fields.Many2one( 'product.uom', related='company_id.project_time_mode_id', string='Project Time Unit', diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml index 0b28a7f4..2cf6a327 100644 --- a/addons/project/views/res_config_settings_views.xml +++ b/addons/project/views/res_config_settings_views.xml @@ -62,17 +62,6 @@
-
-
- -
-
-
-
diff --git a/addons/purchase/models/res_config_settings.py b/addons/purchase/models/res_config_settings.py index ab5f8515..7f5a26f5 100644 --- a/addons/purchase/models/res_config_settings.py +++ b/addons/purchase/models/res_config_settings.py @@ -25,7 +25,6 @@ class ResConfigSettings(models.TransientModel): module_stock_dropshipping = fields.Boolean("Dropshipping") group_manage_vendor_price = fields.Boolean("Vendor Pricelists", implied_group="purchase.group_manage_vendor_price") - module_account_3way_match = fields.Boolean("3-way matching: purchases, receptions and bills") is_installed_sale = fields.Boolean(string="Is the Sale Module Installed") group_analytic_account_for_purchases = fields.Boolean('Analytic accounting for purchases', implied_group='purchase.group_analytic_accounting') diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml index 1508b5e4..fbc9895f 100644 --- a/addons/purchase/views/res_config_settings_views.xml +++ b/addons/purchase/views/res_config_settings_views.xml @@ -85,17 +85,6 @@
-
-
- -
-
-
-

Products

diff --git a/addons/rating_project/data/project_data.xml b/addons/rating_project/data/project_data.xml index 47c21f94..49ff2144 100644 --- a/addons/rating_project/data/project_data.xml +++ b/addons/rating_project/data/project_data.xml @@ -100,7 +100,6 @@ % if object.project_id.rating_status == 'periodic':

This customer survey is sent ${object.project_id.rating_status_period} as long as the task is in the ${object.stage_id.name} stage.

% endif -

Email automatically sent by Flectra Project for ${object.project_id.company_id.name}

diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py index 4d9b1a9a..2821c2f8 100644 --- a/addons/stock/models/res_config_settings.py +++ b/addons/stock/models/res_config_settings.py @@ -30,12 +30,6 @@ class ResConfigSettings(models.TransientModel): oldname='default_new_propagation_minimum_delta', help="Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n This option allows to not propagate the rescheduling if the change is not critical.") module_stock_picking_batch = fields.Boolean("Batch Pickings", oldname="module_stock_picking_wave") - module_stock_barcode = fields.Boolean("Barcode Scanner") - module_delivery_dhl = fields.Boolean("DHL USA") - 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_stock_multi_locations = fields.Boolean('Storage Locations', implied_group='stock.group_stock_multi_locations', help="Store products in specific locations of your warehouse (e.g. bins, racks) and to track inventory accordingly.") group_stock_multi_warehouses = fields.Boolean('Multi-Warehouses', implied_group='stock.group_stock_multi_warehouses') diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml index 9abe89a6..c6caa7e0 100644 --- a/addons/stock/views/res_config_settings_views.xml +++ b/addons/stock/views/res_config_settings_views.xml @@ -11,20 +11,6 @@

Operations

-
-
- -
-
-
@@ -59,79 +45,6 @@
-

Shipping Connectors

-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-

Products

diff --git a/addons/website/models/res_config_settings.py b/addons/website/models/res_config_settings.py index 1d57097c..25680948 100644 --- a/addons/website/models/res_config_settings.py +++ b/addons/website/models/res_config_settings.py @@ -30,7 +30,6 @@ class ResConfigSettings(models.TransientModel): cdn_activated = fields.Boolean('Use a Content Delivery Network (CDN)', related='website_id.cdn_activated') cdn_url = fields.Char(related='website_id.cdn_url') cdn_filters = fields.Text(related='website_id.cdn_filters') - module_website_version = fields.Boolean("A/B Testing") favicon = fields.Binary('Favicon', related='website_id.favicon') # Set as global config parameter since methods using it are not website-aware. To be changed diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml index 17542d18..80b7f143 100644 --- a/addons/website/views/res_config_settings_views.xml +++ b/addons/website/views/res_config_settings_views.xml @@ -132,17 +132,6 @@
-
-
- -
-
-
-
diff --git a/addons/website_quote/data/website_quote_data.xml b/addons/website_quote/data/website_quote_data.xml index 4a55bb42..f09ab0a3 100644 --- a/addons/website_quote/data/website_quote_data.xml +++ b/addons/website_quote/data/website_quote_data.xml @@ -137,10 +137,6 @@

${user.signature | safe}

% endif -

Sent by - - ${user.company_id.name} - using Odoo