From 2382520c34fae7cf7d093cbce43236c2d35f66fe Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 30 Mar 2017 08:58:08 +0200 Subject: [PATCH] [IMP] odoofication --- addons/account/models/account_move.py | 2 +- addons/base_import/__manifest__.py | 2 +- .../base_import_module/models/ir_ui_view.py | 2 +- addons/calendar/models/calendar.py | 2 +- addons/event/data/event_demo.xml | 8 ++--- addons/google_calendar/controllers/main.py | 10 +++--- addons/hr/data/hr_demo.xml | 34 +++++++++---------- addons/hr/models/res_partner.py | 2 +- addons/hr_holidays/models/hr_holidays.py | 2 +- addons/hw_escpos/__manifest__.py | 2 +- addons/hw_posbox_homepage/__manifest__.py | 4 +-- addons/hw_posbox_upgrade/__manifest__.py | 2 +- .../views/im_livechat_channel_templates.xml | 2 +- addons/l10n_do/models/chart_template.py | 2 +- addons/l10n_mx/__manifest__.py | 2 +- addons/mail/models/mail_alias.py | 6 ++-- addons/mail/models/mail_thread.py | 2 +- addons/mail/models/update.py | 2 +- .../mail/static/scripts/openerp_mailgate.py | 2 +- .../data/website_quotation_demo.xml | 4 +-- 20 files changed, 47 insertions(+), 47 deletions(-) diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 827d9de7073..e5d92ca3a5c 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -1133,7 +1133,7 @@ class AccountMoveLine(models.Model): # Create tax lines tax_lines_vals = [] if context.get('apply_taxes') and vals.get('tax_ids'): - # Get ids from triplets : https://www.odoo.com/documentation/master/reference/orm.html#openerp.models.Model.write + # Get ids from triplets : https://www.odoo.com/documentation/10.0/reference/orm.html#odoo.models.Model.write tax_ids = [tax['id'] for tax in self.resolve_2many_commands('tax_ids', vals['tax_ids']) if tax.get('id')] # Since create() receives ids instead of recordset, let's just use the old-api bridge taxes = self.env['account.tax'].browse(tax_ids) diff --git a/addons/base_import/__manifest__.py b/addons/base_import/__manifest__.py index 0a02a7228f2..c039766bba8 100644 --- a/addons/base_import/__manifest__.py +++ b/addons/base_import/__manifest__.py @@ -4,7 +4,7 @@ New extensible file import for Odoo ====================================== -Re-implement openerp's file import system: +Re-implement Odoo's file import system: * Server side, the previous system forces most of the logic into the client which duplicates the effort (between clients), makes the diff --git a/addons/base_import_module/models/ir_ui_view.py b/addons/base_import_module/models/ir_ui_view.py index af0b13bdfd1..871efe42c96 100644 --- a/addons/base_import_module/models/ir_ui_view.py +++ b/addons/base_import_module/models/ir_ui_view.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from operator import itemgetter -from openerp import api, models +from odoo import api, models class IrUiView(models.Model): _inherit = 'ir.ui.view' diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py index c543f5ea830..8dfad93cfa2 100644 --- a/addons/calendar/models/calendar.py +++ b/addons/calendar/models/calendar.py @@ -1176,7 +1176,7 @@ class Meeting(models.Model): data['month_by'] = 'date' data['rrule_type'] = 'monthly' - #repeat yearly but for openerp it's monthly, take same information as monthly but interval is 12 times + #repeat yearly but for odoo it's monthly, take same information as monthly but interval is 12 times if rule._bymonth: data['interval'] = data['interval'] * 12 diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml index 88c0d05b244..6269793bb25 100644 --- a/addons/event/data/event_demo.xml +++ b/addons/event/data/event_demo.xml @@ -140,7 +140,7 @@

 

Where to find us:

Chamber Works 60, Rosewood Court Detroit, MI 48212 (United States)

-

For any additional information, please contact us at events@openerp.com.

+

For any additional information, please contact us at events@odoo.com.

 

Best regards,

Luigi Roni, Senior Event Manager

@@ -186,7 +186,7 @@
  • Participants preferably have a functional knowledge of our software (see Functional Training).

    •  

    -

    For more information on the program, please explore http://www.openerp.com/services/technical-training.

    +

    For more information on the program, please explore https://www.odoo.com/services/technical-training.

    If you have a question concerning the content of the training, please contact events@yourcompany.com.

     

    Where to find us:

    @@ -197,7 +197,7 @@

    The organization of the training session has related costs. Due to these costs, cancellations made less than 2 weeks (14 calendar days) prior to the start of the training session is a subject to a fee. This fee can be up to a maximum of 1000€ per cancellation request.

    We strongly recommend to book your flight tickets and/or hotel reservations 2 weeks prior to the training. If the training is cancelled 2 weeks in advance, you'll be notified by email.

     
    -

    For any additional information, please contact us at events@openerp.com.

    +

    For any additional information, please contact us at events@odoo.com.

     

    Best regards,

    Luigi Roni, Senior Event Manager

    @@ -237,7 +237,7 @@ Camptocamp - openerp@camptocamp.com + odoo@camptocamp.com +41 21 619 10 04 diff --git a/addons/google_calendar/controllers/main.py b/addons/google_calendar/controllers/main.py index dda2104e9bd..97ee957ef5e 100644 --- a/addons/google_calendar/controllers/main.py +++ b/addons/google_calendar/controllers/main.py @@ -9,9 +9,9 @@ class GoogleCalendarController(http.Controller): @http.route('/google_calendar/sync_data', type='json', auth='user') def sync_data(self, arch, fields, model, **kw): - """ This route/function is called when we want to synchronize openERP calendar with Google Calendar + """ This route/function is called when we want to synchronize Odoo calendar with Google Calendar Function return a dictionary with the status : need_config_from_admin, need_auth, need_refresh, success if not calendar_event - The dictionary may contains an url, to allow OpenERP Client to redirect user on this URL for authorization for example + The dictionary may contains an url, to allow Odoo Client to redirect user on this URL for authorization for example """ if model == 'calendar.event': GoogleService = request.env['google.service'] @@ -31,7 +31,7 @@ class GoogleCalendarController(http.Controller): "action": action_id } - # Checking that user have already accepted OpenERP to access his calendar ! + # Checking that user have already accepted Odoo to access his calendar ! if GoogleCal.need_authorize(): url = GoogleCal.with_context(context).authorize_google_uri(from_url=kw.get('fromurl')) return { @@ -46,11 +46,11 @@ class GoogleCalendarController(http.Controller): @http.route('/google_calendar/remove_references', type='json', auth='user') def remove_references(self, model, **kw): - """ This route/function is called when we want to remove all the references between one calendar OpenERP and one Google Calendar """ + """ This route/function is called when we want to remove all the references between one calendar Odoo and one Google Calendar """ status = "NOP" if model == 'calendar.event': GoogleCal = request.env['google.calendar'] - # Checking that user have already accepted OpenERP to access his calendar ! + # Checking that user have already accepted Odoo to access his calendar ! context = kw.get('local_context', {}) if GoogleCal.with_context(context).remove_references(): status = "OK" diff --git a/addons/hr/data/hr_demo.xml b/addons/hr/data/hr_demo.xml index 2f9c607d35f..68c60c81f0b 100644 --- a/addons/hr/data/hr_demo.xml +++ b/addons/hr/data/hr_demo.xml @@ -139,7 +139,7 @@ If you have development competencies, we can propose you specific traineeshipsPieter Parker Building 1, Second Floor +3281813700 - pieter@openerp.com + pieter@odoo.com @@ -153,7 +153,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - antoine@openerp.com + antoine@odoo.com @@ -166,7 +166,7 @@ If you have development competencies, we can propose you specific traineeshipsBuilding 1, Second Floor +3281813700 +32486571630 - john@openerp.com + john@odoo.com @@ -178,7 +178,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - michael@openerp.com + michael@odoo.com @@ -190,7 +190,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - liam@openerp.com + liam@odoo.com @@ -202,7 +202,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - david@openerp.com + david@odoo.com @@ -215,7 +215,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - gilles@openerp.com + gilles@odoo.com @@ -227,7 +227,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - jack@openerp.com + jack@odoo.com @@ -239,7 +239,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - martin@openerp.com + martin@odoo.com @@ -251,7 +251,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - jimmy@openerp.com + jimmy@odoo.com @@ -263,7 +263,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - famke@openerp.com + famke@odoo.com @@ -275,7 +275,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - ashley@openerp.com + ashley@odoo.com @@ -294,7 +294,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - jve@openerp.com + jve@odoo.com @@ -304,7 +304,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - jep@openerp.com + jep@odoo.com @@ -314,7 +314,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - jod@openerp.com + jod@odoo.com @@ -324,7 +324,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - jog@openerp.com + jog@odoo.com @@ -343,7 +343,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - lur@openerp.com + lur@odoo.com diff --git a/addons/hr/models/res_partner.py b/addons/hr/models/res_partner.py index f0b24ba42b5..6b77f3f3371 100644 --- a/addons/hr/models/res_partner.py +++ b/addons/hr/models/res_partner.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import api, models -from openerp.exceptions import AccessError +from odoo.exceptions import AccessError class Partner(models.Model): diff --git a/addons/hr_holidays/models/hr_holidays.py b/addons/hr_holidays/models/hr_holidays.py index d7d0d5642e6..a5a6260f79f 100644 --- a/addons/hr_holidays/models/hr_holidays.py +++ b/addons/hr_holidays/models/hr_holidays.py @@ -9,7 +9,7 @@ from datetime import timedelta from odoo import api, fields, models from odoo.exceptions import UserError, AccessError, ValidationError -from openerp.tools import float_compare +from odoo.tools import float_compare from odoo.tools.translate import _ _logger = logging.getLogger(__name__) diff --git a/addons/hw_escpos/__manifest__.py b/addons/hw_escpos/__manifest__.py index 5b4cf0a941c..18f8f49d4f5 100644 --- a/addons/hw_escpos/__manifest__.py +++ b/addons/hw_escpos/__manifest__.py @@ -11,7 +11,7 @@ ESC/POS Hardware Driver ======================= -This module allows openerp to print with ESC/POS compatible printers and +This module allows Odoo to print with ESC/POS compatible printers and to open ESC/POS controlled cashdrawers in the point of sale and other modules that would need such functionality. diff --git a/addons/hw_posbox_homepage/__manifest__.py b/addons/hw_posbox_homepage/__manifest__.py index a8af5d9ad27..874e839c4b6 100644 --- a/addons/hw_posbox_homepage/__manifest__.py +++ b/addons/hw_posbox_homepage/__manifest__.py @@ -11,12 +11,12 @@ PosBox Homepage =============== -This module overrides openerp web interface to display a simple +This module overrides Odoo web interface to display a simple Homepage that explains what's the posbox and show the status, and where to find documentation. If you activate this module, you won't be able to access the -regular openerp interface anymore. +regular Odoo interface anymore. """, 'depends': ['hw_proxy'], diff --git a/addons/hw_posbox_upgrade/__manifest__.py b/addons/hw_posbox_upgrade/__manifest__.py index 3614aa1a443..14f8d1647c9 100644 --- a/addons/hw_posbox_upgrade/__manifest__.py +++ b/addons/hw_posbox_upgrade/__manifest__.py @@ -13,7 +13,7 @@ PosBox Software Upgrader This module allows to remotely upgrade the PosBox software to a new version. This module is specific to the PosBox setup and environment -and should not be installed on regular openerp servers. +and should not be installed on regular Odoo servers. """, 'depends': ['hw_proxy'], diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml index 0e5b476942a..27531c3d17e 100644 --- a/addons/im_livechat/views/im_livechat_channel_templates.xml +++ b/addons/im_livechat/views/im_livechat_channel_templates.xml @@ -101,7 +101,7 @@