diff --git a/addons/account/account.py b/addons/account/account.py index 1aa3d490f15..ac70559fe7d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -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, diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml index ef793a1bef5..426309e0c34 100644 --- a/addons/account/account_bank_view.xml +++ b/addons/account/account_bank_view.xml @@ -47,7 +47,7 @@ Configure your company's bank account and select those that must appear on the report footer.
- 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.
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 64159dab18d..1be4ac7d2ba 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -523,7 +523,7 @@Click to create a customer invoice.
- 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.
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.
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 3c8aa29be28..47f21266c18 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -650,7 +650,7 @@ occurring over a given period of time on a bank account. You should receive this periodicaly from your bank.- 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.
@@ -920,7 +920,7 @@ Click to define a new tax code.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.
@@ -1269,8 +1269,8 @@ Select the period and the journal you want to fill.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".
@@ -1506,7 +1506,7 @@ A journal entry consists of several journal items, each of which is either a debit or a credit transaction.
- 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.
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 3940c1e5357..7e6b12782dd 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -381,7 +381,7 @@
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.
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index a0789ba8860..41e4ff59278 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -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), diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 65f38d6e26b..5fd111a8fe0 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -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"), diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index 0740e2c0f39..b33264fa452 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -243,7 +243,7 @@-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.
+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.Activate features on demand, from integrated analytic accounting to budget, assets and multiple companies consolidation.
@@ -29,7 +29,7 @@ Activate features on demand, from integrated analytic accounting to budget, asseRecord 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.
-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.
-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.
- 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!@@ -178,7 +178,7 @@ OpenERP supports multiple currencies, multiple users with different access right
- 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.diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml index 62d985a29d5..22cd3a8b529 100644 --- a/addons/account/wizard/account_automatic_reconcile_view.xml +++ b/addons/account/wizard/account_automatic_reconcile_view.xml @@ -8,7 +8,7 @@