odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] OpenERP --> Odoo in various UI texts 

Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
This commit is contained in:
rlu-odoo 2014-07-09 17:09:38 +05:30 committed by Richard Mathot
parent 1f5d135e44
commit 8b67a7202d
175 changed files with 602 additions and 605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account.py
View File

@ -669,7 +669,7 @@ class account_account(osv.osv):
# For legal reason (forbiden to modify journal entries which belongs to a closed fy or period), Forbid to modify
# the code of an account if journal entries have been already posted on this account. This cannot be simply
# 'configurable' since it can lead to a lack of confidence in OpenERP and this is what we want to change.
# 'configurable' since it can lead to a lack of confidence in Odoo and this is what we want to change.
def _check_allow_code_change(self, cr, uid, ids, context=None):
line_obj = self.pool.get('account.move.line')
for account in self.browse(cr, uid, ids, context=context):
@ -2488,7 +2488,7 @@ class account_account_template(osv.osv):
('other','Regular'),
('closed','Closed'),
], 'Internal Type', required=True,help="This type is used to differentiate types with "\
"special effects in OpenERP: view can not have entries, consolidation are accounts that "\
"special effects in Odoo: view can not have entries, consolidation are accounts that "\
"can have children accounts for multi-company consolidations, payable/receivable are for "\
"partners accounts (for debit/credit computations), closed for depreciated accounts."),
'user_type': fields.many2one('account.account.type', 'Account Type', required=True,

2
addons/account/account_bank_view.xml
View File

@ -47,7 +47,7 @@
Configure your company's bank account and select those that must
appear on the report footer.
</p><p>
If you use the accounting application of OpenERP, journals and
If you use the accounting application of Odoo, journals and
accounts will be created automatically based on these data.
</p>
</field>

4
addons/account/account_invoice_view.xml
View File

@ -523,7 +523,7 @@
<p class="oe_view_nocontent_create">
Click to create a customer invoice.
</p><p>
OpenERP's electronic invoicing allows to ease and fasten the
Odoo's electronic invoicing allows to ease and fasten the
collection of customer payments. Your customer receives the
invoice by email and he can pay online and/or import it
in his own system.
@ -564,7 +564,7 @@
Click to record a new supplier invoice.
</p><p>
You can control the invoice from your supplier according to
what you purchased or received. OpenERP can also generate
what you purchased or received. Odoo can also generate
draft invoices automatically from purchase orders or receipts.
</p>
</field>

10
addons/account/account_view.xml
View File

@ -650,7 +650,7 @@
occurring over a given period of time on a bank account. You
should receive this periodicaly from your bank.
</p><p>
OpenERP allows you to reconcile a statement line directly with
Odoo allows you to reconcile a statement line directly with
the related sale or puchase invoices.
</p>
</field>
@ -920,7 +920,7 @@
Click to define a new tax code.
</p><p>
Depending on the country, a tax code is usually a cell to fill
in your legal tax statement. OpenERP allows you to define the
in your legal tax statement. Odoo allows you to define the
tax structure and each tax computation will be registered in
one or several tax code.
</p>
@ -1269,8 +1269,8 @@
Select the period and the journal you want to fill.
</p><p>
This view can be used by accountants in order to quickly record
entries in OpenERP. If you want to record a supplier invoice,
start by recording the line of the expense account. OpenERP
entries in Odoo. If you want to record a supplier invoice,
start by recording the line of the expense account. Odoo
will propose to you automatically the Tax related to this
account and the counterpart "Account Payable".
</p>
@ -1506,7 +1506,7 @@
A journal entry consists of several journal items, each of
which is either a debit or a credit transaction.
</p><p>
OpenERP automatically creates one journal entry per accounting
Odoo automatically creates one journal entry per accounting
document: invoice, refund, supplier payment, bank statements,
etc. So, you should record journal entries manually only/mainly
for miscellaneous operations.

2
addons/account/demo/account_minimal.xml
View File

@ -381,7 +381,7 @@
<!--
Usually, cash payment methods requires a control at opening and closing.
Bot for demo data, it's better to avoid the control step so that people
that test OpenERP arrive directly in the touchscreen UI.
that test Odoo arrive directly in the touchscreen UI.
-->
<field name="cash_control" eval="False"/>
<field name="sequence_id" ref="sequence_cash_journal"/>

2
addons/account/project/project.py
View File

@ -28,7 +28,7 @@ class account_analytic_journal(osv.osv):
'name': fields.char('Journal Name', required=True),
'code': fields.char('Journal Code', size=8),
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."),
'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, Odoo will look for a matching journal of the same type."),
'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
'company_id': fields.many2one('res.company', 'Company', required=True),
}

2
addons/account/project/project_view.xml
View File

@ -114,7 +114,7 @@
term of costs/revenues reporting.
</p><p>
They are usually structured by contracts, projects, products or
departements. Most of the OpenERP operations (invoices,
departements. Most of the Odoo operations (invoices,
timesheets, expenses, etc) generate analytic entries on the
related account.
</p>

2
addons/account/report/account_entries_report.py
View File

@ -67,7 +67,7 @@ class account_entries_report(osv.osv):
('other', 'Regular'),
('closed', 'Closed'),
], 'Internal Type', readonly=True, help="This type is used to differentiate types with "\
"special effects in OpenERP: view can not have entries, consolidation are accounts that "\
"special effects in Odoo: view can not have entries, consolidation are accounts that "\
"can have children accounts for multi-company consolidations, payable/receivable are for "\
"partners accounts (for debit/credit computations), closed for depreciated accounts."),
'company_id': fields.many2one('res.company', 'Company', readonly=True),

2
addons/account/res_config.py
View File

@ -42,7 +42,7 @@ class account_config_settings(osv.osv_memory):
'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
string='Default company currency', help="Main currency of the company."),
'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the OpenERP portal."),
string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the Odoo portal."),
'company_footer': fields.related('company_id', 'rml_footer', type='text', readonly=True,
string='Bank accounts footer preview', help="Bank accounts as printed in the footer of each printed document"),

2
addons/account/res_config_view.xml
View File

@ -243,7 +243,7 @@
</div>
<div name='payment_acquirer'>
<label for="paypal_account"/>
<field name="paypal_account" placeholder="e.g. sales@openerp.com" class="oe_inline"/>
<field name="paypal_account" placeholder="e.g. sales@odoo.com" class="oe_inline"/>
</div>
</div>
</group>

12
addons/account/static/description/index.html
View File

@ -12,7 +12,7 @@
</div>
<div class="oe_span6">
<p class='oe_mt32'>
By far the most beautiful and full featured accounting software. OpenERP Accounting allows a better way to collaborate with your accountants, your customers and control your suppliers.</p>
By far the most beautiful and full featured accounting software. Odoo Accounting allows a better way to collaborate with your accountants, your customers and control your suppliers.</p>
<p>
Activate features on demand, from integrated analytic accounting to budget, assets and multiple companies consolidation.
</p>
@ -29,7 +29,7 @@ Activate features on demand, from integrated analytic accounting to budget, asse
<div class="oe_span6">
<p class='oe_mt32'>
Record transactions in a few clicks and easily manage all financial activities
in one place. OpenERP's user interface is designed with productivity in mind.
in one place. Odoo's user interface is designed with productivity in mind.
</p>
</div>
<div class="oe_span6">
@ -135,7 +135,7 @@ Integrate your analytic accounting operations with timesheets, projects, invoice
</div>
<div class="oe_span6">
<p class='oe_mt32'>
Manage your assets, track expenses, control budgets, multi-level analytic accounting; OpenERP has all the features you need to sustain all your business activities.
Manage your assets, track expenses, control budgets, multi-level analytic accounting; Odoo has all the features you need to sustain all your business activities.
</p>
</div>
</div>
@ -148,7 +148,7 @@ Manage your assets, track expenses, control budgets, multi-level analytic accoun
<h3 class="oe_slogan">Used by very small to very large organizations</h3>
<div class="oe_span6">
<p class='oe_mt32'>
OpenERP supports multiple currencies, multiple users with different access rights, multiple companies with real time consolidation and unlimited analytic plans.
Odoo supports multiple currencies, multiple users with different access rights, multiple companies with real time consolidation and unlimited analytic plans.
</p>
</div>
<div class="oe_span6">
@ -166,7 +166,7 @@ OpenERP supports multiple currencies, multiple users with different access right
<div class="oe_span6">
<div class="oe_quote">
<q>
OpenERP Accounting is a great way to record all business transactions
Odoo Accounting is a great way to record all business transactions
right when they happen. Awesome and cost-effective!
</q>
<cite class="oe_cite oe_clearfix oe_ml64">
@ -178,7 +178,7 @@ OpenERP supports multiple currencies, multiple users with different access right
<div class="oe_span6">
<div class="oe_quote">
<q>
We have found accounting module of OpenERP to be user
We have found accounting module of Odoo to be user
friendly and highly customizable. It proved to be an accounting gem.
</q>
<cite class="oe_cite oe_clearfix">

2
addons/account/wizard/account_automatic_reconcile_view.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml">
<form string="Reconciliation">
<separator string="Reconciliation"/>
<label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
<label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, Odoo makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
<field name="account_ids" domain="[('reconcile','=',1)]"/>
<group col="4">
<field name="power"/>

2
addons/account/wizard/account_report_aged_partner_balance_view.xml
View File

@ -9,7 +9,7 @@
<field name="arch" type="xml">
<form string="Report Options">
<separator string="Aged Partner Balance"/>
<label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
<label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, Odoo asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). Odoo then calculates a table of credit balance by period. So if you request an interval of 30 days Odoo generates an analysis of creditors for the past month, past two months, and so on. "/>
<group col="4">
<field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
<field name="fiscalyear_id" invisible="1"/>

2
addons/account/wizard/account_vat_view.xml
View File

@ -7,7 +7,7 @@
<field name="model">account.vat.declaration</field>
<field name="arch" type="xml">
<form string="Taxes Report">
<label colspan="4" string="This menu prints a tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
<label colspan="4" string="This menu prints a tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by Odoo from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
<group string="Taxes Report" col="4">
<field name="chart_tax_id" widget='selection'/>
<field name="fiscalyear_id"/>

4
addons/account_accountant/account_accountant_data.xml
View File

@ -28,8 +28,8 @@
<field name="type">notification</field>
<field name="subtype_id" ref="mail.mt_comment"/>
<field name="subject">Accounting and Finance application installed!</field>
<field name="body"><![CDATA[<p>With OpenERP's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.</p>
<p>The accounting features are fully integrated with other OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</p>]]></field>
<field name="body"><![CDATA[<p>With Odoo's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.</p>
<p>The accounting features are fully integrated with other Odoo applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</p>]]></field>
</record>
</data>
</openerp>

2
addons/account_analytic_analysis/account_analytic_analysis_cron.xml
View File

@ -67,7 +67,7 @@ Hello ${object.name},
<pre>
--
OpenERP Automatic Email
Odoo Automatic Email
</pre>
]]></field>

6
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -131,7 +131,7 @@
</table>
<group name='invoice_on_timesheets'>
<p name='invoice_on_timesheets_label' class="oe_grey oe_edit_only" colspan="2" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
When reinvoicing costs, OpenERP uses the
When reinvoicing costs, Odoo uses the
pricelist of the contract which uses the price
defined on the product related (e.g timesheet
products are defined on each employee).
@ -264,7 +264,7 @@
Click to create a new contract.
</p><p>
Use contracts to follow tasks, issues, timesheets or invoicing based on
work done, expenses and/or sales orders. OpenERP will automatically manage
work done, expenses and/or sales orders. Odoo will automatically manage
the alerts for the renewal of the contracts to the right salesperson.
</p>
</field>
@ -310,7 +310,7 @@
end date is passed or the working effort is higher than the
maximum authorized one.
</p><p>
OpenERP automatically sets contracts to be renewed in a pending
Odoo automatically sets contracts to be renewed in a pending
state. After the negociation, the salesman should close or renew
pending contracts.
</p>

2
addons/account_check_writing/account_voucher_view.xml
View File

@ -39,7 +39,7 @@
</p><p>
The check payment form allows you to track the payment you do
to your suppliers using checks. When you select a supplier, the
payment method and an amount for the payment, OpenERP will
payment method and an amount for the payment, Odoo will
propose to reconcile your payment with the open supplier
invoices or bills.
</p>

2
addons/account_sequence/account_sequence_installer.py
View File

@ -31,7 +31,7 @@ class account_sequence_installer(osv.osv_memory):
'suffix': fields.char('Suffix', size=64, help="Suffix value of the record for the sequence"),
'number_next': fields.integer('Next Number', required=True, help="Next number of this sequence"),
'number_increment': fields.integer('Increment Number', required=True, help="The next number of the sequence will be incremented by this number"),
'padding' : fields.integer('Number padding', required=True, help="OpenERP will automatically adds some '0' on the left of the 'Next Number' to get the required padding size."),
'padding' : fields.integer('Number padding', required=True, help="Odoo will automatically adds some '0' on the left of the 'Next Number' to get the required padding size."),
'company_id': fields.many2one('res.company', 'Company'),
}
_defaults = {

2
addons/account_voucher/account_voucher_data.xml
View File

@ -9,7 +9,7 @@
<field name="type">notification</field>
<field name="subtype_id" ref="mail.mt_comment"/>
<field name="subject">eInvoicing &amp; Payments application installed!</field>
<field name="body"><![CDATA[<p>OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.</p>
<field name="body"><![CDATA[<p>Odoo's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.</p>
<p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>]]></field>
</record>

4
addons/account_voucher/static/description/index.html
View File

@ -112,7 +112,7 @@ material. Define recurrencies to produce recurring invoice automatically.
<div class="oe_span6">
<div class="oe_quote">
<q>
OpenERP allowed us to automate sending 10.000 invoices per month.
Odoo allowed us to automate sending 10.000 invoices per month.
</q>
<cite class="oe_cite oe_clearfix">
<img class="oe_photo" src="bazile.png">
@ -124,7 +124,7 @@ material. Define recurrencies to produce recurring invoice automatically.
<div class="oe_span6">
<div class="oe_quote">
<q>
We have found invoicing module of OpenERP to be user
We have found invoicing module of Odoo to be user
friendly and highly customizable.
</q>
<cite class="oe_cite oe_clearfix">

4
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -270,7 +270,7 @@
<p class="oe_view_nocontent_create">
Click to create a new supplier payment.
</p><p>
OpenERP helps you easily track payments you make and the remaining balances you need to pay your suppliers.
Odoo helps you easily track payments you make and the remaining balances you need to pay your suppliers.
</p>
</field>
</record>
@ -554,7 +554,7 @@
Click to register a new payment.
</p><p>
Enter the customer and the payment method and then, either
create manually a payment record or OpenERP will propose to you
create manually a payment record or Odoo will propose to you
automatically the reconciliation of this payment with the open
invoices or sales receipts.
</p>

2
addons/analytic_user_function/analytic_user_function_view.xml
View File

@ -47,7 +47,7 @@
of the default values when invoicing the customer.
</p>
<p class="oe_grey oe_edit_only">
OpenERP will recursively search on parent accounts
Odoo will recursively search on parent accounts
to check if specific conditions are defined for a
specific user. This allows to set invoicing
conditions for a group of contracts.

2
addons/auth_ldap/users_ldap.py
View File

@ -190,7 +190,7 @@ class CompanyLDAP(osv.osv):
if res[1]:
user_id = res[0]
elif conf['create_user']:
_logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login)
_logger.debug("Creating new Odoo user \"%s\" from LDAP" % login)
user_obj = self.pool['res.users']
values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry)
if conf['user']:

2
addons/auth_oauth/controllers/main.py
View File

@ -173,7 +173,7 @@ class OAuthController(http.Controller):
@http.route('/auth_oauth/oea', type='http', auth='none')
def oea(self, **kw):
"""login user via OpenERP Account provider"""
"""login user via Odoo Account provider"""
dbname = kw.pop('db', None)
if not dbname:
dbname = db_monodb()

8
addons/auth_signup/auth_signup_data.xml
View File

@ -28,7 +28,7 @@
<field name="email_to">${object.email|safe}</field>
<field name="subject">Password reset</field>
<field name="body_html"><![CDATA[
<p>A password reset was requested for the OpenERP account linked to this email.</p>
<p>A password reset was requested for the Odoo account linked to this email.</p>
<p>You may change your password by following <a href="${object.signup_url}">this link</a>.</p>
@ -37,18 +37,18 @@
<!-- Email template for new users -->
<record id="set_password_email" model="email.template">
<field name="name">OpenERP Enterprise Connection</field>
<field name="name">Odoo Enterprise Connection</field>
<field name="model_id" ref="base.model_res_users"/>
<field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_to">${object.email|safe}</field>
<field name="subject"><![CDATA[${object.company_id.name} invitation to connect on OpenERP]]></field>
<field name="subject"><![CDATA[${object.company_id.name} invitation to connect on Odoo]]></field>
<field name="body_html">
<![CDATA[
<p>
${object.name},
</p>
<p>
You have been invited to connect to "${object.company_id.name}" in order to get access to your documents in OpenERP.
You have been invited to connect to "${object.company_id.name}" in order to get access to your documents in Odoo.
</p>
<p>
To accept the invitation, click on the following link:

4
addons/base_gengo/wizard/base_gengo_translations.py
View File

@ -119,7 +119,7 @@ class base_gengo_translations(osv.osv_memory):
"""
This method will be called by cron services to get translations from
Gengo. It will read translated terms and comments from Gengo and will
update respective ir.translation in openerp.
update respective ir.translation in Odoo.
"""
translation_pool = self.pool.get('ir.translation')
flag, gengo = self.gengo_authentication(cr, uid, context=context)
@ -245,7 +245,7 @@ class base_gengo_translations(osv.osv_memory):
A special key 'gengo_language' can be passed in the context in order to
request only translations of that language only. Its value is the language
ID in openerp.
ID in Odoo.
"""
if context is None:
context = {}

2
addons/base_import/models.py
View File

@ -48,7 +48,7 @@ class ir_import(orm.TransientModel):
.. attribute:: name (str)
The field's logical (OpenERP) name within the scope of
The field's logical (Odoo) name within the scope of
its parent.
.. attribute:: string (str)

30
addons/base_import/static/src/xml/import.xml
View File

@ -52,7 +52,7 @@
</div>
<div class="oe_import_with_file oe_padding">
<h2>Map your data to OpenERP</h2>
<h2>Map your data to Odoo</h2>
<div title="If the model uses openchatter, history tracking
will set up subscriptions and send notifications
during the import, but lead to a slower import.">
@ -67,7 +67,7 @@
<label for="oe_import_has_header">The first row of the
file contains the label of the column</label>
<p class="oe_import_noheaders">If the file contains
the column names, OpenERP can try auto-detecting the
the column names, Odoo can try auto-detecting the
field corresponding to the column. This makes imports
simpler especially when the file has many columns.</p>
@ -85,7 +85,7 @@
different records, you should use the unique
identifier from the original application and
map it to the <abbr title="External ID">ID</abbr>
column in OpenERP. When you
column in Odoo. When you
import an other record that links to the first
one, use <abbr title="XXX/External ID">XXX/ID</abbr>
to the original unique identifier.</p>
@ -108,7 +108,7 @@
settings, you can modify the File Format Options
(displayed under the Browse CSV file bar after you
select your file).</p> <p>Note that if your CSV file
has a tabulation as separator, OpenERP will not
has a tabulation as separator, Odoo will not
detect the separations. You will need to change the
file format options in your spreadsheet application.
See the following question.</p>
@ -141,15 +141,15 @@
<p>Some fields define a relationship with another
object. For example, the country of a contact is a
link to a record of the 'Country' object. When you
want to import such fields, OpenERP will have to
want to import such fields, Odoo will have to
recreate links between the different records.
To help you import such fields, OpenERP provides 3
To help you import such fields, Odoo provides 3
mechanisms. You must use one and only one mechanism
per field you want to import.</p> <p>For example, to
reference the country of a contact, OpenERP proposes
reference the country of a contact, Odoo proposes
you 3 different fields to import: <ul>
<li>Country: the name or code of the country</li>
<li>Country/Database ID: the unique OpenERP ID for a
<li>Country/Database ID: the unique Odoo ID for a
record, defined by the ID postgresql column</li>
<li>Country/External ID: the ID of this record
referenced in another application (or the .XML file
@ -254,10 +254,10 @@
have already been imported will be modified instead of
being created. This is very usefull as it allows you
to import several times the same CSV file while having
made some changes in between two imports. OpenERP will
made some changes in between two imports. Odoo will
take care of creating or modifying each record
depending if it's new or not.</p> <p> This feature
allows you to use the Import/Export tool of OpenERP to
allows you to use the Import/Export tool of Odoo to
modify a batch of records in your favorite spreadsheet
application.</p>
</dd>
@ -269,9 +269,9 @@
specific field?</a></dt>
<dd>
<p>If you do not set all fields in your CSV file,
OpenERP will assign the default value for every non
Odoo will assign the default value for every non
defined fields. But if you
set fields with empty values in your CSV file, OpenERP
set fields with empty values in your CSV file, Odoo
will set the EMPTY value in the field, instead of
assigning the default value.</p>
</dd>
@ -280,7 +280,7 @@
<dl>
<dt><a href="#" class="oe_import_toggle">
How to export/import different tables from an SQL
application to OpenERP?</a></dt>
application to Odoo?</a></dt>
<dd>
<p>If you need to import data from different tables,
you will have to recreate relations between records
@ -288,7 +288,7 @@
companies and persons, you will have to recreate the
link between each person and the company they work
for).</p> <p>To manage relations between tables,
you can use the "External ID" facilities of OpenERP.
you can use the "External ID" facilities of Odoo.
The "External ID" of a record is the unique identifier
of this record in another application. This "External
ID" must be unique accoss all the records of all
@ -337,7 +337,7 @@
and company_1 who shared the same ID 1 in the orignial
database).</p>
<p>The two files produced are ready to be imported in
OpenERP without any modifications. After having
Odoo without any modifications. After having
imported these two CSV files, you will have 4 contacts
and 3 companies. (the firsts two contacts are linked
to the first company). You must first import the

12
addons/base_report_designer/base_report_designer_installer.xml
View File

@ -2,16 +2,16 @@
<openerp>
<data>
<record id="view_report_designer_installer" model="ir.ui.view">
<field name="name">Form View: OpenERP Report Designer Installation</field>
<field name="name">Form View: Odoo Report Designer Installation</field>
<field name="model">base_report_designer.installer</field>
<field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">OpenERP Report Designer Configuration</attribute>
<attribute name="string">Odoo Report Designer Configuration</attribute>
</form>
<separator string="title" position="before">
<label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
<label string="This plug-in allows you to create/modify Odoo Reports into OpenOffice Writer."/>
</separator>
<xpath expr="//button[@string='Install Modules']" position="replace">
<button name="action_next" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
@ -30,13 +30,13 @@
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">OpenERP Report Designer</attribute>
<attribute name="string">Odoo Report Designer</attribute>
</separator>
</data>
</field>
</record>
<record id="action_report_designer_installer" model="ir.actions.act_window">
<field name="name">OpenERP Report Designer Installation</field>
<field name="name">Odoo Report Designer Installation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base_report_designer.installer</field>
<field name="view_id" ref="view_report_designer_installer"/>
@ -50,7 +50,7 @@
<field name="type">automatic</field>
</record>
<record id="action_report_designer_wizard" model="ir.actions.act_window">
<field name="name">OpenERP Report Designer</field>
<field name="name">Odoo Report Designer</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base_report_designer.installer</field>
<field name="view_id" ref="view_report_designer_installer"/>

2
addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
View File

@ -337,7 +337,7 @@ def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
if __name__ == "__main__":
import optparse
parser = optparse.OptionParser(
version="OpenERP Report v%s" % __version__,
version="Odoo Report v%s" % __version__,
usage = 'openerp_sxw2rml.py [options] file.sxw')
parser.add_option("-v", "--verbose", default=False, dest="verbose", help="enable basic debugging")
parser.add_option("-o", "--output", dest="output", default='.', help="directory of image output")

6
addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
View File

@ -32,7 +32,7 @@ class About(unohelper.Base, XJobExecutor):
self.ctx = ctx
self.module = "openerp_report"
self.version = "0.1"
self.win = DBModalDialog(60, 50, 175, 115, "About OpenERP Report Designer")
self.win = DBModalDialog(60, 50, 175, 115, "About Odoo Report Designer")
fdBigFont = createUnoStruct("com.sun.star.awt.FontDescriptor")
fdBigFont.Width = 20
@ -61,7 +61,7 @@ class About(unohelper.Base, XJobExecutor):
oLabelProdDesc.Model.Align = 1
oLabelProdDesc.Model.FontRelief = 1
oLabelProdDesc.Model.MultiLine = True
oLabelProdDesc.Text = "This package helps you to create or modify\nreports in OpenERP. Once connected to the\nserver, you can design your template of reports\nusing fields and expressions and browsing the\ncomplete structure of OpenERP object database."
oLabelProdDesc.Text = "This package helps you to create or modify\nreports in Odoo. Once connected to the\nserver, you can design your template of reports\nusing fields and expressions and browsing the\ncomplete structure of Odoo object database."
oLabelFooter = self.win.addFixedText("lblFooter", -1, -1, 173, 25)
oLabelFooter.Model.TextColor = 255
@ -75,7 +75,7 @@ class About(unohelper.Base, XJobExecutor):
oLabelFooter.Model.Align = 1
oLabelFooter.Model.FontRelief = 1
oLabelFooter.Model.MultiLine = True
sMessage = "OpenERP Report Designer v1.0 \nCopyright 2007-TODAY Tiny sprl \nThis product is free software, under the GNU Affero General Public License."
sMessage = "Odoo Report Designer v1.0 \nCopyright 2007-TODAY Tiny sprl \nThis product is free software, under the GNU Affero General Public License."
oLabelFooter.Text = sMessage
self.win.doModalDialog("",None)

4
addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
View File

@ -67,7 +67,7 @@ class ExportToRML( unohelper.Base, XJobExecutor ):
data = read_data_from_file( get_absolute_file_path( doc.getURL()[7:] ) )
file_type = doc.getURL()[7:].split(".")[-1]
if docinfo.getUserFieldValue(2) == "":
ErrorDialog("Please Save this file on server","Use Send To Server Option in OpenERP Report Menu","Error")
ErrorDialog("Please Save this file on server","Use Send To Server Option in Odoo Report Menu","Error")
exit(1)
filename = self.GetAFileName()
if not filename:
@ -89,7 +89,7 @@ class ExportToRML( unohelper.Base, XJobExecutor ):
sFilePickerArgs = Array(10)
oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
oFileDialog.initialize(sFilePickerArgs)
oFileDialog.appendFilter("OpenERP Report File Save To ....","*.rml")
oFileDialog.appendFilter("Odoo Report File Save To ....","*.rml")
f_path = "OpenERP-"+ os.path.basename( tempfile.mktemp("","") ) + ".rml"
initPath = tempfile.gettempdir()

2
addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
View File

@ -178,7 +178,7 @@ class RepeatIn( unohelper.Base, XJobExecutor ):
self.win.doModalDialog("lstFields",self.sValue)
else:
ErrorDialog("Please Select Appropriate module" ,"Create new report from: \nOpenERP -> Open a New Report")
ErrorDialog("Please Select Appropriate module" ,"Create new report from: \nOdoo -> Open a New Report")
self.win.endExecute()
def lstbox_selected(self, oItemEvent):

2
addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
View File

@ -90,7 +90,7 @@ class SendtoServer(unohelper.Base, XJobExecutor):
report_name = docinfo.getUserFieldValue(3) + "." + result
else:
ErrorDialog("Please select appropriate module...","Note: use OpenERP Report -> Open a new Report", "Module selection ERROR");
ErrorDialog("Please select appropriate module...","Note: use Odoo Report -> Open a new Report", "Module selection ERROR");
exit(1)
self.win = DBModalDialog(60, 50, 180, 100, "Send To Server")

4
addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
View File

@ -229,8 +229,8 @@ def GetAFileName():
oUcb=None
oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
oFileDialog.appendFilter("OpenERP Report File","*.sxw")
oFileDialog.setCurrentFilter("OpenERP Report File")
oFileDialog.appendFilter("Odoo Report File","*.sxw")
oFileDialog.setCurrentFilter("Odoo Report File")
if InitPath == "":
InitPath =tempfile.gettempdir()
#End If

2
addons/base_report_designer/wizard/base_report_design_view.xml
View File

@ -42,7 +42,7 @@
<newline/>
<field name="file_sxw_upload"/>
<newline/>
<label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
<label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the Odoo SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in Odoo using this wizard." align="0.0"/>
</group>
</form>
</field>

9
addons/base_setup/res_config_view.xml
View File

@ -160,10 +160,10 @@
<field name="module_crm" invisible="1"/>
<separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
<p name="config_email_integration" attrs="{'invisible': [('module_crm','=',False)]}">
OpenERP allows to automatically create leads (or others documents)
from incoming emails. You can automatically synchronize emails with OpenERP
Odoo allows to automatically create leads (or others documents)
from incoming emails. You can automatically synchronize emails with Odoo
using regular POP/IMAP accounts, using a direct email integration script for your
email server, or by manually pushing emails to OpenERP using specific
email server, or by manually pushing emails to Odoo using specific
plugins for your preferred email application.
</p>
</div>
@ -180,8 +180,5 @@
<field name="view_mode">form</field>
<field name="target">inline</field>
</record>
</data>
</openerp>

2
addons/calendar/calendar.py
View File

@ -162,7 +162,7 @@ class calendar_attendee(osv.Model):
elif interval == 'minutes':
delta = timedelta(minutes=duration)
trigger.value = delta
valarm.add('DESCRIPTION').value = alarm.name or 'OpenERP'
valarm.add('DESCRIPTION').value = alarm.name or 'Odoo'
for attendee in event_obj.attendee_ids:
attendee_add = event.add('attendee')
attendee_add.value = 'MAILTO:' + (attendee.email or '')

2
addons/contacts/contacts_view.xml
View File

@ -14,7 +14,7 @@
<p class="oe_view_nocontent_create">
Click to add a contact in your address book.
</p><p>
OpenERP helps you easily track all activities related to
Odoo helps you easily track all activities related to
a customer; discussions, history of business opportunities,
documents, etc.
</p>

2
addons/crm/base_partner_merge_view.xml
View File

@ -65,7 +65,7 @@
<p class="oe_grey" attrs="{'invisible': [('state', '!=', ('option'))]}">
Select the list of fields used to search for
duplicated records. If you select several fields,
OpenERP will propose you to merge only those having
Odoo will propose you to merge only those having
all these fields in common. (not one of the fields).
</p>
<group attrs="{'invisible': ['|', ('state', 'not in', ('selection', 'finished')), ('number_group', '=', 0)]}">

2
addons/crm/crm_demo.xml
View File

@ -3,7 +3,7 @@
<data noupdate="1">
<record model="crm.segmentation" id="crm_segmentation0">
<field name="name">OpenERP partners</field>
<field name="name">Odoo partners</field>
<field name="exclusif">True</field>
<field name="categ_id" ref="base.res_partner_category_2"/>
</record>

2
addons/crm/crm_lead_menu.xml
View File

@ -45,7 +45,7 @@
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
<field name="help" type="html">
<p>
OpenERP helps you keep track of your sales pipeline to follow
Odoo helps you keep track of your sales pipeline to follow
up potential sales and better forecast your future revenues.
</p><p>
You will be able to plan meetings and phone calls from

4
addons/crm/crm_phonecall_menu.xml
View File

@ -64,7 +64,7 @@
<p class="oe_view_nocontent_create">
Click to log the summary of a phone call.
</p><p>
OpenERP allows you to log inbound calls on the fly to track the
Odoo allows you to log inbound calls on the fly to track the
history of the communication with a customer or to inform another
team member.
</p><p>
@ -112,7 +112,7 @@
<p class="oe_view_nocontent_create">
Click to schedule a call
</p><p>
OpenERP allows you to easily define all the calls to be done
Odoo allows you to easily define all the calls to be done
by your sales team and follow up based on their summary.
</p><p>
You can use the import feature to massively import a new list of

2
addons/crm/sales_team_view.xml
View File

@ -50,7 +50,7 @@
</field>
<field name="help" type="html">
<p>
OpenERP helps you keep track of your sales pipeline to follow
Odoo helps you keep track of your sales pipeline to follow
up potential sales and better forecast your future revenues.
</p><p>
You will be able to plan meetings and phone calls from

6
addons/crm/static/description/index.html
View File

@ -101,7 +101,7 @@ Follow opportunities that interest you to get notified upon specific events: dea
<p class="oe_mt32">
Work with the email applications you already use every day. Whether your company uses Microsoft Outlook or Gmail, no one needs to change the way they work, so everyone stays productive.
</p><p>
Route, sort and filter incoming emails automatically. OpenERP CRM handles incoming emails and route them to the right opportunities or sales team. New leads are created on the fly and interested salespersons are notified automatically.
Route, sort and filter incoming emails automatically. Odoo CRM handles incoming emails and route them to the right opportunities or sales team. New leads are created on the fly and interested salespersons are notified automatically.
</p>
</div>
<div class="oe_span6">
@ -209,7 +209,7 @@ Customize your sales cycle by configuring sales stages that perfectly fit your s
<div class="oe_span6">
<div class="oe_quote">
<q>
With OpenERP CRM I keep all the information about leads and customers
With Odoo CRM I keep all the information about leads and customers
in a single place, and share it with my colleagues. It's great and effective.
</q>
<cite class="oe_cite oe_clearfix">
@ -222,7 +222,7 @@ Customize your sales cycle by configuring sales stages that perfectly fit your s
<div class="oe_span6">
<div class="oe_quote">
<q>
I am surprised by how good OpenERP CRM is. Awesome product.
I am surprised by how good Odoo CRM is. Awesome product.
</q>
<cite class="oe_cite oe_clearfix">
<img class="oe_photo" src="Stephan-Keller.jpg">

6
addons/crm_helpdesk/crm_helpdesk_demo.xml
View File

@ -9,8 +9,8 @@
<field name="state">draft</field>
<field name="section_id" ref="sales_team.section_sales_department"/>
<field name="date" eval="time.strftime('%Y-%m-04 11:10:36')"/>
<field name="name">Download old version of OpenERP? </field>
<field eval="&quot;Is there any link to download old versions of OpenERP?&quot;" name="description"/>
<field name="name">Download old version of Odoo? </field>
<field eval="&quot;Is there any link to download old versions of Odoo?&quot;" name="description"/>
</record>
<record id="crm_helpdesk_2" model="crm.helpdesk">
@ -46,7 +46,7 @@
<field name="state">draft</field>
<field name="date" eval="time.strftime('%Y-%m-12 11:15:17')"/>
<field name="name">How to create a new module</field>
<field eval="&quot;How can I create new module in OpenERP?&quot;" name="description"/>
<field eval="&quot;How can I create new module in Odoo?&quot;" name="description"/>
</record>
</data>
</openerp>

2
addons/crm_helpdesk/crm_helpdesk_menu.xml
View File

@ -23,7 +23,7 @@
</p><p>
Helpdesk and Support allow you to track your interventions.
</p><p>
Use the OpenERP Issues system to manage your support
Use the Odoo Issues system to manage your support
activities. Issues can be connected to the email gateway: new
emails may create issues, each of them automatically gets the
history of the conversation with the customer.

4
addons/crm_profiling/crm_profiling_demo.xml
View File

@ -17,7 +17,7 @@
<field name="name">Partner level?</field>
</record>
<record model="crm_profiling.question" id="partner_tiny">
<field name="name">OpenERP partner?</field>
<field name="name">Odoo partner?</field>
</record>
<!--
@ -95,7 +95,7 @@
-->
<record model="crm.segmentation" id="crm.crm_segmentation0">
<field name="name">OpenERP partners</field>
<field name="name">Odoo partners</field>
<field name="answer_yes" eval="[(6,0,[partner_tiny1])]" />
<field name="categ_id" ref="base.res_partner_category_2"/>
<field name="profiling_active">True</field>

2
addons/document/wizard/document_configuration_view.xml
View File

@ -12,7 +12,7 @@
</form>
<group string="res_config_contents" position="replace">
<separator string="Configure Directories"/>
<p>OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</p>
<p>Odoo's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</p>
<p>When executing this wizard, it will configure your directories automatically according to modules installed.</p>
</group>
</data>

10
addons/edi/models/edi.py
View File

@ -37,7 +37,7 @@ _logger = logging.getLogger(__name__)
EXTERNAL_ID_PATTERN = re.compile(r'^([^.:]+)(?::([^.]+))?\.(\S+)$')
EDI_VIEW_WEB_URL = '%s/edi/view?db=%s&token=%s'
EDI_PROTOCOL_VERSION = 1 # arbitrary ever-increasing version number
EDI_GENERATOR = 'OpenERP ' + release.major_version
EDI_GENERATOR = 'Odoo' + release.major_version
EDI_GENERATOR_VERSION = release.version_info
def split_external_id(ext_id):
@ -127,7 +127,7 @@ class edi(osv.AbstractModel):
assert module, 'a `__module` or `__import_module` attribute is required in each EDI document.'
if module != 'base' and not ir_module.search(cr, uid, [('name','=',module),('state','=','installed')]):
raise osv.except_osv(_('Missing Application.'),
_("The document you are trying to import requires the OpenERP `%s` application. "
_("The document you are trying to import requires the Odoo `%s` application. "
"You can install it by connecting as the administrator and opening the configuration assistant.")%(module,))
model = edi_document.get('__import_model') or edi_document.get('__model')
assert model, 'a `__model` or `__import_model` attribute is required in each EDI document.'
@ -185,9 +185,9 @@ class EDIMixin(object):
"""Generate/Retrieve unique external ID for ``record``.
Each EDI record and each relationship attribute in it is identified by a
unique external ID, which includes the database's UUID, as a way to
refer to any record within any OpenERP instance, without conflict.
refer to any record within any Odoo instance, without conflict.
For OpenERP records that have an existing "External ID" (i.e. an entry in
For Odoo records that have an existing "External ID" (i.e. an entry in
ir.model.data), the EDI unique identifier for this record will be made of
"%s:%s:%s" % (module, database UUID, ir.model.data ID). The database's
UUID MUST NOT contain a colon characters (this is guaranteed by the
@ -266,7 +266,7 @@ class EDIMixin(object):
'__id': 'module:db-uuid:model.id', # unique global external ID for the record
'__last_update': '2011-01-01 10:00:00', # last update date in UTC!
'__version': 1, # EDI spec version
'__generator' : 'OpenERP', # EDI generator
'__generator' : 'Odoo', # EDI generator
'__generator_version' : [6,1,0], # server version, to check compatibility.
'__attachments_':
}

4
addons/event/event_demo.xml
View File

@ -53,8 +53,8 @@
<p><strong>Program:</strong></p>
<p>Conferences, workshops and trainings will be organized in 6 rooms:</p>
<ul>
<li>2 technical rooms: one dedicated to advanced OpenERP developers, one for new developers.</li>
<li>2 technical rooms: one dedicated to advanced OpenERP developers, one for new developers.</li>
<li>2 technical rooms: one dedicated to advanced Odoo developers, one for new developers.</li>
<li>2 technical rooms: one dedicated to advanced Odoo developers, one for new developers.</li>
<li>1 business room: to discuss implementation methodologies, best sales practices, etc.</li>
<li>1 workshop room: mainly for developers.</li>
</ul>

2
addons/event/event_view.xml
View File

@ -304,7 +304,7 @@
<p class="oe_view_nocontent_create">
Click to add a new event.
</p><p>
OpenERP helps you schedule and efficiently organize your events:
Odoo helps you schedule and efficiently organize your events:
track subscriptions and participations, automate the confirmation emails,
sell tickets, etc.
</p>

8
addons/fleet/fleet_board_view.xml
View File

@ -10,11 +10,11 @@
<field name="context">{"search_default_parent_false" : True,"search_default_groupby_year" : True, "search_default_groupby_cost_subtype" : True,"search_default_groupby_vehicle_id" : True}</field>
<field name="help" type="html">
<p>
OpenERP helps you managing the costs for your different vehicles
Odoo helps you managing the costs for your different vehicles
Costs are generally created from services and contract and appears here.
</p>
<p>
Thanks to the different filters, OpenERP can only print the effective
Thanks to the different filters, Odoo can only print the effective
costs, sort them by type and by vehicle.
</p>
</field>
@ -29,11 +29,11 @@
<field name="context">{"search_default_parent_true" : True,"search_default_groupby_cost_subtype" : True,"search_default_groupby_parent_id" : True,}</field>
<field name="help" type="html">
<p>
OpenERP helps you managing the costs for your different vehicles
Odoo helps you managing the costs for your different vehicles
Costs are generally created from services and contract and appears here.
</p>
<p>
Thanks to the different filters, OpenERP can only print the effective
Thanks to the different filters, Odoo can only print the effective
costs, sort them by type and by vehicle.
</p>
</field>

8
addons/fleet/fleet_view.xml
View File

@ -418,7 +418,7 @@
contracts, services, fixed and recurring costs, odometers and
fuel logs associated to each vehicle.
</p><p>
OpenERP will warn you when services or contract have to be
Odoo will warn you when services or contract have to be
renewed.
</p>
</field>
@ -558,7 +558,7 @@
Click to create a new contract.
</p><p>
Manage all your contracts (leasing, insurances, etc.) with
their related services, costs. OpenERP will automatically warn
their related services, costs. Odoo will automatically warn
you when some contracts have to be renewed.
</p><p>
Each contract (e.g.: leasing) may include several services
@ -847,7 +847,7 @@
<p class="oe_view_nocontent_create">
Click to create a new service entry.
</p><p>
OpenERP helps you keeping track of all the services done
Odoo helps you keeping track of all the services done
on your vehicle. Services can be of many type: occasional
repair, fixed maintenance, etc.
</p>
@ -980,7 +980,7 @@
<p class="oe_view_nocontent_create">
Click to create a new cost.
</p><p>
OpenERP helps you managing the costs for your different
Odoo helps you managing the costs for your different
vehicles. Costs are created automatically from services,
contracts (fixed or recurring) and fuel logs.
</p>

10
addons/google_calendar/google_calendar.py
View File

@ -122,9 +122,9 @@ class SyncEvent(object):
self.OP = Delete('OE', 'Update or delete from GOOGLE')
else:
if not modeFull:
self.OP = Delete('GG', 'Deleted from OpenERP, need to delete it from Gmail if already created')
self.OP = Delete('GG', 'Deleted from Odoo, need to delete it from Gmail if already created')
else:
self.OP = NothingToDo("", "Already Deleted in gmail and unlinked in OpenERP")
self.OP = NothingToDo("", "Already Deleted in gmail and unlinked in Odoo")
elif self.GG.found and not self.OE.found:
tmpSrc = 'GG'
if not self.GG.status and not self.GG.isInstance:
@ -915,7 +915,7 @@ class res_users(osv.Model):
'google_calendar_token_validity': fields.datetime('Token Validity'),
'google_calendar_last_sync_date': fields.datetime('Last synchro date'),
'google_calendar_cal_id': fields.char('Calendar ID', help='Last Calendar ID who has been synchronized. If it is changed, we remove \
all links between GoogleID and OpenERP Google Internal ID')
all links between GoogleID and Odoo Google Internal ID')
}
@ -948,7 +948,7 @@ class calendar_event(osv.Model):
return super(calendar_event, self).unlink(cr, uid, ids, can_be_deleted=can_be_deleted, context=context)
_columns = {
'oe_update_date': fields.datetime('OpenERP Update Date'),
'oe_update_date': fields.datetime('Odoo Update Date'),
}
@ -957,7 +957,7 @@ class calendar_attendee(osv.Model):
_columns = {
'google_internal_event_id': fields.char('Google Calendar Event Id'),
'oe_synchro_date': fields.datetime('OpenERP Synchro Date'),
'oe_synchro_date': fields.datetime('Odoo Synchro Date'),
}
_sql_constraints = [('google_id_uniq', 'unique(google_internal_event_id,partner_id,event_id)', 'Google ID should be unique!')]

4
addons/google_calendar/static/description/index.html
View File

@ -94,7 +94,7 @@
<div class="oe_span6">
<p class='oe_mt32'>
You can ask to have a alarm of type 'notification' in your Open ERP.<br/>
You will have a notification in you OpenERP which ever the page you are.
You will have a notification in you Odoo which ever the page you are.
</p>
</div>
@ -105,7 +105,7 @@
<h2 class="oe_slogan">Google Calendar</h2>
<div class="oe_span6">
<p class='oe_mt32'>
With the plugin Google_calendar, you can synchronize your OpenERP calendar with Google Calendar.
With the plugin Google_calendar, you can synchronize your Odoo calendar with Google Calendar.
</p>
</div>
<div class="oe_span6">

2
addons/google_calendar/static/src/js/calendar_sync.js
View File

@ -25,7 +25,7 @@ openerp.google_calendar = function(instance) {
local_context: context
}).done(function(o) {
if (o.status === "need_auth") {
alert(_t("You will be redirected on gmail to authorize your OpenErp to access your calendar !"));
alert(_t("You will be redirected on gmail to authorize your Odoo to access your calendar !"));
instance.web.redirect(o.url);
}
else if (o.status === "need_config_from_admin"){

4
addons/google_drive/google_drive.py
View File

@ -106,7 +106,7 @@ class config(osv.Model):
raise osv.except_osv(_('Warning!'), _("The Google Template cannot be found. Maybe it has been deleted."))
parents_dict = json.loads(parents)
record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
record_url = "Click on link to open Record in Odoo\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
data = {"title": name_gdocs, "description": record_url, "parents": parents_dict['parents']}
request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (template_id, access_token)
headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
@ -124,7 +124,7 @@ class config(osv.Model):
cr.commit()
res['url'] = content['alternateLink']
key = self._get_key_from_url(res['url'])
request_url = "https://www.googleapis.com/drive/v2/files/%s/permissions?emailMessage=This+is+a+drive+file+created+by+OpenERP&sendNotificationEmails=false&access_token=%s" % (key, access_token)
request_url = "https://www.googleapis.com/drive/v2/files/%s/permissions?emailMessage=This+is+a+drive+file+created+by+Odoo&sendNotificationEmails=false&access_token=%s" % (key, access_token)
data = {'role': 'writer', 'type': 'anyone', 'value': '', 'withLink': True}
try:
req = urllib2.Request(request_url, json.dumps(data), headers)

6
addons/google_drive/res_config_user_view.xml
View File

@ -30,7 +30,7 @@
<field name='filter_id' />
<p class="oe_grey">
<b>To create a new filter:</b><br/>
- Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
- Go to the Odoo document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
- In this "Search" view, select the option "Save Current Filter", enter the name (Ex: Sales Department)<br/>
- If you select "Share with all users", link of google document in "More" options will appear for all users in opportunities of Sales Department.<br/>
- If you don't select "Share with all users", link of google document in "More" options will not appear for other users in opportunities of Sales Department.<br/>
@ -45,7 +45,7 @@
<p class="oe_grey">
The name of the attached document can use fixed or variable data. To distinguish between documents in
Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%%(name)s_Sales
in the Google Drive name field, the document in your Google Drive and in OpenERP attachment will be named
in the Google Drive name field, the document in your Google Drive and in Odoo attachment will be named
'Agrolait_SO0001_Sales'.
</p>
</div>
@ -65,7 +65,7 @@
Click to add a new template.
</p>
<p>
Link your own google drive templates to any record of OpenERP. If you have really specific documents you want your collaborator fill in, e.g. Use a spreadsheet to control the quality of your product or review the delivery checklist for each order in a foreign country, ... Its very easy to manage them, link them to OpenERP and use them to collaborate with your employees.
Link your own google drive templates to any record of Odoo. If you have really specific documents you want your collaborator fill in, e.g. Use a spreadsheet to control the quality of your product or review the delivery checklist for each order in a foreign country, ... Its very easy to manage them, link them to Odoo and use them to collaborate with your employees.
</p>
</field>
</record>

2
addons/hr/hr.py
View File

@ -270,7 +270,7 @@ class hr_employee(osv.osv):
partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, SUPERUSER_ID, user_ids, context=context)))
self.message_post(
cr, uid, [employee_id],
body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
body=_('Welcome to %s! Please help him/her take the first steps with Odoo!') % (employee.name),
partner_ids=partner_ids,
subtype='mail.mt_comment', context=context
)

2
addons/hr/hr_data.xml
View File

@ -8,7 +8,7 @@
<field name="type">notification</field>
<field name="subtype_id" ref="mail.mt_comment"/>
<field name="subject">Employee Directory application installed!</field>
<field name="body"><![CDATA[<p>Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.</p>
<field name="body"><![CDATA[<p>Manage your human resources with Odoo: employees and their hierarchy, HR departments and job positions.</p>
<p>More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</p>]]></field>
</record>

12
addons/hr/hr_demo.xml
View File

@ -31,7 +31,7 @@
<record id="job_ceo" model="hr.job">
<field name="name">Chief Executive Officer</field>
<field name="department_id" ref="dep_management"/>
<field name="description">Demonstration of different openerp services for each client and convincing the client about functionality of the application.
<field name="description">Demonstration of different Odoo services for each client and convincing the client about functionality of the application.
The candidate should have excellent communication skills.
Relationship building and influencing skills
Expertise in New Client Acquisition (NCAs) and Relationship Management.
@ -53,7 +53,7 @@ Excellent analytical skills, ability to think logically and "out of the box"</fi
<record id="job_cto" model="hr.job">
<field name="name">Chief Technical Officer</field>
<field name="department_id" ref="dep_rd"/>
<field name="description">You will take part in the consulting services we provide to our partners and customers : design, analysis, development, testing, project management, support/coaching. You will work autonomously as well as coordinate and supervise small distributed development teams for some projects. Optionally, you will deliver OpenERP training sessions to partners and customers (8-10 people/session). You will report to the Head of Professional Services and work closely with all developers and consultants.
<field name="description">You will take part in the consulting services we provide to our partners and customers : design, analysis, development, testing, project management, support/coaching. You will work autonomously as well as coordinate and supervise small distributed development teams for some projects. Optionally, you will deliver Odoo training sessions to partners and customers (8-10 people/session). You will report to the Head of Professional Services and work closely with all developers and consultants.
The job is located in Grand-Rosière (1367), Belgium (between Louvain-La-Neuve and Namur).</field>
<field name="requirements">Bachelor, master or engineering degree in Computer Science or equivalent by experience
@ -101,11 +101,11 @@ Good language skills, other than English (Dutch and French preferred, others wel
<record id="job_trainee" model="hr.job">
<field name="name">Trainee</field>
<field name="description">You participate to the update of our tutorial tools and pre-sales tools after the launch of a new version of OpenERP. Indeed, any new version of the software brings significant improvements in terms of functionalities, ergonomics and configuration.
You will have to become familiar with the existing tools (books, class supports, OpenERP presentation’s slides, commercial tools),
<field name="description">You participate to the update of our tutorial tools and pre-sales tools after the launch of a new version of Odoo. Indeed, any new version of the software brings significant improvements in terms of functionalities, ergonomics and configuration.
You will have to become familiar with the existing tools (books, class supports, Odoo presentation’s slides, commercial tools),
to participate to the update of those tools in order to make them appropriate for the new version of the software and, for sure,
to suggest improvements in order to cover the new domains of the software.
You join the Implementation Assistance department. This team of 3 people go with OpenERP’s clients in the set up of the software. Your role will be
You join the Implementation Assistance department. This team of 3 people go with Odoo’s clients in the set up of the software. Your role will be
to animate webinars in order to show the different functionalities of the software.
to be involved in the support of the customers and
to answer to their questions.
@ -114,7 +114,7 @@ being involved in the treatment of new cases,
contributing to the set up of a new politic,
being involved into satisfaction surveys in order to have a better knowledge of how the support given is seen by the customers.</field>
<field name="requirements">You speak fluently English and French (one other European language is a +)
At the time of your traineeship at OpenERP, you will be in the last year of a Master or Bachelor Degree (ideally in the following sector: Business Management, IT Management, Computer Sciences)
At the time of your traineeship at Odoo, you will be in the last year of a Master or Bachelor Degree (ideally in the following sector: Business Management, IT Management, Computer Sciences)
You have a software and new technology awareness
You are ready to join a young and dynamic company, you are able to work in a “start up” fast paced environment, hands on attitude
You are approachable, honest and a fun team player

4
addons/hr/hr_view.xml
View File

@ -221,7 +221,7 @@
<p class="oe_view_nocontent_create">
Click to add a new employee.
</p><p>
With just a quick glance on the OpenERP employee screen, you
With just a quick glance on the Odoo employee screen, you
can easily find all the information you need for each person;
contact data, job position, availability, etc.
</p>
@ -480,7 +480,7 @@
<p class="oe_view_nocontent_create">
Click to create a department.
</p><p>
OpenERP's department structure is used to manage all documents
Odoo's department structure is used to manage all documents
related to employees by departments: expenses, timesheets,
leaves and holidays, recruitments, etc.
</p>

8
addons/hr/static/description/index.html
View File

@ -115,7 +115,7 @@ Keep track of the vacation days accrued by each employee. Employees enter their
</div>
<div class="oe_span6">
<p class='oe_mt32'>
Get rid of the paper work and follow employee's expenses directly in OpenERP. Don't loose time or money by controlling the full flow: expense validation, reimbursement of employees, posting in the accounting and re-invoicing to customers.
Get rid of the paper work and follow employee's expenses directly in Odoo. Don't loose time or money by controlling the full flow: expense validation, reimbursement of employees, posting in the accounting and re-invoicing to customers.
</p>
</div>
</div>
@ -126,7 +126,7 @@ Get rid of the paper work and follow employee's expenses directly in OpenERP. Do
<h2 class="oe_slogan">Follow Periodic Appraisals</h2>
<div class="oe_span6">
<p class='oe_mt32'>
Set-up appraisals plans and/or surveys for your employees and watch their evolution. Define steps for interviews and OpenERP will notify managers or subordinates automatically to prepare appraisals. Keep track of the progress of your staff periodically.
Set-up appraisals plans and/or surveys for your employees and watch their evolution. Define steps for interviews and Odoo will notify managers or subordinates automatically to prepare appraisals. Keep track of the progress of your staff periodically.
</p>
</div>
<div class="oe_span6">
@ -183,7 +183,7 @@ Inspire achievement with challenges, goals and rewards. Define clear objectives
<div class="oe_span6">
<div class="oe_quote">
<q>
OpenERP helped us to effectively record our working time and invoice
Odoo helped us to effectively record our working time and invoice
our customers while keeping track of our costs.
</q>
<cite class="oe_cite oe_clearfix oe_ml64">
@ -195,7 +195,7 @@ Inspire achievement with challenges, goals and rewards. Define clear objectives
<div class="oe_span6">
<div class="oe_quote">
<q>
Thanks to OpenERP, we have unified all our front-office and back-office
Thanks to Odoo, we have unified all our front-office and back-office
HR applications for 300.000 users in a cost effective way.
</q>
<cite class="oe_cite oe_clearfix oe_ml64">

2
addons/hr_attendance/hr_attendance_view.xml
View File

@ -83,7 +83,7 @@
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_today":1}</field>
<field name="search_view_id" ref="view_hr_attendance_filter" />
<field name="help">The Time Tracking functionality aims to manage employee attendances from Sign in/Sign out actions. You can also link this feature to an attendance device using OpenERP's web service features.</field>
<field name="help">The Time Tracking functionality aims to manage employee attendances from Sign in/Sign out actions. You can also link this feature to an attendance device using Odoo's web service features.</field>
</record>
<record id="action_hr_attendance_graph" model="ir.actions.act_window">

2
addons/hr_evaluation/hr_evaluation_installer.xml
View File

@ -13,7 +13,7 @@
</p><p>
You can define appraisal plans (ex: first interview after 6
months, then every year). Then, each employee can be linked to
an appraisal plan so that OpenERP can automatically generate
an appraisal plan so that Odoo can automatically generate
interview requests to managers and/or subordinates.
</p>
</field>

4
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -251,7 +251,7 @@
Each employee may be assigned an Appraisal Plan. Such a plan
defines the frequency and the way you manage your periodic
personnel evaluation. You will be able to define steps and
attach interviews to each step. OpenERP manages all kinds of
attach interviews to each step. Odoo manages all kinds of
evaluations: bottom-up, top-down, self-evaluation and final
evaluation by the manager.
</p>
@ -364,7 +364,7 @@
Click to create a new interview request related to a personal evaluation.
</p><p>
Interview requests are usually generated automatically by
OpenERP according to an employee's appraisal plan. Each user
Odoo according to an employee's appraisal plan. Each user
receives automatic emails and requests to evaluate their
colleagues periodically.
</p>

6
addons/hr_evaluation/survey_data_appraisal.xml
View File

@ -30,7 +30,7 @@ evaluated.
point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
Once the form had been filled, the employee send it to his supervisor.
&lt;li&gt;It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback
(internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must
(internal and/or external customers, peers). In case of collaboration with Odoo SA Belgium, the supervisor must
receive completed evaluation form from the employee's Belgian project manager.
&lt;li&gt;The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad
hoc fields.
@ -332,8 +332,8 @@ over the coming year.&lt;/p&gt;</field>
<field name="survey_id" ref="opinion_form" />
<field name="sequence">1</field>
<field name="description">&lt;h2&gt;At the supervisor's appraisal date&lt;/h2&gt;
&lt;p&gt;His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in thecompany...&lt;/p&gt;
&lt;p&gt;The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.&lt;/p&gt;
&lt;p&gt;His direct reports will be invited through Odoo to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in thecompany...&lt;/p&gt;
&lt;p&gt;The employees will send back their anonymous answers to Odoo. The data will be handled by the HR manager and a brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.&lt;/p&gt;
&lt;p&gt;The appraiser should rate the employee's major work accomplishments and performance according to the metric provided below
&lt;ol&gt;
&lt;li&gt;Significantly exceeds standards and expectations required of the position&lt;/li&gt;

2
addons/hr_expense/hr_expense_view.xml
View File

@ -181,7 +181,7 @@
<p class="oe_view_nocontent_create">
Click to register new expenses.
</p><p>
OpenERP will ensure the whole process is followed; the expense
Odoo will ensure the whole process is followed; the expense
sheet is validated by manager(s), the employee is reimbursed
from his expenses, some expenses must be re-invoiced to the
customers.

2
addons/hr_holidays/hr_holidays.py
View File

@ -74,7 +74,7 @@ class hr_holidays_status(osv.osv):
_columns = {
'name': fields.char('Leave Type', size=64, required=True, translate=True),
'categ_id': fields.many2one('calendar.event.type', 'Meeting Type',
help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
help='Once a leave is validated, Odoo will create a corresponding meeting of this type in the calendar.'),
'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'),
'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and will not take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),

2
addons/hr_holidays/hr_holidays_view.xml
View File

@ -462,7 +462,7 @@
<field name="view_id" ref="hr_holidays_leaves_assign_tree_view"/>
<field name="help" type="html">
<p>
You can assign remaining Legal Leaves for each employee, OpenERP
You can assign remaining Legal Leaves for each employee, Odoo
will automatically create and validate allocation requests.
</p>
</field>

2
addons/hr_recruitment/hr_recruitment_menu.xml
View File

@ -11,7 +11,7 @@
<field name="context">{'empty_list_help_model': 'hr.job'}</field>
<field name="help" type="html">
<p>
OpenERP helps you track applicants in the recruitment
Odoo helps you track applicants in the recruitment
process and follow up all operations: meetings, interviews, etc.
</p><p>
Applicants and their attached CV are created automatically when an email is sent.

2
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -313,7 +313,7 @@
<field name="context">{'search_default_job_id': [active_id], 'default_job_id': active_id, 'empty_list_help_model': 'hr.job'}</field>
<field name="help" type="html">
<p>
OpenERP helps you track applicants in the recruitment
Odoo helps you track applicants in the recruitment
process and follow up all operations: meetings, interviews, etc.
</p><p>
Applicants and their attached CV are created automatically when an email is sent.

2
addons/hr_timesheet/hr_timesheet_installer.xml
View File

@ -7,7 +7,7 @@
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="help">You should create an analytic account structure depending on your needs to analyse costs and revenues. In OpenERP, analytic accounts are also used to track customer contracts.</field>
<field name="help">You should create an analytic account structure depending on your needs to analyse costs and revenues. In Odoo, analytic accounts are also used to track customer contracts.</field>
</record>
</data>
</openerp>

2
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -92,7 +92,7 @@
<p>
No activity yet on this contract.
</p><p>
In OpenERP, contracts and projects are implemented using
In Odoo, contracts and projects are implemented using
analytic account. So, you can track costs and revenues to analyse
your margins easily.
</p><p>

2
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -170,7 +170,7 @@
<p class="oe_view_nocontent_create">
Click to add a new type of invoicing.
</p><p>
OpenERP allows you to create default invoicing types. You might
Odoo allows you to create default invoicing types. You might
have to regularly assign discounts because of a specific
contract or agreement with a customer. From this menu, you can
create additional types of invoicing to speed up your

8
addons/hw_posbox_homepage/controllers/main.py
View File

@ -15,7 +15,7 @@ index_template = """
<!DOCTYPE HTML>
<html>
<head>
<title>OpenERP's PosBox</title>
<title>Odoo's PosBox</title>
<style>
body {
width: 480px;
@ -30,7 +30,7 @@ index_template = """
<h1>Your PosBox is up and running</h1>
<p>
The PosBox is an hardware adapter that allows you to use
receipt printers and barcode scanners with OpenERP's Point of
receipt printers and barcode scanners with Odoo's Point of
Sale, <b>version 8.0 or later</b>. You can start an <a href='https://www.openerp.com/start'>online free trial</a>,
or <a href='https://www.openerp.com/start?download'>download and install</a> it yourself.
</p>
@ -44,10 +44,10 @@ index_template = """
</p>
<p>
The PosBox software installed on this posbox is <b>version 6</b>,
the posbox version number is independent from OpenERP. You can upgrade
the posbox version number is independent from Odoo. You can upgrade
the software on the <a href='/hw_proxy/upgrade/'>upgrade page</a>
</p>
<p>For any other question, please contact the OpenERP support at <a href='mailto:support@openerp.com'>support@openerp.com</a>
<p>For any other question, please contact the Odoo support at <a href='mailto:support@odoo.com'>support@odoo.com</a>
</p>
</body>
</html>

2
addons/hw_posbox_upgrade/controllers/main.py
View File

@ -16,7 +16,7 @@ upgrade_template = """
<!DOCTYPE HTML>
<html>
<head>
<title>OpenERP's PosBox - Software Upgrade</title>
<title>Odoo's PosBox - Software Upgrade</title>
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
<script>
$(function(){

2
addons/hw_proxy/controllers/main.py
View File

@ -44,7 +44,7 @@ class Proxy(http.Controller):
<!DOCTYPE HTML>
<html>
<head>
<title>OpenERP's PosBox</title>
<title>Odoo's PosBox</title>
<style>
body {
width: 480px;

2
addons/hw_scale/controllers/main.py
View File

@ -19,7 +19,7 @@ _logger = logging.getLogger(__name__)
try:
import serial
except ImportError:
_logger.error('OpenERP module hw_scale depends on the pyserial python module')
_logger.error('Odoo module hw_scale depends on the pyserial python module')
serial = None

2
addons/hw_scanner/controllers/main.py
View File

@ -19,7 +19,7 @@ _logger = logging.getLogger(__name__)
try:
import evdev
except ImportError:
_logger.error('OpenERP module hw_scanner depends on the evdev python module')
_logger.error('Odoo module hw_scanner depends on the evdev python module')
evdev = None

8
addons/l10n_be_coda/wizard/account_coda_import.py
View File

@ -167,13 +167,13 @@ class account_coda_import(osv.osv_memory):
statement['lines'].append(statementLine)
elif line[1] == '2':
if statement['lines'][-1]['ref'][0:4] != line[2:6]:
raise osv.except_osv(_('Error') + 'R2004', _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])
raise osv.except_osv(_('Error') + 'R2004', _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your Odoo support channel.') % line[2:10])
statement['lines'][-1]['communication'] += rmspaces(line[10:63])
statement['lines'][-1]['payment_reference'] = rmspaces(line[63:98])
statement['lines'][-1]['counterparty_bic'] = rmspaces(line[98:109])
elif line[1] == '3':
if statement['lines'][-1]['ref'][0:4] != line[2:6]:
raise osv.except_osv(_('Error') + 'R2005', _('CODA parsing error on movement data record 2.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])
raise osv.except_osv(_('Error') + 'R2005', _('CODA parsing error on movement data record 2.3, seq nr %s! Please report this issue via your Odoo support channel.') % line[2:10])
if statement['version'] == '1':
statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22])
statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:73])
@ -206,11 +206,11 @@ class account_coda_import(osv.osv_memory):
statement['lines'].append(infoLine)
elif line[1] == '2':
if infoLine['ref'] != rmspaces(line[2:10]):
raise osv.except_osv(_('Error') + 'R3004', _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])
raise osv.except_osv(_('Error') + 'R3004', _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your Odoo support channel.') % line[2:10])
statement['lines'][-1]['communication'] += rmspaces(line[10:100])
elif line[1] == '3':
if infoLine['ref'] != rmspaces(line[2:10]):
raise osv.except_osv(_('Error') + 'R3005', _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])
raise osv.except_osv(_('Error') + 'R3005', _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your Odoo support channel.') % line[2:10])
statement['lines'][-1]['communication'] += rmspaces(line[10:100])
elif line[0] == '4':
comm_line = {}

2
addons/l10n_be_invoice_bba/invoice.py
View File

@ -153,7 +153,7 @@ class account_invoice(osv.osv):
else:
raise osv.except_osv(_('Error!'),
_("Unsupported Structured Communication Type Algorithm '%s' !" \
"\nPlease contact your OpenERP support channel.") % algorithm)
"\nPlease contact your Odoo support channel.") % algorithm)
return {'value': {'reference': reference}}
def create(self, cr, uid, vals, context=None):

2
addons/mail/data/mail_group_data.xml
View File

@ -14,7 +14,7 @@
<field name="res_id" ref="mail.group_all_employees"/>
<field name="type">notification</field>
<field name="subtype_id" ref="mail.mt_comment"/>
<field name="subject">Welcome to OpenERP!</field>
<field name="subject">Welcome to Odoo!</field>
<field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.</p>
<p>The top menu bar contains all applications you installed. You can use the <i>Settings</i> menu to install more applications, activate other features or give access to new users.</p>
<p>To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field>

2
addons/mail/data/mail_group_demo_data.xml
View File

@ -55,7 +55,7 @@
<record id="msg_group_1_3" model="mail.message">
<field name="model">mail.group</field>
<field name="res_id" ref="mail.group_best_sales_practices"/>
<field name="body"><![CDATA[<p>When I have too much opportunities in the pipe, I start communicating with prospects more by email than phonecalls.</p><p>I send an email to create a sense of emergency, like <i>"can I call you this week about our quote?"</i> and I call only those that answer this email.</p><p>You can use the email template feature of OpenERP to automate email composition.</p>]]></field>
<field name="body"><![CDATA[<p>When I have too much opportunities in the pipe, I start communicating with prospects more by email than phonecalls.</p><p>I send an email to create a sense of emergency, like <i>"can I call you this week about our quote?"</i> and I call only those that answer this email.</p><p>You can use the email template feature of Odoo to automate email composition.</p>]]></field>
<field name="type">comment</field>
<field name="parent_id" ref="msg_group_1_2"/>
<field name="subtype_id" ref="mt_comment"/>

2
addons/mail/mail_alias.py
View File

@ -68,7 +68,7 @@ class mail_alias(osv.Model):
'alias_name': fields.char('Alias Name',
help="The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.my.openerp.com>",),
'alias_model_id': fields.many2one('ir.model', 'Aliased Model', required=True, ondelete="cascade",
help="The model (OpenERP Document Kind) to which this alias "
help="The model (Odoo Document Kind) to which this alias "
"corresponds. Any incoming email that does not reply to an "
"existing record will cause the creation of a new record "
"of this model (e.g. a Project Task)",

2
addons/mail/res_config.py
View File

@ -30,7 +30,7 @@ class project_configuration(osv.TransientModel):
_columns = {
'alias_domain': fields.char('Alias Domain',
help="If you have setup a catch-all email domain redirected to "
"the OpenERP server, enter the domain name here."),
"the Odoo server, enter the domain name here."),
}
def get_default_alias_domain(self, cr, uid, ids, context=None):

4
addons/mail/static/description/index.html
View File

@ -34,7 +34,7 @@ email overload.
<div class="oe_span6">
<p class="oe_mt32">
Next time you have a question for the marketing, sales, R&amp;D or any other
department, don't send an email blast-post the question to OpenERP and get
department, don't send an email blast-post the question to Odoo and get
answers from the right persons.
</p>
</div>
@ -164,7 +164,7 @@ for your own company. Follow people, share best practices, 'like' top ideas, etc
junk flows in the same inbox; spams, information that doesn't
matter, quoted answers of quoted answers, etc. At the end of
the hour, only 10 emails actually requested an answer from me.
Since I use OpenERP, I can do the same job in only 10 minutes!
Since I use Odoo, I can do the same job in only 10 minutes!
</q>
<cite class="oe_cite oe_clearfix">
<img class="oe_photo" src="photo.png">

16
addons/mail/static/scripts/openerp_mailgate.py
View File

@ -120,13 +120,13 @@ def configure_parser():
parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.1')
group = optparse.OptionGroup(parser, "Note",
"This program parse a mail from standard input and communicate "
"with the OpenERP server for case management in the CRM module.")
"with the Odoo server for case management in the CRM module.")
parser.add_option_group(group)
parser.add_option("-u", "--user", dest="userid",
help="OpenERP user id to connect with",
help="Odoo user id to connect with",
default=config.OPENERP_DEFAULT_USER_ID, type='int')
parser.add_option("-p", "--password", dest="password",
help="OpenERP user password",
help="Odoo user password",
default=config.OPENERP_DEFAULT_PASSWORD)
parser.add_option("-o", "--model", dest="model",
help="Name or ID of destination model",
@ -135,13 +135,13 @@ def configure_parser():
help="Admin email for error notifications.",
default=None)
parser.add_option("-d", "--dbname", dest="dbname",
help="OpenERP database name (default: %default)",
help="Odoo database name (default: %default)",
default=config.OPENERP_DEFAULT_DATABASE)
parser.add_option("--host", dest="host",
help="OpenERP Server hostname",
help="Odoo Server hostname",
default=config.OPENERP_HOSTNAME)
parser.add_option("--port", dest="port",
help="OpenERP Server XML-RPC port number",
help="Odoo Server XML-RPC port number",
default=config.OPENERP_PORT)
parser.add_option("--custom-values", dest="custom_values",
help="Dictionary of extra values to pass when creating records",
@ -187,13 +187,13 @@ def main():
'%s' % (cgitb.text(sys.exc_info())),
])
subject = '[OPENERP]:ERROR: Mailgateway - %s' % time.strftime('%Y-%m-%d %H:%M:%S')
subject = '[Odoo]:ERROR: Mailgateway - %s' % time.strftime('%Y-%m-%d %H:%M:%S')
send_mail(
config.MAIL_ERROR,
config.MAIL_ADMINS,
subject, msg, files=[('message.txt', msg_txt)]
)
sys.stderr.write("Failed to deliver email to OpenERP Server, sending error notification to %s\n" % config.MAIL_ADMINS)
sys.stderr.write("Failed to deliver email to Odoo Server, sending error notification to %s\n" % config.MAIL_ADMINS)
if __name__ == '__main__':
main()

6
addons/marketing_campaign/marketing_campaign_demo.xml
View File

@ -4,7 +4,7 @@
<record id="email_template_1" model="email.template">
<field name="name">welcome new partner</field>
<field name="email_from">info@openerp.com</field>
<field name="subject">Welcome to the OpenERP Partner Channel!</field>
<field name="subject">Welcome to the Odoo Partner Channel!</field>
<field name="email_to">${(object.email or '')|safe}</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="body_html">Hello, you will receive your welcome pack via email shortly.</field>
@ -31,7 +31,7 @@
<!-- Campaign -->
<record id="marketing_campaign_openerppartnerchannel" model="marketing.campaign">
<field name="name">OpenERP Partner Channel</field>
<field name="name">Odoo Partner Channel</field>
<field name="object_id" ref="base.model_res_partner"/>
<field name="mode">active</field>
</record>
@ -82,7 +82,7 @@
</record>
<record id="marketing_campaign_segment0" model="marketing.campaign.segment">
<field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
<field name="name">OpenERP Partner</field>
<field name="name">Odoo Partner</field>
<field name="sync_mode">create_date</field>
<field name="ir_filter_id" ref="filter0"/>
<field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>

2
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -172,7 +172,7 @@
<p class="oe_view_nocontent_create">
Click to create a marketing campaign.
</p><p>
OpenERP's marketing campaign allows you to automate communication
Odoo's marketing campaign allows you to automate communication
to your prospects. You can define a segment (set of conditions) on
your leads and partners to fullfil the campaign.
</p><p>

2
addons/marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="CRM Lead.pdf">
<template title="CRM Lead" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<template title="CRM Lead" author="Odoo (sales@odoo.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>

84
addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
View File

@ -24,7 +24,7 @@
<field eval="0" name="ressource_tree"/>
<field eval="[(6,0,[])]" name="group_ids"/>
<field name="user_id" ref="base.user_root"/>
<field eval="&quot;&quot;&quot;OpenERP OnDemand Free Trial 2010&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Odoo OnDemand Free Trial 2010&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;[]&quot;&quot;&quot;" name="domain"/>
<field name="parent_id" ref="document_directory_marketingcampaign"/>
<field eval="&quot;&quot;&quot;ressource&quot;&quot;&quot;" name="type"/>
@ -33,117 +33,117 @@
<!-- Email tempalte -->
<record id="email_template_1" model="email.template">
<field name="subject">Thanks for showing interest in OpenERP</field>
<field name="subject">Thanks for showing interest in Odoo</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
<field eval="0" name="user_signature"/>
<field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
&lt;p&gt;Thanks for the genuine interest you have shown in OpenERP.&lt;/p&gt;
&lt;p&gt;Thanks for the genuine interest you have shown in Odoo.&lt;/p&gt;
&lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
&lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
<field name="name">For OpenERP OnDemand Free Trial 2010</field>
&lt;p&gt;Regards,Odoo Team,&lt;/p&gt;</field>
<field name="name">For Odoo OnDemand Free Trial 2010</field>
</record>
<record id="email_template_2" model="email.template">
<field name="subject">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
<field name="subject">Propose to subscribe to the Odoo Discovery Day on May 2010</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
<field eval="0" name="user_signature"/>
<field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
&lt;p&gt;We have very good offer that might suit you.
We suggest you subscribe to the OpenERP Discovery Day on May 2010.&lt;/p&gt;
We suggest you subscribe to the Odoo Discovery Day on May 2010.&lt;/p&gt;
&lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
&lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
<field name="name">For OpenERP Discovery Day on May 2010</field>
&lt;p&gt;Regards,Odoo Team,&lt;/p&gt;</field>
<field name="name">For Odoo Discovery Day on May 2010</field>
</record>
<record id="email_template_3" model="email.template">
<field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
<field name="subject">Thanks for subscribing to the Odoo Discovery Day</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
<field eval="0" name="user_signature"/>
<field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
&lt;p&gt;Thanks for showing interest and for subscribing to the OpenERP Discovery Day.&lt;/p&gt;
&lt;p&gt;Thanks for showing interest and for subscribing to the Odoo Discovery Day.&lt;/p&gt;
&lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
&lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
<field name="name">For OpenERP Discovery Day</field>
&lt;p&gt;Regards,Odoo Team,&lt;/p&gt;</field>
<field name="name">For Odoo Discovery Day</field>
</record>
<record id="email_template_4" model="email.template">
<field name="subject">Thanks for buying the OpenERP book</field>
<field name="subject">Thanks for buying the Odoo book</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
<field eval="0" name="user_signature"/>
<field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
&lt;p&gt;Thanks for showing interest and buying the OpenERP book.&lt;/p&gt;
&lt;p&gt;Thanks for showing interest and buying the Odoo book.&lt;/p&gt;
If any further information required kindly revert back.
&lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
<field name="name">For OpenERP book</field>
&lt;p&gt;Regards,Odoo Team,&lt;/p&gt;</field>
<field name="name">For Odoo book</field>
</record>
<record id="email_template_5" model="email.template">
<field name="subject">Propose a free technical training to Gold partners</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2010)')]"/>
<field eval="0" name="user_signature"/>
<field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
&lt;p&gt;We have very good offer that might suit you.
For our gold partners,We are arranging free technical training on june,2010.&lt;/p&gt;
&lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
&lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
&lt;p&gt;Regards,Odoo Team,&lt;/p&gt;</field>
<field name="name">technical training to gold partners</field>
</record>
<record id="email_template_6" model="email.template">
<field name="subject">Propose paid training to Silver partners</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
<field eval="0" name="user_signature"/>
<field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
&lt;p&gt;We have very good offer that might suit you.
For our silver partners,We are paid technical training on june,2010.&lt;/p&gt;
&lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
&lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
&lt;p&gt;Regards,Odoo Team,&lt;/p&gt;</field>
<field name="name">training to silver partners</field>
</record>
<record id="email_template_7" model="email.template">
<field name="subject">Propose gold partnership to silver partners</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
<field eval="0" name="user_signature"/>
<field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
&lt;p&gt;We have very good offer that might suit you.
For our silver partners, we are offering Gold partnership.&lt;/p&gt;
&lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
&lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
&lt;p&gt;Regards,Odoo Team,&lt;/p&gt;</field>
<field name="name">gold partnership to silver partners</field>
</record>
<record id="email_template_8" model="email.template">
<field name="subject">Thanks for subscribing to technical training</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
<field eval="0" name="user_signature"/>
<field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
&lt;p&gt;Thanks for showing interest and for subscribing to technical training.&lt;/p&gt;
If any further information required kindly revert back.I really appreciate your co-operation on this.&lt;/p&gt;
&lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
&lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
&lt;p&gt;Regards,Odoo Team,&lt;/p&gt;</field>
<field name="name">subscribing to technical training</field>
</record>
<!-- Report -->
@ -159,7 +159,7 @@
<!-- Campaign -->
<record id="marketing_campaign_openerpondemandfreetrial0" model="marketing.campaign">
<field name="name">OpenERP OnDemand Free Trial 2010</field>
<field name="name">Odoo OnDemand Free Trial 2010</field>
<field name="object_id" ref="crm.model_crm_lead"/>
<field name="mode">active</field>
<field name="partner_field_id" ref="crm.field_crm_lead_partner_id"/>
@ -184,20 +184,20 @@
</record>
<record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
<field name="name">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
<field name="name">Propose to subscribe to the Odoo Discovery Day on May 2010</field>
<field name="server_action_id" ref="action_dummy"/>
<field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
<field name="email_template_id" ref="email_template_2"/>
</record>
<record id="marketing_campaign_activity_3" model="marketing.campaign.activity">
<field name="name">Thanks for subscribing to the OpenERP Discovery Day</field>
<field name="name">Thanks for subscribing to the Odoo Discovery Day</field>
<field name="server_action_id" ref="action_dummy"/>
<field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
<field name="email_template_id" ref="email_template_3"/>
</record>
<record id="marketing_campaign_activity_4" model="marketing.campaign.activity">
<field name="name">Propose to buy the OpenERP Book</field>
<field name="name">Propose to buy the Odoo Book</field>
<field name="server_action_id" ref="action_dummy"/>
<field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
<field name="report_directory_id" ref="document_directory_campaign1"/>
@ -206,7 +206,7 @@
</record>
<record id="marketing_campaign_activity_5" model="marketing.campaign.activity">
<field name="name">Thanks for buying the OpenERP book</field>
<field name="name">Thanks for buying the Odoo book</field>
<field name="server_action_id" ref="action_dummy"/>
<field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
<field name="email_template_id" ref="email_template_4"/>

10
addons/mass_mailing/static/description/index.html
View File

@ -64,11 +64,11 @@ Setup several email servers with their own IP/domain to optimise opening rates.
<section class="oe_container oe_dark">
<div class="oe_row">
<h2 class="oe_slogan">Integrated with OpenERP Apps</h2>
<h2 class="oe_slogan">Integrated with Odoo Apps</h2>
<h2 class="oe_slogan"></h2>
<div class="oe_span6">
<p class='oe_mt32'>
Get access to mass mailing features from every OpenERP app to improve
Get access to mass mailing features from every Odoo app to improve
the way your users communicate.
</p><p>
Send template of emails from <a href="/apps/crm">CRM</a> opportunities, select leads based on
@ -99,7 +99,7 @@ Answers to your emails appears automatically in the history of every document wi
<div class="oe_span6">
<p class='oe_mt32'>
Get a clean lead database that improves over the time using the
performance of your mails. OpenERP handle bounce mails
performance of your mails. Odoo handle bounce mails
efficiently, flag erroneous leads accordingly and gives you
statistics on the quality of your leads.
</p>
@ -145,7 +145,7 @@ templates.
The chatter feature enables you to communicate faster and more efficiently with
your customer. Get documents created automatically (leads, opportunities,
tasks, ...) based on answers to your mass mailing campaigns Follow the
discussion directly on the business documents within OpenERP or via email.
discussion directly on the business documents within Odoo or via email.
</p><p>
Get all the negotiations and discussions attached to the right document
and relevent managers notified on specific events.
@ -205,7 +205,7 @@ gives you a direct overview of your campaign performance.
</a>
<p>
Integrate a contact form in your website easily. Forms
submissions create leads automatically in OpenERP CRM. Leads
submissions create leads automatically in Odoo CRM. Leads
can be used in marketing campaigns.
</p>
</div>

2
addons/mrp/mrp_data.xml
View File

@ -8,7 +8,7 @@
<field name="type">notification</field>
<field name="subtype_id" ref="mail.mt_comment"/>
<field name="subject">MRP application installed!</field>
<field name="body"><![CDATA[<p>Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.</p><p>
<field name="body"><![CDATA[<p>Manage your manufacturing process with Odoo by defining your bills of materials (BoM), routings and work centers.</p><p>
This application supports complete integration and production scheduling for stockable goods, consumables, and services.</p>
<p>From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</p>]]></field>
</record>

10
addons/mrp/mrp_view.xml
View File

@ -45,13 +45,13 @@
Click to create a group of properties.
</p><p>
Define specific property groups that can be assigned to your
bill of materials and sales orders. Properties allows OpenERP
bill of materials and sales orders. Properties allows Odoo
to automatically select the right bill of materials according
to properties selected in the sales order by salesperson.
</p><p>
For instance, in the property group "Warranty", you an have
two properties: 1 year warranty, 3 years warranty. Depending
on the propoerties selected in the sales order, OpenERP will
on the propoerties selected in the sales order, Odoo will
schedule a production using the matching bill of materials.
</p>
</field>
@ -117,12 +117,12 @@
<p class="oe_view_nocontent_create">
Click to create a new property.
</p><p>
The Properties in OpenERP are used to select the right bill of
The Properties in Odoo are used to select the right bill of
materials for manufacturing a product when you have different
ways of building the same product. You can assign several
properties to each bill of materials. When a salesperson
creates a sales order, they can relate it to several properties
and OpenERP will automatically select the BoM to use according
and Odoo will automatically select the BoM to use according
the needs.
</p>
</field>
@ -470,7 +470,7 @@
materials used to make a finished product; through a manufacturing
order or a pack of products.
</p><p>
OpenERP uses these BoMs to automatically propose manufacturing
Odoo uses these BoMs to automatically propose manufacturing
orders according to procurement needs.
</p>
</field>

2
addons/mrp/report/price.py
View File

@ -115,7 +115,7 @@ class report_custom(report_rml):
<tableSize>55.00mm,58.00mm,29.00mm,29.00mm,29.00mm</tableSize>
""" % to_xml(user_pool.browse(cr, uid, uid).company_id.name)
config_stop = """
<report-footer>Generated by OpenERP</report-footer>
<report-footer>Generated by Odoo</report-footer>
</config>
"""

6
addons/mrp/static/description/index.html
View File

@ -14,7 +14,7 @@
</div>
<div class="oe_span6">
<p class="oe_mt32">
Get all your assembly or manufacturing operations managed by OpenERP. Schedule
Get all your assembly or manufacturing operations managed by Odoo. Schedule
manufacturing orders and work orders automatically. Review the proposed
planning with the smart kanban and gantt views. Use the advanced analytics
features to detect bottleneck in resources capacities and inventory locations.
@ -67,7 +67,7 @@ manufacturing orders.
<div class="oe_span6">
<p class="oe_mt32">
Edit manually all proposed operations at any level of the progress.
With OpenERP, you will not be frustrated by a rigid system.
With Odoo, you will not be frustrated by a rigid system.
</p>
</div>
<div class="oe_span6">
@ -178,7 +178,7 @@ manufacturing operations.
<div class="oe_span6">
<div class="oe_quote">
<q>
OpenERP allowed our company to efficiently manage a growth from a turnover of 2.4m€ to 15m€ in 4 years.
Odoo allowed our company to efficiently manage a growth from a turnover of 2.4m€ to 15m€ in 4 years.
</q>
<cite class="oe_cite oe_clearfix">
<img class="oe_photo" src="coppernic.png">

2
addons/mrp_operations/report/mrp_code_barcode.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(550,280)" title="Code Barcode" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<template pageSize="(550,280)" title="Code Barcode" author="Odoo (sales@odoo.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
</pageTemplate>

Some files were not shown because too many files have changed in this diff Show More