Skip to content

Commit

Permalink
[REF] OpenERP --> Odoo in various UI texts
Browse files Browse the repository at this point in the history
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 odoo#1260
  • Loading branch information
rlu-odoo authored and rim-odoo committed Jul 18, 2014
1 parent 1f5d135 commit 8b67a72
Show file tree
Hide file tree
Showing 175 changed files with 602 additions and 605 deletions.
4 changes: 2 additions & 2 deletions addons/account/account.py
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):

# 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):
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion addons/account/account_bank_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions addons/account/account_invoice_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions addons/account/account_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion addons/account/demo/account_minimal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion addons/account/project/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
Expand Down
2 changes: 1 addition & 1 deletion addons/account/project/project_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion addons/account/report/account_entries_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion addons/account/res_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),

Expand Down
2 changes: 1 addition & 1 deletion addons/account/res_config_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions addons/account/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h3 class="oe_slogan">Beautiful, easy, full featured</h3>
</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>
Expand All @@ -29,7 +29,7 @@ <h2 class="oe_slogan">A Smart User Interface</h2>
<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">
Expand Down Expand Up @@ -135,7 +135,7 @@ <h2 class="oe_slogan">Everything you need to grow</h2>
</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>
Expand All @@ -148,7 +148,7 @@ <h2 class="oe_slogan">Scale With Your Organization</h2>
<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">
Expand All @@ -166,7 +166,7 @@ <h3 class="oe_slogan">Hear what they have to say !</h3>
<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">
Expand All @@ -178,7 +178,7 @@ <h3 class="oe_slogan">Hear what they have to say !</h3>
<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">
Expand Down
2 changes: 1 addition & 1 deletion addons/account/wizard/account_automatic_reconcile_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion addons/account/wizard/account_vat_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions addons/account_accountant/account_accountant_data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Hello ${object.name},
<pre>
--
OpenERP Automatic Email
Odoo Automatic Email
</pre>
]]></field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion addons/account_check_writing/account_voucher_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 8b67a72

Please sign in to comment.