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

[IMP] odoofication

Browse Source
This commit is contained in:
Martin Trigaux
2017-03-30 08:59:13 +02:00
parent bc747f8c4a
commit 2382520c34
20 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_move.py
+1 -1
View File
@@ -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)
addons/base_import/__manifest__.py
+1 -1
View File
@@ -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
addons/base_import_module/models/ir_ui_view.py
+1 -1
View File
@@ -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'
addons/calendar/models/calendar.py
+1 -1
View File
@@ -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
addons/event/data/event_demo.xml
+4 -4
View File
@@ -140,7 +140,7 @@
<p>&nbsp;</p>
<p><strong>Where to find us:</strong></p>
<p>Chamber Works 60, Rosewood Court Detroit, MI 48212 (United States)</p>
<p>For any additional information, please contact us at <a href="mailto:events@openerp.com">events@openerp.com</a>.</p>
<p>For any additional information, please contact us at <a href="mailto:events@odoo.com">events@odoo.com</a>.</p>
<p>&nbsp;</p>
<p>Best regards,</p>
<p>Luigi Roni, Senior Event Manager</p>
@@ -186,7 +186,7 @@
<li>Participants preferably have a functional knowledge of our software (see Functional Training).</li>
</ul>
<p>&nbsp;</p>
<p>For more information on the program, please explore <a target="_blank" href="http://www.openerp.com/services/technical-training">http://www.openerp.com/services/technical-training</a>.</p>
<p>For more information on the program, please explore <a target="_blank" href="https://www.odoo.com/services/technical-training">https://www.odoo.com/services/technical-training</a>.</p>
<p>If you have a question<strong>&nbsp;concerning the content of the training</strong>, please contact <a href="mailto:events@yourcompany.com">events@yourcompany.com</a>.</p>
<p>&nbsp;</p>
<p><strong>Where to find us:</strong></p>
@@ -197,7 +197,7 @@
<p>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.</p>
<p>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.</p>
<div>&nbsp;</div>
<p>For any additional information, please contact us at <a href="mailto:events@openerp.com">events@openerp.com</a>.</p>
<p>For any additional information, please contact us at <a href="mailto:events@odoo.com">events@odoo.com</a>.</p>
<p>&nbsp;</p>
<p>Best regards,</p>
<p>Luigi Roni, Senior Event Manager</p>
@@ -237,7 +237,7 @@
<record id="reg_2_0" model="event.registration">
<field name="name">Camptocamp</field>
<field name="email">openerp@camptocamp.com</field>
<field name="email">odoo@camptocamp.com</field>
<field name="phone">+41 21 619 10 04 </field>
<field name="event_id" ref="event_2"/>
<field name="partner_id" ref="base.res_partner_12"/>
addons/google_calendar/controllers/main.py
+5 -5
View File
@@ -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"
addons/hr/data/hr_demo.xml
+17 -17
View File
@@ -139,7 +139,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="name">Pieter Parker</field>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">pieter@openerp.com</field>
<field name="work_email">pieter@odoo.com</field>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/>
<field name="job_id" ref="hr.job_ceo"/>
<field name="department_id" ref="dep_management"/>
@@ -153,7 +153,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">antoine@openerp.com</field>
<field name="work_email">antoine@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_al-image.jpg"/>
</record>
@@ -166,7 +166,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="mobile_phone">+32486571630</field>
<field name="work_email">john@openerp.com</field>
<field name="work_email">john@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_mit-image.png"/>
</record>
@@ -178,7 +178,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">michael@openerp.com</field>
<field name="work_email">michael@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_niv-image.jpg"/>
</record>
@@ -190,7 +190,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">liam@openerp.com</field>
<field name="work_email">liam@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_stw-image.jpg"/>
</record>
@@ -202,7 +202,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">david@openerp.com</field>
<field name="work_email">david@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_chs-image.jpg"/>
</record>
@@ -215,7 +215,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">gilles@openerp.com</field>
<field name="work_email">gilles@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_qdp-image.png"/>
</record>
@@ -227,7 +227,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">jack@openerp.com</field>
<field name="work_email">jack@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_fme-image.jpg"/>
</record>
@@ -239,7 +239,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">martin@openerp.com</field>
<field name="work_email">martin@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_fpi-image.jpg"/>
</record>
@@ -251,7 +251,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">jimmy@openerp.com</field>
<field name="work_email">jimmy@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_jth-image.png"/>
</record>
@@ -263,7 +263,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_2')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">famke@openerp.com</field>
<field name="work_email">famke@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_ngh-image.jpg"/>
</record>
@@ -275,7 +275,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
<field name="work_email">ashley@openerp.com</field>
<field name="work_email">ashley@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_vad-image.jpg"/>
</record>
@@ -294,7 +294,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="job_id" ref="hr.job_developer"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3282823500</field>
<field name="work_email">jve@openerp.com</field>
<field name="work_email">jve@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_jve-image.jpg"/>
</record>
@@ -304,7 +304,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="job_id" ref="hr.job_consultant"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3282823500</field>
<field name="work_email">jep@openerp.com</field>
<field name="work_email">jep@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_jep-image.jpg"/>
</record>
@@ -314,7 +314,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="job_id" ref="hr.job_marketing"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3282823500</field>
<field name="work_email">jod@openerp.com</field>
<field name="work_email">jod@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_jod-image.png"/>
</record>
@@ -324,7 +324,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="job_id" ref="hr.job_developer"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3282823500</field>
<field name="work_email">jog@openerp.com</field>
<field name="work_email">jog@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_jog-image.jpg"/>
</record>
@@ -343,7 +343,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="job_id" ref="hr.job_marketing"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3282823500</field>
<field name="work_email">lur@openerp.com</field>
<field name="work_email">lur@odoo.com</field>
<field name="image" type="base64" file="hr/static/img/employee_lur-image.png"/>
</record>
addons/hr/models/res_partner.py
+1 -1
View File
@@ -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):
addons/hr_holidays/models/hr_holidays.py
+1 -1
View File
@@ -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__)
addons/hw_escpos/__manifest__.py
+1 -1
View File
@@ -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.
addons/hw_posbox_homepage/__manifest__.py
+2 -2
View File
@@ -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'],
addons/hw_posbox_upgrade/__manifest__.py
+1 -1
View File
@@ -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'],
addons/im_livechat/views/im_livechat_channel_templates.xml
+1 -1
View File
@@ -101,7 +101,7 @@
<template id="external_lib" name="Livechat : External Librairies of the Livechat, required to make it work">
<!-- Momentjs -->
<script type="text/javascript" src="/web/static/lib/moment/moment.js"></script>
<!-- OpenERP minimal lib -->
<!-- Odoo minimal lib -->
<script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
<!-- jQuery -->
addons/l10n_do/models/chart_template.py
+1 -1
View File
@@ -1,7 +1,7 @@
# coding: utf-8
# Copyright 2016 iterativo (https://www.iterativo.do) <info@iterativo.do>
from openerp import models, api, _
from odoo import models, api, _
class WizardMultiChartsAccounts(models.TransientModel):
addons/l10n_mx/__manifest__.py
+1 -1
View File
@@ -16,7 +16,7 @@ Minimal accounting configuration for Mexico.
============================================
This Chart of account is a minimal proposal to be able to use OoB the
accounting feature of Openerp.
accounting feature of Odoo.
This doesn't pretend be all the localization for MX it is just the minimal
data required to start from 0 in mexican localization.
addons/mail/models/mail_alias.py
+3 -3
View File
@@ -24,8 +24,8 @@ def remove_accents(input_str):
class Alias(models.Model):
"""A Mail Alias is a mapping of an email address with a given OpenERP Document
model. It is used by OpenERP's mail gateway when processing incoming emails
"""A Mail Alias is a mapping of an email address with a given Odoo Document
model. It is used by Odoo's mail gateway when processing incoming emails
sent to the system. If the recipient address (To) of the message matches
a Mail Alias, the message will be either processed following the rules
of that alias. If the message is a reply it will be attached to the
@@ -34,7 +34,7 @@ class Alias(models.Model):
This is meant to be used in combination with a catch-all email configuration
on the company's mail server, so that as soon as a new mail.alias is
created, it becomes immediately usable and OpenERP will accept email for it.
created, it becomes immediately usable and Odoo will accept email for it.
"""
_name = 'mail.alias'
_description = "Email Aliases"
addons/mail/models/mail_thread.py
+1 -1
View File
@@ -38,7 +38,7 @@ class MailThread(models.AbstractModel):
communication history. ``mail.thread`` also manages followers of
inheriting classes. All features and expected behavior are managed
by mail.thread. Widgets has been designed for the 7.0 and following
versions of OpenERP.
versions of Odoo.
Inheriting classes are not required to implement any method, as the
default implementation will work for any model. However it is common
addons/mail/models/update.py
+1 -1
View File
@@ -85,7 +85,7 @@ class PublisherWarrantyContract(AbstractModel):
@api.multi
def update_notification(self, cron_mode=True):
"""
Send a message to OpenERP's publisher warranty server to check the
Send a message to Odoo's publisher warranty server to check the
validity of the contracts, get notifications, etc...
@param cron_mode: If true, catch all exceptions (appropriate for usage in a cron).
addons/mail/static/scripts/openerp_mailgate.py
+1 -1
View File
@@ -136,7 +136,7 @@ def configure_parser():
def main():
"""
Receive the email via the stdin and send it to the OpenERP Server
Receive the email via the stdin and send it to the Odoo Server
"""
parser = configure_parser()
addons/website_quote/data/website_quotation_demo.xml
+2 -2
View File
@@ -208,7 +208,7 @@
</section>
<section>
<h2>Benefit from the OpenERP branding</h2>
<h2>Benefit from the Odoo branding</h2>
<p>
Every year, we redirect more than 100,000 customer
requests to our official partners. These are prospects
@@ -515,7 +515,7 @@
<li>Participants preferably have a functional knowledge of our software (see Functional Training).</li>
</ul><p></p>
<p>To get more information, visit the <a target="_blank" href="http://openerp.com/">Odoo Official Website</a>.</p>
<p>To get more information, visit the <a target="_blank" href="https://www.odoo.com/">Odoo Official Website</a>.</p>
</div>
</div>
</div>