diff options
| author | rlu-odoo <rlu@tinyerp.com> | 2014-07-09 17:09:38 +0530 |
|---|---|---|
| committer | Richard Mathot <rim@openerp.com> | 2014-07-18 13:45:41 +0200 |
| commit | 8b67a7202d9dd3492001cade3d361b8a5424ec3f (patch) | |
| tree | 5f21000fbb475fc309f343460f03f4feeec121e8 | |
| parent | 1f5d135e44ee35f5aad18177052162d1672faccb (diff) | |
[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
175 files changed, 602 insertions, 605 deletions
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. </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> 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 @@ <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> 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. </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. 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 @@ <!-- 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"/> diff --git a/addons/account/project/project.py b/addons/account/project/project.py index ec89fd8dcbc..a1fac188518 100644 --- a/addons/account/project/project.py +++ b/addons/account/project/project.py @@ -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), } diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 068f3721371..878b8ef158d 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -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> 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 @@ </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> diff --git a/addons/account/static/description/index.html b/addons/account/static/description/index.html index 362a33b4ae2..e92ec8606c1 100644 --- a/addons/account/static/description/index.html +++ b/addons/account/static/description/index.html @@ -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"> 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 @@ <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"/> diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml index 9e9b781e4a8..a4497d11eb7 100644 --- a/addons/account/wizard/account_report_aged_partner_balance_view.xml +++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml @@ -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"/> diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml index 531554112b5..f15e26cfe5e 100644 --- a/addons/account/wizard/account_vat_view.xml +++ b/addons/account/wizard/account_vat_view.xml @@ -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"/> diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml index c7d6eb80bc6..8f9fd92ac19 100644 --- a/addons/account_accountant/account_accountant_data.xml +++ b/addons/account_accountant/account_accountant_data.xml @@ -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> diff --git a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml index 0637c2ad276..9ab7fafdffc 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml @@ -67,7 +67,7 @@ Hello ${object.name}, <pre> -- -OpenERP Automatic Email +Odoo Automatic Email </pre> ]]></field> diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index e4d9a928d28..ec363a2cdb9 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -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> diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml index de7ecd327a9..2201a7cd7e0 100644 --- a/addons/account_check_writing/account_voucher_view.xml +++ b/addons/account_check_writing/account_voucher_view.xml @@ -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> diff --git a/addons/account_sequence/account_sequence_installer.py b/addons/account_sequence/account_sequence_installer.py index bcf1e14c20f..af3f5a971bf 100644 --- a/addons/account_sequence/account_sequence_installer.py +++ b/addons/account_sequence/account_sequence_installer.py @@ -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 = { diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml index 6329176c6e9..6d141869184 100644 --- a/addons/account_voucher/account_voucher_data.xml +++ b/addons/account_voucher/account_voucher_data.xml @@ -9,7 +9,7 @@ <field name="type">notification</field> <field name="subtype_id" ref="mail.mt_comment"/> <field name="subject">eInvoicing & 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> diff --git a/addons/account_voucher/static/description/index.html b/addons/account_voucher/static/description/index.html index a363291f12e..4f149075ed8 100644 --- a/addons/account_voucher/static/description/index.html +++ b/addons/account_voucher/static/description/index.html @@ -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"> diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index aa427bbf91e..dd316ea2600 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -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> diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 147e96f0be0..51e020b3f81 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -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. diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py index 9ddc3d6ed45..70323bb6a0e 100644 --- a/addons/auth_ldap/users_ldap.py +++ b/addons/auth_ldap/users_ldap.py @@ -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']: diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 1a166c39cde..e48aeebd8a5 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -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() diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml index 2789fcd8315..096d2327393 100644 --- a/addons/auth_signup/auth_signup_data.xml +++ b/addons/auth_signup/auth_signup_data.xml @@ -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: diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py index 4ef13eb7b46..afa06c782d1 100644 --- a/addons/base_gengo/wizard/base_gengo_translations.py +++ b/addons/base_gengo/wizard/base_gengo_translations.py @@ -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 = {} diff --git a/addons/base_import/models.py b/addons/base_import/models.py index bc4bb0a268f..ab2ec8b72ce 100644 --- a/addons/base_import/models.py +++ b/addons/base_import/models.py @@ -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) diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index 0295828cb7f..1f8bd6705a8 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -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 diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml index 74cfc63a6ce..2df241478cf 100644 --- a/addons/base_report_designer/base_report_designer_installer.xml +++ b/addons/base_report_designer/base_report_designer_installer.xml @@ -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"/> diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py index 436650eb2cd..4723490175d 100755 --- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py +++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py @@ -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") diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py index 9fb6cd11219..f9522349bde 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py @@ -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) diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py index 669c8b8fb84..91e3425c4a3 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py @@ -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() diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py index b6edaecdc44..b6fea54f908 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py @@ -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): diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py index dbd0a51d66d..d8e1e580b55 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py @@ -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") diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py index 52af0821790..957cb2003a3 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py @@ -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 diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml index 036d48d5c3a..71d75d858de 100644 --- a/addons/base_report_designer/wizard/base_report_design_view.xml +++ b/addons/base_report_designer/wizard/base_report_design_view.xml @@ -42,7 +42,7 @@ <newline/> <field name="file_sxw_upload"/> <newline/> - <label colspan="4" string="This is the template of your requested report. Save it as a .SXW file and open it with OpenOffice. Don't forget to install the OpenERP SA OpenOffice package to modify it. 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. Save it as a .SXW file and open it with OpenOffice. Don't forget to install the Odoo SA OpenOffice package to modify it. Once it is modified, re-upload it in Odoo using this wizard." align="0.0"/> </group> </form> </field> diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index b5fa051a9b6..b661e9583ad 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -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> diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index a2d5fc8e0e9..35881da48bc 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -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 '') diff --git a/addons/contacts/contacts_view.xml b/addons/contacts/contacts_view.xml index 4908653aa2b..8f99805e0d0 100644 --- a/addons/contacts/contacts_view.xml +++ b/addons/contacts/contacts_view.xml @@ -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> diff --git a/addons/crm/base_partner_merge_view.xml b/addons/crm/base_partner_merge_view.xml index 27455223b4d..8bda9607e0a 100644 --- a/addons/crm/base_partner_merge_view.xml +++ b/addons/crm/base_partner_merge_view.xml @@ -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)]}"> diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml index df776f92350..71e21b3392d 100644 --- a/addons/crm/crm_demo.xml +++ b/addons/crm/crm_demo.xml @@ -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> diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 60dc307cc0f..f02f9305c4b 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -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 diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 4ab33502a3d..2448351040b 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -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 diff --git a/addons/crm/sales_team_view.xml b/addons/crm/sales_team_view.xml index bf094597854..5ff934e40bf 100644 --- a/addons/crm/sales_team_view.xml +++ b/addons/crm/sales_team_view.xml @@ -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 diff --git a/addons/crm/static/description/index.html b/addons/crm/static/description/index.html index 799dee38cf0..7a749cb14f5 100644 --- a/addons/crm/static/description/index.html +++ b/addons/crm/static/description/index.html @@ -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"> diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml index d0c9094aa63..83b6b03f355 100644 --- a/addons/crm_helpdesk/crm_helpdesk_demo.xml +++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml @@ -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=""Is there any link to download old versions of OpenERP?"" name="description"/> + <field name="name">Download old version of Odoo? </field> + <field eval=""Is there any link to download old versions of Odoo?"" 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=""How can I create new module in OpenERP?"" name="description"/> + <field eval=""How can I create new module in Odoo?"" name="description"/> </record> </data> </openerp> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 58b522d0dee..684c278a6a2 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -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. diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml index 8d1dbd81a9a..ec93e6f1be6 100644 --- a/addons/crm_profiling/crm_profiling_demo.xml +++ b/addons/crm_profiling/crm_profiling_demo.xml @@ -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> diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index ec7b13d123a..f837ebd09ef 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -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> diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py index 43c4dfcafb5..f2ca15b90cb 100644 --- a/addons/edi/models/edi.py +++ b/addons/edi/models/edi.py @@ -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_': } diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml index a12072e62d8..6f96dbbf43c 100644 --- a/addons/event/event_demo.xml +++ b/addons/event/event_demo.xml @@ -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> diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 73cbb7b0d1b..9433c0018e9 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -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> diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml index 9530ee0dd38..fd02739b68e 100644 --- a/addons/fleet/fleet_board_view.xml +++ b/addons/fleet/fleet_board_view.xml @@ -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> diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 8cda28d56a5..9c278b5f794 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -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> diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py index 7abef0faf8c..c787ddb43ce 100644 --- a/addons/google_calendar/google_calendar.py +++ b/addons/google_calendar/google_calendar.py @@ -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!')] diff --git a/addons/google_calendar/static/description/index.html b/addons/google_calendar/static/description/index.html index 745b825b309..24c5e8f4da2 100644 --- a/addons/google_calendar/static/description/index.html +++ b/addons/google_calendar/static/description/index.html @@ -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"> diff --git a/addons/google_calendar/static/src/js/calendar_sync.js b/addons/google_calendar/static/src/js/calendar_sync.js index fc05ca05ab0..4dc924fae61 100644 --- a/addons/google_calendar/static/src/js/calendar_sync.js +++ b/addons/google_calendar/static/src/js/calendar_sync.js @@ -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"){ diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py index 036b815648b..1a95a5ec1ee 100644 --- a/addons/google_drive/google_drive.py +++ b/addons/google_drive/google_drive.py @@ -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) diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml index 878274986d0..2320728192b 100644 --- a/addons/google_drive/res_config_user_view.xml +++ b/addons/google_drive/res_config_user_view.xml @@ -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> diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 0d287fcc645..5e081fab3bf 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -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 ) diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml index c9b784c485d..382cc4dbdc4 100644 --- a/addons/hr/hr_data.xml +++ b/addons/hr/hr_data.xml @@ -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> diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml index ce1b6c92e35..9b0ae2330c8 100644 --- a/addons/hr/hr_demo.xml +++ b/addons/hr/hr_demo.xml @@ -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 diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 0c356706407..a045baadfb7 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -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> diff --git a/addons/hr/static/description/index.html b/addons/hr/static/description/index.html index 55e54aa92fb..08ebd101d69 100644 --- a/addons/hr/static/description/index.html +++ b/addons/hr/static/description/index.html @@ -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"> diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index bd8fa81636b..5075cc13501 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -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"> diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml index 3475edab772..5d2987e2d05 100644 --- a/addons/hr_evaluation/hr_evaluation_installer.xml +++ b/addons/hr_evaluation/hr_evaluation_installer.xml @@ -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> diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index cf6e24c694b..7ec83cdb2a8 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -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> diff --git a/addons/hr_evaluation/survey_data_appraisal.xml b/addons/hr_evaluation/survey_data_appraisal.xml index d3f83f91ba5..d48326116c1 100644 --- a/addons/hr_evaluation/survey_data_appraisal.xml +++ b/addons/hr_evaluation/survey_data_appraisal.xml @@ -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. <li>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. <li>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.</p></field> <field name="survey_id" ref="opinion_form" /> <field name="sequence">1</field> <field name="description"><h2>At the supervisor's appraisal date</h2> -<p>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...</p> -<p>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.</p> +<p>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...</p> +<p>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.</p> <p>The appraiser should rate the employee's major work accomplishments and performance according to the metric provided below <ol> <li>Significantly exceeds standards and expectations required of the position</li> diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 3877a8edd42..8e91312c9d4 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -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. diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 21cbe50dee2..414b45adf5b 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -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."), diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index bb3b7a5a93f..5ee1ec8f7c2 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -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> diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml index 4cc17ae098f..4c0dd875e1f 100644 --- a/addons/hr_recruitment/hr_recruitment_menu.xml +++ b/addons/hr_recruitment/hr_recruitment_menu.xml @@ -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. diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index b626edfde51..21c4af24223 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -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. diff --git a/addons/hr_timesheet/hr_timesheet_installer.xml b/addons/hr_timesheet/hr_timesheet_installer.xml index 927ff2f2f40..3ee9f3bbd56 100644 --- a/addons/hr_timesheet/hr_timesheet_installer.xml +++ b/addons/hr_timesheet/hr_timesheet_installer.xml @@ -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> diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 101423d007c..fc0cd4ff7a1 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -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> diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index d42012a6124..bc06ed16ee2 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -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 diff --git a/addons/hw_posbox_homepage/controllers/main.py b/addons/hw_posbox_homepage/controllers/main.py index bab94be060c..6cf639348bf 100644 --- a/addons/hw_posbox_homepage/controllers/main.py +++ b/addons/hw_posbox_homepage/controllers/main.py @@ -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> diff --git a/addons/hw_posbox_upgrade/controllers/main.py b/addons/hw_posbox_upgrade/controllers/main.py index 21245a57f0a..0947fbc8564 100644 --- a/addons/hw_posbox_upgrade/controllers/main.py +++ b/addons/hw_posbox_upgrade/controllers/main.py @@ -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(){ diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py index e52c20d5039..d3dde7b1b0f 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -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; diff --git a/addons/hw_scale/controllers/main.py b/addons/hw_scale/controllers/main.py index 161a7896b38..fcfa6ede536 100644 --- a/addons/hw_scale/controllers/main.py +++ b/addons/hw_scale/controllers/main.py @@ -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 diff --git a/addons/hw_scanner/controllers/main.py b/addons/hw_scanner/controllers/main.py index a0f225ab42f..237b301bb0e 100644 --- a/addons/hw_scanner/controllers/main.py +++ b/addons/hw_scanner/controllers/main.py @@ -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 diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index a234dc5b180..2670a44ec33 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -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 = {} diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py index 257347071e2..fdba030fb7c 100644 --- a/addons/l10n_be_invoice_bba/invoice.py +++ b/addons/l10n_be_invoice_bba/invoice.py @@ -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):
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index d61c883f447..707ba6f5589 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -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> diff --git a/addons/mail/data/mail_group_demo_data.xml b/addons/mail/data/mail_group_demo_data.xml index a6879c52a1a..fbd0e03c3b1 100644 --- a/addons/mail/data/mail_group_demo_data.xml +++ b/addons/mail/data/mail_group_demo_data.xml @@ -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"/> diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index 60ca6c99daf..2a8bf60666e 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -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)", diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py index 2c94b432dc3..bac956a3d77 100644 --- a/addons/mail/res_config.py +++ b/addons/mail/res_config.py @@ -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): diff --git a/addons/mail/static/description/index.html b/addons/mail/static/description/index.html index aa55e63008d..2abaf66c26e 100644 --- a/addons/mail/static/description/index.html +++ b/addons/mail/static/description/index.html @@ -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&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"> diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py index e3dbdf4adc0..601dc483dfc 100755 --- a/addons/mail/static/scripts/openerp_mailgate.py +++ b/addons/mail/static/scripts/openerp_mailgate.py @@ -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() diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml index a7b1a8bce0c..5f116cac945 100644 --- a/addons/marketing_campaign/marketing_campaign_demo.xml +++ b/addons/marketing_campaign/marketing_campaign_demo.xml @@ -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"/> diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 738cea46f2a..1ba5621ff0a 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -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> diff --git a/addons/marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml b/addons/marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml index 1f1df2c713e..1661b34da77 100644 --- a/addons/marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml +++ b/addons/marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml @@ -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> diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml index bdcbb984193..70a236399db 100644 --- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml +++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml @@ -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=""""OpenERP OnDemand Free Trial 2010"""" name="name"/> + <field eval=""""Odoo OnDemand Free Trial 2010"""" name="name"/> <field eval=""""[]"""" name="domain"/> <field name="parent_id" ref="document_directory_marketingcampaign"/> <field eval=""""ressource"""" 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"><p>Hello,</p> - <p>Thanks for the genuine interest you have shown in OpenERP.</p> + <p>Thanks for the genuine interest you have shown in Odoo.</p> <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p></field> - <field name="name">For OpenERP OnDemand Free Trial 2010</field> + <p>Regards,Odoo Team,</p></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"><p>Hello,</p> <p>We have very good offer that might suit you. - We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p> + We suggest you subscribe to the Odoo Discovery Day on May 2010.</p> <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p></field> - <field name="name">For OpenERP Discovery Day on May 2010</field> + <p>Regards,Odoo Team,</p></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"><p>Hello,</p> - <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p> + <p>Thanks for showing interest and for subscribing to the Odoo Discovery Day.</p> <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p></field> - <field name="name">For OpenERP Discovery Day</field> + <p>Regards,Odoo Team,</p></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"><p>Hello,</p> - <p>Thanks for showing interest and buying the OpenERP book.</p> + <p>Thanks for showing interest and buying the Odoo book.</p> If any further information required kindly revert back. - <p>Regards,OpenERP Team,</p></field> - <field name="name">For OpenERP book</field> + <p>Regards,Odoo Team,</p></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"><p>Hello,</p> <p>We have very good offer that might suit you. For our gold partners,We are arranging free technical training on june,2010.</p> <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p></field> + <p>Regards,Odoo Team,</p></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"><p>Hello,</p> <p>We have very good offer that might suit you. For our silver partners,We are paid technical training on june,2010.</p> <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p></field> + <p>Regards,Odoo Team,</p></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"><p>Hello,</p> <p>We have very good offer that might suit you. For our silver partners, we are offering Gold partnership.</p> <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p></field> + <p>Regards,Odoo Team,</p></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"><p>Hello,</p> <p>Thanks for showing interest and for subscribing to technical training.</p> If any further information required kindly revert back.I really appreciate your co-operation on this.</p> <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p></field> + <p>Regards,Odoo Team,</p></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"/> diff --git a/addons/mass_mailing/static/description/index.html b/addons/mass_mailing/static/description/index.html index 49f4d99e80f..5ad1e48858d 100644 --- a/addons/mass_mailing/static/description/index.html +++ b/addons/mass_mailing/static/description/index.html @@ -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> diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml index 52940fe39ee..6e333c76680 100644 --- a/addons/mrp/mrp_data.xml +++ b/addons/mrp/mrp_data.xml @@ -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> diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 17cba90224a..73b139605e0 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -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> diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index 70baf1b4f6f..0071784eed4 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -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> """ diff --git a/addons/mrp/static/description/index.html b/addons/mrp/static/description/index.html index d6524b6e554..29db2866536 100644 --- a/addons/mrp/static/description/index.html +++ b/addons/mrp/static/description/index.html @@ -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"> diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml index bcc4fc54870..a0a125f051d 100644 --- a/addons/mrp_operations/report/mrp_code_barcode.rml +++ b/addons/mrp_operations/report/mrp_code_barcode.rml @@ -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> diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml index 6d52cbcd070..2f9174e85b4 100644 --- a/addons/mrp_operations/report/mrp_wc_barcode.rml +++ b/addons/mrp_operations/report/mrp_wc_barcode.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <document filename="test.pdf"> -<template pageSize="(550,280)" title="WC" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<template pageSize="(550,280)" title="WC" author="Odoo (sales@odoo.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/> </pageTemplate> diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index d532c3e3e91..6287fd2286d 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -3,7 +3,7 @@ <data noupdate="1"> <!-- Partner --> <record id="res_partner_oerp_editor" model="res.partner"> - <field name="name">OpenERP Editor</field> + <field name="name">Odoo Editor</field> <field name="street">Plot No 61- Sector 8</field> <field name="city">Faridabad (Delhi- NCR)</field> <field name="zip">121006</field> @@ -12,7 +12,7 @@ <field name="is_company" eval="1" /> </record> <record id="res_partner_oerp_us" model="res.partner"> - <field name="name">OpenERP US</field> + <field name="name">Odoo US</field> <field name="street">2035 N. Evergreen Terrace</field> <field name="street2">Arlington Heights</field> <field name="country_id" ref="base.us"/> @@ -20,7 +20,7 @@ <field name="is_company" eval="1" /> </record> <record id="res_partner_oerp_in" model="res.partner"> - <field name="name">OpenERP IN</field> + <field name="name">Odoo IN</field> <field name="street">Top Floor, Mehta Mahal,15</field> <field name="street2">Matthew Road, Opera House</field> <field name="city">Mumbai 27</field> @@ -30,7 +30,7 @@ <field name="is_company" eval="1" /> </record> <record id="res_partner_oerp_be" model="res.partner"> - <field name="name">OpenERP BE</field> + <field name="name">Odoo BE</field> <field name="street">Avenue de l'Artisanat 2</field> <field name="city">Braine-l'Alleud</field> <field name="zip">1420</field> @@ -54,25 +54,25 @@ <field name="partner_id" ref="res_partner_oerp_editor"/> <field name="parent_id" ref="base.main_company"/> <field name="currency_id" ref="base.EUR"/> - <field name="name">OpenERP Editor</field> + <field name="name">Odoo Editor</field> </record> <record id="res_company_oerp_us" model="res.company"> <field name="partner_id" ref="res_partner_oerp_us"/> <field name="parent_id" ref="res_company_oerp_editor"/> <field name="currency_id" ref="base.USD"/> - <field name="name">OpenERP US</field> + <field name="name">Odoo US</field> </record> <record id="res_company_oerp_be" model="res.company"> <field name="partner_id" ref="res_partner_oerp_be"/> <field name="parent_id" ref="res_company_oerp_editor"/> <field name="currency_id" ref="base.EUR"/> - <field name="name">OpenERP BE</field> + <field name="name">Odoo BE</field> </record> <record id="res_company_oerp_in" model="res.company"> <field name="partner_id" ref="res_partner_oerp_in"/> <field name="parent_id" ref="res_company_oerp_editor"/> <field name="currency_id" ref="base.EUR"/> - <field name="name">OpenERP IN</field> + <field name="name">Odoo IN</field> </record> <record id="res_company_odoo" model="res.company"> <field name="partner_id" ref="res_partner_odoo"/> @@ -135,10 +135,10 @@ <!-- Journals --> -<!--Journals for OpenERP IN--> +<!--Journals for Odoo IN--> <record id="sales_journal_multi_in" model="account.journal"> - <field name="name">Sales Journal - (OpenERP IN)</field> - <field name="code">SAJ-OpenERP IN</field> + <field name="name">Sales Journal - (Odoo IN)</field> + <field name="code">SAJ-Odoo IN</field> <field name="type">sale</field> <field name="sequence_id" ref="account.sequence_sale_journal"/> <field name="default_credit_account_id" ref="account.a_sale"/> @@ -149,8 +149,8 @@ </record> <record id="refund_sales_journal_multi_in" model="account.journal"> - <field name="name">Sales Credit Note Journal - (OpenERP IN)</field> - <field name="code">SCNJ-OpenERP IN</field> + <field name="name">Sales Credit Note Journal - (Odoo IN)</field> + <field name="code">SCNJ-Odoo IN</field> <field name="type">sale_refund</field> <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> <field name="default_credit_account_id" ref="account.a_sale"/> @@ -161,8 +161,8 @@ </record> <record id="expenses_journal_multi_in" model="account.journal"> - <field name="name">Expenses Journal - (OpenERP IN)</field> - <field name="code">EXJ-OpenERP IN</field> + <field name="name">Expenses Journal - (Odoo IN)</field> + <field name="code">EXJ-Odoo IN</field> <field name="type">purchase</field> <field name="sequence_id" ref="account.sequence_purchase_journal"/> <field name="default_debit_account_id" ref="account.a_expense"/> @@ -173,8 +173,8 @@ </record> <record id="refund_expenses_journal_multi_in" model="account.journal"> - <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field> - <field name="code">ECNJ-OpenERP IN</field> + <field name="name">Expenses Credit Notes Journal - (Odoo IN)</field> + <field name="code">ECNJ-Odoo IN</field> <field name="type">purchase_refund</field> <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> <field name="default_debit_account_id" ref="account.a_expense"/> @@ -185,8 +185,8 @@ </record> <record id="bank_journal_multi_in" model="account.journal"> - <field name="name">Bank Journal - (OpenERP IN)</field> - <field name="code">BNK-OpenERP IN</field> + <field name="name">Bank Journal - (Odoo IN)</field> + <field name="code">BNK-Odoo IN</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_bank_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -197,8 +197,8 @@ </record> <record id="check_journal_multi_in" model="account.journal"> - <field name="name">Checks Journal - (OpenERP IN)</field> - <field name="code">CHK-OpenERP IN</field> + <field name="name">Checks Journal - (Odoo IN)</field> + <field name="code">CHK-Odoo IN</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_check_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -209,8 +209,8 @@ </record> <record id="cash_journal_multi_in" model="account.journal"> - <field name="name">Cash Journal - (OpenERP IN)</field> - <field name="code">CSH-OpenERP IN</field> + <field name="name">Cash Journal - (Odoo IN)</field> + <field name="code">CSH-Odoo IN</field> <field name="type">cash</field> <field name="sequence_id" ref="account.sequence_cash_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -220,10 +220,10 @@ <field name="company_id" ref="res_company_oerp_in"/> </record> -<!-- Journals for OpenERP US--> +<!-- Journals for Odoo US--> <record id="sales_journal_multi_us" model="account.journal"> - <field name="name">Sales Journal - (OpenERP US)</field> - <field name="code">SAJ-OpenERP US</field> + <field name="name">Sales Journal - (Odoo US)</field> + <field name="code">SAJ-Odoo US</field> <field name="type">sale</field> <field name="sequence_id" ref="account.sequence_sale_journal"/> <field name="default_credit_account_id" ref="account.a_sale"/> @@ -234,8 +234,8 @@ </record> <record id="refund_sales_journal_multi_us" model="account.journal"> - <field name="name">Sales Credit Note Journal - (OpenERP US)</field> - <field name="code">SCNJ-OpenERP US</field> + <field name="name">Sales Credit Note Journal - (Odoo US)</field> + <field name="code">SCNJ-Odoo US</field> <field name="type">sale_refund</field> <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> <field name="default_credit_account_id" ref="account.a_sale"/> @@ -246,8 +246,8 @@ </record> <record id="expenses_journal_multi_us" model="account.journal"> - <field name="name">Expenses Journal - (OpenERP US)</field> - <field name="code">EXJ-OpenERP US</field> + <field name="name">Expenses Journal - (Odoo US)</field> + <field name="code">EXJ-Odoo US</field> <field name="type">purchase</field> <field name="sequence_id" ref="account.sequence_purchase_journal"/> <field name="default_debit_account_id" ref="account.a_expense"/> @@ -258,8 +258,8 @@ </record> <record id="refund_expenses_journal_multi_us" model="account.journal"> - <field name="name">Expenses Credit Notes Journal - (OpenERP US)</field> - <field name="code">ECNJ-OpenERP US</field> + <field name="name">Expenses Credit Notes Journal - (Odoo US)</field> + <field name="code">ECNJ-Odoo US</field> <field name="type">purchase_refund</field> <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> <field name="default_debit_account_id" ref="account.a_expense"/> @@ -270,8 +270,8 @@ </record> <record id="bank_journal_multi_us" model="account.journal"> - <field name="name">Bank Journal - (OpenERP US)</field> - <field name="code">BNK-OpenERP US</field> + <field name="name">Bank Journal - (Odoo US)</field> + <field name="code">BNK-Odoo US</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_bank_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -282,8 +282,8 @@ </record> <record id="check_journal_multi_us" model="account.journal"> - <field name="name">Checks Journal - (OpenERP US)</field> - <field name="code">CHK-OpenERP US</field> + <field name="name">Checks Journal - (Odoo US)</field> + <field name="code">CHK-Odoo US</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_check_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -294,8 +294,8 @@ </record> <record id="cash_journal_multi_us" model="account.journal"> - <field name="name">Cash Journal - (OpenERP US)</field> - <field name="code">CSH-OpenERP US</field> + <field name="name">Cash Journal - (Odoo US)</field> + <field name="code">CSH-Odoo US</field> <field name="type">cash</field> <field name="sequence_id" ref="account.sequence_cash_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -305,11 +305,11 @@ <field name="company_id" ref="res_company_oerp_us"/> </record> -<!-- Journals for OpenERP BE--> +<!-- Journals for Odoo BE--> <record id="sales_journal_multi_be" model="account.journal"> - <field name="name">Sales Journal - (OpenERP BE)</field> - <field name="code">SAJ-OpenERP BE</field> + <field name="name">Sales Journal - (Odoo BE)</field> + <field name="code">SAJ-Odoo BE</field> <field name="type">sale</field> <field name="sequence_id" ref="account.sequence_sale_journal"/> <field name="default_credit_account_id" ref="account.a_sale"/> @@ -320,8 +320,8 @@ </record> <record id="refund_sales_journal_multi_be" model="account.journal"> - <field name="name">Sales Credit Note Journal - (OpenERP BE)</field> - <field name="code">SCNJ-OpenERP BE</field> + <field name="name">Sales Credit Note Journal - (Odoo BE)</field> + <field name="code">SCNJ-Odoo BE</field> <field name="type">sale_refund</field> <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> <field name="default_credit_account_id" ref="account.a_sale"/> @@ -332,8 +332,8 @@ </record> <record id="expenses_journal_multi_be" model="account.journal"> - <field name="name">Expenses Journal - (OpenERP BE)</field> - <field name="code">EXJ-OpenERP BE</field> + <field name="name">Expenses Journal - (Odoo BE)</field> + <field name="code">EXJ-Odoo BE</field> <field name="type">purchase</field> <field name="sequence_id" ref="account.sequence_purchase_journal"/> <field name="default_debit_account_id" ref="account.a_expense"/> @@ -344,8 +344,8 @@ </record> <record id="refund_expenses_journal_multi_be" model="account.journal"> - <field name="name">Expenses Credit Notes Journal - (OpenERP BE)</field> - <field name="code">ECNJ-OpenERP BE</field> + <field name="name">Expenses Credit Notes Journal - (Odoo BE)</field> + <field name="code">ECNJ-Odoo BE</field> <field name="type">purchase_refund</field> <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> <field name="default_debit_account_id" ref="account.a_expense"/> @@ -356,8 +356,8 @@ </record> <record id="bank_journal_multi_be" model="account.journal"> - <field name="name">Bank Journal - (OpenERP BE)</field> - <field name="code">BNK-OpenERP BE</field> + <field name="name">Bank Journal - (Odoo BE)</field> + <field name="code">BNK-Odoo BE</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_bank_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -368,8 +368,8 @@ </record> <record id="check_journal_multi_be" model="account.journal"> - <field name="name">Checks Journal - (OpenERP BE)</field> - <field name="code">CHK-OpenERP BE</field> + <field name="name">Checks Journal - (Odoo BE)</field> + <field name="code">CHK-Odoo BE</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_check_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -380,8 +380,8 @@ </record> <record id="cash_journal_multi_be" model="account.journal"> - <field name="name">Cash Journal - (OpenERP BE)</field> - <field name="code">CSH-OpenERP BE</field> + <field name="name">Cash Journal - (Odoo BE)</field> + <field name="code">CSH-Odoo BE</field> <field name="type">cash</field> <field name="sequence_id" ref="account.sequence_cash_journal"/> <field name="default_debit_account_id" ref="account.cash"/> @@ -512,7 +512,7 @@ </data> <data noupdate="1"> <record id="multi_company_default_productopenerpus0" model="multi_company.default"> - <field name="name">Product OpenERP US</field> + <field name="name">Product Odoo US</field> <field eval="1" name="sequence"/> <field name="company_id" ref="multi_company.res_company_oerp_us"/> <field name="object_id" ref="product.model_product_template"/> @@ -522,7 +522,7 @@ </data> <data noupdate="1"> <record id="multi_company_default_productopenerpbe0" model="multi_company.default"> - <field name="name">Product OpenERP BE</field> + <field name="name">Product Odoo BE</field> <field eval="1" name="sequence"/> <field name="company_id" ref="multi_company.res_company_oerp_be"/> <field name="object_id" ref="product.model_product_template"/> @@ -532,7 +532,7 @@ </data> <data noupdate="1"> <record id="multi_company_default_productopenerpin0" model="multi_company.default"> - <field name="name">Product OpenERP IN</field> + <field name="name">Product Odoo IN</field> <field eval="1" name="sequence"/> <field name="company_id" ref="multi_company.res_company_oerp_in"/> <field name="object_id" ref="product.model_product_template"/> @@ -542,7 +542,7 @@ </data> <data noupdate="1"> <record id="multi_company_default_partneropenerpeditor0" model="multi_company.default"> - <field name="name">Partner OpenERP Editor</field> + <field name="name">Partner Odoo Editor</field> <field eval="1" name="sequence"/> <field name="company_id" ref="multi_company.res_company_oerp_editor"/> <field name="object_id" ref="base.model_res_partner"/> diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml index 26255238aeb..2b94f6c0afc 100644 --- a/addons/note/note_demo.xml +++ b/addons/note/note_demo.xml @@ -106,7 +106,7 @@ </record> <record id="note_12" model="note.note"> - <field name="memo"><![CDATA[<b>Read some documentation about OpenERP before diving into the code</b> + <field name="memo"><![CDATA[<b>Read some documentation about Odoo before diving into the code</b> <br/><br/>* Open ERP: a modern approach to integrated business management <br/>* Open ERP for Retail and Industrial Management ]]> diff --git a/addons/note/static/description/index.html b/addons/note/static/description/index.html index b9a60d3735d..cc59bf3cd0c 100644 --- a/addons/note/static/description/index.html +++ b/addons/note/static/description/index.html @@ -57,7 +57,7 @@ Quickly create to-dos, organize horizontally for the mid-term (today, this week, <h2 class="oe_slogan">Adapts to Your Creative Process</h2> <h3 class="oe_slogan">Customize to your own workflow</h3> <p> -Everyone has their own way to organize activities. OpenERP Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes. +Everyone has their own way to organize activities. Odoo Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes. </p> <img class="oe_picture oe_screenshot" src="notes_sc_03.png"> diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 5c8103c7626..09ebde71f65 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -63,7 +63,7 @@ class pos_config(osv.osv): help="Accounting journal used to post sales entries."), 'currency_id' : fields.function(_get_currency, type="many2one", string="Currency", relation="res.currency"), 'iface_self_checkout' : fields.boolean('Self Checkout Mode', - help="Check this if this point of sale should open by default in a self checkout mode. If unchecked, OpenERP uses the normal cashier mode by default."), + help="Check this if this point of sale should open by default in a self checkout mode. If unchecked, Odoo uses the normal cashier mode by default."), 'iface_cashdrawer' : fields.boolean('Cashdrawer', help="Automatically open the cashdrawer"), 'iface_payment_terminal' : fields.boolean('Payment Terminal', help="Enables Payment Terminal integration"), 'iface_electronic_scale' : fields.boolean('Electronic Scale', help="Enables Electronic Scale integration"), @@ -78,7 +78,7 @@ class pos_config(osv.osv): 'state' : fields.selection(POS_CONFIG_STATE, 'Status', required=True, readonly=True, copy=False), 'sequence_id' : fields.many2one('ir.sequence', 'Order IDs Sequence', readonly=True, - help="This sequence is automatically created by OpenERP but you can change it "\ + help="This sequence is automatically created by Odoo but you can change it "\ "to customize the reference numbers of your orders.", copy=False), 'session_ids': fields.one2many('pos.session', 'config_id', 'Sessions'), 'group_by' : fields.boolean('Group Journal Items', help="Check this if you want to group the Journal Items by Product while closing a Session"), diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml index 1cc69dd5f75..3f8016ffe05 100644 --- a/addons/point_of_sale/point_of_sale_data.xml +++ b/addons/point_of_sale/point_of_sale_data.xml @@ -40,7 +40,7 @@ <field name="subtype_id" ref="mail.mt_comment"/> <field name="subject">Point of Sale application installed!</field> <field name="body"><![CDATA[<p>Record sale orders, register payments, compute change to return, create invoices, and manage refunds through a specific web touch-screen interface.</p> -<p>If you install the PoS proxy you will be able to interface OpenERP with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</p>]]></field> +<p>If you install the PoS proxy you will be able to interface Odoo with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</p>]]></field> </record> </data> </openerp> diff --git a/addons/point_of_sale/static/description/index.html b/addons/point_of_sale/static/description/index.html index cecafc69b68..0460ef8935d 100644 --- a/addons/point_of_sale/static/description/index.html +++ b/addons/point_of_sale/static/description/index.html @@ -14,7 +14,7 @@ </div> <div class="oe_span6"> <p class='oe_mt32'> - OpenERP's Point of Sale introduces a super clean interface with no installation required + Odoo's Point of Sale introduces a super clean interface with no installation required that runs online and offline on modern hardwares. </p> <p> @@ -40,7 +40,7 @@ <div class="oe_span4"> <h3>In your web browser</h3> <p> - OpenERP's POS is a web application that can run on any device that can + Odoo's POS is a web application that can run on any device that can display websites with little to no setup required. </p> </div> @@ -66,7 +66,7 @@ <div class="oe_row"> <h2 class="oe_slogan">Online and Offline</h2> - <h3 class="oe_slogan">OpenERP's POS stays reliable even if your connection isn't</h3> + <h3 class="oe_slogan">Odoo's POS stays reliable even if your connection isn't</h3> <div class="oe_span6"> <div class="oe_bg_img"> @@ -103,7 +103,7 @@ <img class="oe_picture oe_screenshot" src="pos_ui_03.png"> <h3>Simple and beautifull</h3> <p> - Say goodbye to ugly, outdated POS software and enjoy the OpenERP + Say goodbye to ugly, outdated POS software and enjoy the Odoo web interface designed for modern retailer. </p> </div> @@ -172,7 +172,7 @@ <div class='oe_span6'> <p> Produce customer invoices in just a few clicks. Control sales and - cash in real time and use OpenERP's powerful reporting to make + cash in real time and use Odoo's powerful reporting to make smarter decisions to improve your store's efficiency. </p><p> No more hassle of having to integrate softwares: get all your sales @@ -216,7 +216,7 @@ required to pilot a global strategy amongst all your stores. </p> <p> - With OpenERP as a backend, you have a system proven to be perfectly + With Odoo as a backend, you have a system proven to be perfectly suitable for small stores or large multinationals. </p> </div> @@ -233,7 +233,7 @@ as they make buying decisions, in store or online. </p> <p> - With OpenERP, you get a 360° customer view, including cross-channel sales, + With Odoo, you get a 360° customer view, including cross-channel sales, interaction history, profiles, and more. </p> </div> diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py index 8d446571480..a687c224778 100644 --- a/addons/portal/wizard/portal_wizard.py +++ b/addons/portal/wizard/portal_wizard.py @@ -30,7 +30,7 @@ _logger = logging.getLogger(__name__) # welcome email sent to portal users # (note that calling '_' has no effect except exporting those strings for translation) -WELCOME_EMAIL_SUBJECT = _("Your OpenERP account at %(company)s") +WELCOME_EMAIL_SUBJECT = _("Your Odoo account at %(company)s") WELCOME_EMAIL_BODY = _("""Dear %(name)s, You have been given access to %(company)s's %(portal)s. @@ -46,7 +46,7 @@ You can set or change your password via the following url: %(welcome_message)s -- -OpenERP - Open Source Business Applications +Odoo - Open Source Business Applications http://www.openerp.com """) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 2848858a088..d9053cbd60b 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -111,7 +111,7 @@ class procurement_order(osv.osv): 'origin': fields.char('Source Document', help="Reference of the document that created this Procurement.\n" - "This is automatically completed by OpenERP."), + "This is automatically completed by Odoo."), 'company_id': fields.many2one('res.company', 'Company', required=True), # These two fields are used for shceduling diff --git a/addons/product_email_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml index edf2d8d5841..d9ac11c917d 100644 --- a/addons/product_email_template/data/product_demo.xml +++ b/addons/product_email_template/data/product_demo.xml @@ -13,7 +13,7 @@ <div style="height:auto;text-left: center;font-size : 16px;color: #646464;margin-top:30px;margin-left:15px;margin-right:5px;"> These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live - sessions by our senior instructors. At the end of the training, you can pass the OpenERP Certification exam in one of the 5000+ + sessions by our senior instructors. At the end of the training, you can pass the Odoo Certification exam in one of the 5000+ Pearson VUE test centers worldwide. </div> <div style="height: auto;margin-top:30px;margin-bottom:10px;margin-left:20px;color: #646464;font-size:16px;"> @@ -23,7 +23,7 @@ <li>New interactive learning experience</li> <li>Lower training budget for the same quality courses</li> <li>Better comfort to facilitate your learning process</li> - <li>OpenERP <a href="https://www.openerp.com/certification">Certification Exam</a> included (Pre-Ordered, available as of November 1st, 2013)</li> + <li>Odoo <a href="https://www.openerp.com/certification">Certification Exam</a> included (Pre-Ordered, available as of November 1st, 2013)</li> </ul> </div> <hr color="DCDCFB"/> @@ -50,8 +50,8 @@ <div style="height:auto;text-align: left;font-size : 14px;color: #646464;margin-top:10px;margin-left:15px;"> The 5-day training is modular, which means that you can choose to participate in the full training or to just 1 or 2 modules. Nevertheless, <b>the first day of the training is compulsory</b> for everyone. The Monday is compulsory because the - introduction of OpenERP is important before going through the other modules.<br/><br/> - Each day of the week starts from 9 AM (CEST/PST) to 12 PM (CEST/PST). A Q&A session will be hosted by an OpenERP trainer. + introduction of Odoo is important before going through the other modules.<br/><br/> + Each day of the week starts from 9 AM (CEST/PST) to 12 PM (CEST/PST). A Q&A session will be hosted by an Odoo trainer. Each day, the participants are expected to have done the following <b>BEFORE</b> attending the Q&A session: <ul> <li>Watch the videos for this day</li> @@ -63,7 +63,7 @@ <b>Q&A session is not to cover questions related to a specific implementation project </b>or company-specific business workflows. The <b>questions should be about the material covered in the videos </b>and the exercises and should benefit the other participants of the training as well.<br/> - Each day of the week is dedicated to specific applications in OpenERP as per the following planning: + Each day of the week is dedicated to specific applications in Odoo as per the following planning: <ul style="color: #6d57e0"> <li> <strong><a href="https://www.openerp.com/online-training#Monday" style="text-decoration:none;" target=_new>Monday: </a></strong> @@ -133,8 +133,8 @@ <tr style="text-align: left;font-size : 16px;color: #646464;"> <td style="width:50%;"> <ul> - <li>OpenERP’s architecture</li> - <li>How to create an OpenERP Online instance</li> + <li>Odoo’s architecture</li> + <li>How to create an Odoo Online instance</li> <li>List and form views, search and filter features</li> <li>Tooltips and drill-downs</li> <li>Advanced navigation</li> @@ -143,7 +143,7 @@ </ul> </td> <td style="width:50%;"> - The introduction exercises have been created to help you discover OpenERP in an easy way. Their main objective is to present the different applications, menus, view types, shortcuts, field types, wizards, actions, etc. It will help you to discover how to navigate in OpenERP!<br/></br> + The introduction exercises have been created to help you discover Odoo in an easy way. Their main objective is to present the different applications, menus, view types, shortcuts, field types, wizards, actions, etc. It will help you to discover how to navigate in Odoo!<br/></br> Therefore, the Introduction is compulsory for everyone, even if you need to learn a specific module given on an other date. This obligation has been made to make sure that you are not lost if you arrive in the middle of the training for another module. </td> </tr> @@ -213,7 +213,7 @@ </ul> </td> <td style="width:50%;"> - OpenERP can work with independent applications, so the + Odoo can work with independent applications, so the whole commercial process can be integrated together in order to accomplish complete business flows. </td> @@ -422,7 +422,7 @@ </ul> </td> <td style="width:50%;"> - OpenERP Warehouse Management is at once very simple, flexible and complete. It is based on the concept of double entry that revolutionized accounting: ‘Nothing lost, everything moved’. In OpenERP, we don’t talk about disappearance, consumption or loss of products: instead we speak only of stock moves from one place to another. + Odoo Warehouse Management is at once very simple, flexible and complete. It is based on the concept of double entry that revolutionized accounting: ‘Nothing lost, everything moved’. In Odoo, we don’t talk about disappearance, consumption or loss of products: instead we speak only of stock moves from one place to another. </td> </tr> </table> @@ -484,9 +484,9 @@ </td> <td style="width:50%;"> <ul> - <li>Transfer data from one system to OpenERP.</li> + <li>Transfer data from one system to Odoo.</li> </ul> - OpenERP offers a simple way to import and export data. OpenERP will guide you for this phase thanks to a FAQ directly integrated into the import screen + Odoo offers a simple way to import and export data. Odoo will guide you for this phase thanks to a FAQ directly integrated into the import screen </td> </tr> </table> @@ -540,7 +540,7 @@ </ul> </td> <td style="width:50%;"> - OpenERP POS is the first POS running in a 100% web based environment, which means any computer with a browser can host the POS. The POS is a two-part system with a front-end (interaction with the client) and a back-end (managers can configure the system, print reports, analyse, ...)<br/><br/> + Odoo POS is the first POS running in a 100% web based environment, which means any computer with a browser can host the POS. The POS is a two-part system with a front-end (interaction with the client) and a back-end (managers can configure the system, print reports, analyse, ...)<br/><br/> <strong>About the front-end:</strong> <ul> <li>Offline mode. Imagine several cases were having an offline mode is of prime interest: Connexion to server shutdown at a big supermarket / Use in environments that requires mobility but without wifi / Use in large environments like restaurants and gardens / Use in low tech environments</li> @@ -570,7 +570,7 @@ </ul> </td> <td style="width:50%;"> - This features will help you to fully customize the standard documents made from OpenERP. + This features will help you to fully customize the standard documents made from Odoo. </td> </tr> </table> @@ -612,7 +612,7 @@ <table cellspacing="5"> <tr> <td> - With the live sessions, we learned a lot more than what was covered in the videos. Definitely a good start for building up a solid base of working knowledge of OpenERP. + With the live sessions, we learned a lot more than what was covered in the videos. Definitely a good start for building up a solid base of working knowledge of Odoo. </td> <td> The trainer did a wonderful job with the training! He was well informed and interactive online and offline. Thank you so much for the experience! diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index ee0d6a0e9df..e48c2e61d97 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -61,7 +61,7 @@ <field name="search_view_id" ref="view_task_search_form"/> <field name="help" type="html"> <p> - OpenERP's project management allows you to manage the pipeline + Odoo's project management allows you to manage the pipeline of tasks in order to get things done efficiently. You can track progress, discuss on tasks, attach documents, etc. </p> @@ -627,7 +627,7 @@ <field name="search_view_id" ref="view_task_search_form"/> <field name="help" type="html"> <p> - OpenERP's project management allows you to manage the pipeline + Odoo's project management allows you to manage the pipeline of tasks in order to get things done efficiently. You can track progress, discuss on tasks, attach documents, etc. </p> diff --git a/addons/project/static/description/index.html b/addons/project/static/description/index.html index cd8deb1d0ec..1a4806d06ff 100644 --- a/addons/project/static/description/index.html +++ b/addons/project/static/description/index.html @@ -12,7 +12,7 @@ </div> <div class="oe_span6"> <p class='oe_mt32'> -OpenERP's collaborative and realtime project management helps your team get +Odoo's collaborative and realtime project management helps your team get work done. Keep track of everything, from the big picture to the minute details, from the customer contract to the billing. </p> @@ -167,7 +167,7 @@ accurate reports on your team's performance. <div class="oe_span6"> <div class="oe_quote"> <q> - OpenERP provides essential platform for our project management. + Odoo provides essential platform for our project management. Things are better organized and much more visible with it. </q> <cite class="oe_cite oe_clearfix"> diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index 308b4884844..26981256c7f 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -15,7 +15,7 @@ <field name="search_view_id" ref="view_project_issue_filter"/> <field name="help" type="html"> <p> - The OpenERP issues tacker allows you to efficiantly manage things + The Odoo issues tacker allows you to efficiantly manage things like internal requests, software development bugs, customer complaints, project troubles, material breakdowns, etc. </p> diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 1047fef10e6..502598193a6 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -266,7 +266,7 @@ </field> <field name="help" type="html"> <p> - The OpenERP issues tacker allows you to efficiantly manage things + The Odoo issues tacker allows you to efficiantly manage things like internal requests, software development bugs, customer complaints, project troubles, material breakdowns, etc. </p> @@ -340,7 +340,7 @@ <field name="view_mode">kanban,tree,form,calendar,graph</field> <field name="help" type="html"> <p> - The OpenERP issues tacker allows you to efficiantly manage things + The Odoo issues tacker allows you to efficiantly manage things like internal requests, software development bugs, customer complaints, project troubles, material breakdowns, etc. </p> diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml index 8cc354160f4..bd0afbd982d 100644 --- a/addons/purchase/partner_view.xml +++ b/addons/purchase/partner_view.xml @@ -62,7 +62,7 @@ Supplier invoices can be pre-generated based on purchase orders or receipts. This allows you to control invoices you receive from your supplier according to the draft - document in OpenERP. + document in Odoo. </p> </field> </record> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 16b763d299c..8402f9965f5 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -108,7 +108,7 @@ Click to create a draft invoice. </p><p> Use this menu to control the invoices to be received from your - supplier. OpenERP generates draft invoices from your purchase + supplier. Odoo generates draft invoices from your purchase orders or receipts, according to your settings. </p><p> Once you receive a supplier invoice, you can match it with the @@ -382,7 +382,7 @@ quotation is converted into a purchase order. </p><p> Most propositions of purchase orders are created automatically - by OpenERP based on inventory needs. + by Odoo based on inventory needs. </p> </field> </record> diff --git a/addons/purchase/static/description/index.html b/addons/purchase/static/description/index.html index 37101b93554..c165adf5e0c 100644 --- a/addons/purchase/static/description/index.html +++ b/addons/purchase/static/description/index.html @@ -85,7 +85,7 @@ Integrate all supplier's communications on the purchase orders (or RfQs) to get </div> <div class="oe_span6"> <p class="oe_mt32"> -Use the costing method that reflects your business: standard price, average price, fifo or lifo. Get your accounting entries and the right inventory valuation in real-time; OpenERP manages everything for you, transparently. +Use the costing method that reflects your business: standard price, average price, fifo or lifo. Get your accounting entries and the right inventory valuation in real-time; Odoo manages everything for you, transparently. </p> </div> </div> diff --git a/addons/report/controllers/main.py b/addons/report/controllers/main.py index 01992d64c60..cdb38d4a115 100644 --- a/addons/report/controllers/main.py +++ b/addons/report/controllers/main.py @@ -134,7 +134,7 @@ class ReportController(Controller): se = _serialize_exception(e) error = { 'code': 200, - 'message': "OpenERP Server Error", + 'message': "Odoo Server Error", 'data': se } return request.make_response(simplejson.dumps(error)) diff --git a/addons/report/models/report.py b/addons/report/models/report.py index 31286a0fc67..fbb8044f129 100644 --- a/addons/report/models/report.py +++ b/addons/report/models/report.py @@ -60,7 +60,7 @@ else: wkhtmltopdf_state = 'ok' if config['workers'] == 1: - _logger.info('You need to start OpenERP with at least two workers to print a pdf version of the reports.') + _logger.info('You need to start Odoo with at least two workers to print a pdf version of the reports.') wkhtmltopdf_state = 'workers' diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml index e689cac1476..bebd02c6246 100644 --- a/addons/sale/res_partner_view.xml +++ b/addons/sale/res_partner_view.xml @@ -12,7 +12,7 @@ <p class="oe_view_nocontent_create"> Click to create a quotation or sales order for this customer. </p><p> - OpenERP will help you efficiently handle the complete sale flow: + Odoo will help you efficiently handle the complete sale flow: quotation, sales order, delivery, invoicing and payment. </p><p> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 3946ff7b91f..b2c89ef8c21 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -284,7 +284,7 @@ Click to create a quotation that can be converted into a sales order. </p><p> - OpenERP will help you efficiently handle the complete sales flow: + Odoo will help you efficiently handle the complete sales flow: quotation, sales order, delivery, invoicing and payment. </p> </field> @@ -328,7 +328,7 @@ <p class="oe_view_nocontent_create"> Click to create a quotation, the first step of a new sale. </p><p> - OpenERP will help you handle efficiently the complete sale flow: + Odoo will help you handle efficiently the complete sale flow: from the quotation to the sales order, the delivery, the invoicing and the payment collection. </p><p> @@ -598,7 +598,7 @@ Click to create a quotation that can be converted into a sales order. </p><p> - OpenERP will help you efficiently handle the complete sales flow: + Odoo will help you efficiently handle the complete sales flow: quotation, sales order, delivery, invoicing and payment. </p> </field> @@ -623,7 +623,7 @@ <p class="oe_view_nocontent_create"> Click to create a quotation, the first step of a new sale. </p><p> - OpenERP will help you handle efficiently the complete sale flow: + Odoo will help you handle efficiently the complete sale flow: from the quotation to the sales order, the delivery, the invoicing and the payment collection. </p><p> diff --git a/addons/sale/static/description/index.html b/addons/sale/static/description/index.html index 0896f0483d9..ddcde0ef085 100644 --- a/addons/sale/static/description/index.html +++ b/addons/sale/static/description/index.html @@ -108,7 +108,7 @@ breadcrumb: quotations, invoices, emails, meetings. <div class="oe_span6"> <p class='oe_mt32'> Whether you invoice based on time and materials, on delivery - orders or fixed price; OpenERP supports all possible methods. + orders or fixed price; Odoo supports all possible methods. </p> <p class='oe_mt32'> Get recurring invoices produced automatically, create advances @@ -149,7 +149,7 @@ managers get alerts before contracts have to be renewed. <p class='oe_mt32'> The chatter feature enables you to communicate faster and more efficiently with your customer. This takes place directly on a quotation or sale order from -within OpenERP or via email. +within Odoo or via email. </p> <p class='oe_mt32'> Get all the negotiations and discussions attached to the right document @@ -248,7 +248,7 @@ applied automatically for all your sales teams. <div class="oe_span6"> <div class="oe_quote"> <q> - OpenERP proved to be an effective tool to sustain our operations + Odoo proved to be an effective tool to sustain our operations for the bright future. It's stable, robust and easy. </q> <cite class="oe_cite oe_clearfix"> @@ -261,7 +261,7 @@ applied automatically for all your sales teams. <div class="oe_span6"> <div class="oe_quote"> <q> - OpenERP is a great tool to drive sales. We manage our prospects in different stages + Odoo is a great tool to drive sales. We manage our prospects in different stages to get a proper overview of our success rate. </q> <cite class="oe_cite oe_clearfix"> diff --git a/addons/sales_team/sales_team.py b/addons/sales_team/sales_team.py index ed3a3876231..e18cc3213e1 100644 --- a/addons/sales_team/sales_team.py +++ b/addons/sales_team/sales_team.py @@ -72,7 +72,7 @@ class crm_case_section(osv.osv): 'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."), 'user_id': fields.many2one('res.users', 'Team Leader'), 'member_ids': fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'), - 'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"), + 'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Odoo about cases in this sales team"), 'parent_id': fields.many2one('crm.case.section', 'Parent Team'), 'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'), 'note': fields.text('Description'), diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 2ef0531c046..79511c8af9c 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -822,7 +822,7 @@ class share_wizard(osv.TransientModel): if wizard_data.message: body += "%s\n\n" % (wizard_data.message) if result_line.newly_created: - body += _("The documents are not attached, you can view them online directly on my OpenERP server at:\n %s\n\n") % (result_line.share_url) + body += _("The documents are not attached, you can view them online directly on my Odoo server at:\n %s\n\n") % (result_line.share_url) body += _("These are your credentials to access this protected area:\n") body += "%s: %s" % (_("Username"), result_line.user_id.login) + "\n" body += "%s: %s" % (_("Password"), result_line.password) + "\n" @@ -830,7 +830,7 @@ class share_wizard(osv.TransientModel): body += _("The documents have been automatically added to your subscriptions.\n\n") body += '%s\n\n' % ((user.signature or '')) body += "--\n" - body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n" + body += _("Odoo is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n" "It is open source and can be found on http://www.openerp.com.") msg_id = message_obj.schedule_with_attach(cr, uid, user.email, [email_to], subject, body, model='', context=context) notification_obj.create(cr, uid, {'user_id': result_line.user_id.id, 'message_id': msg_id}, context=context) @@ -851,7 +851,7 @@ class share_wizard(osv.TransientModel): subject = wizard_data.name body = _("Hello,\n\n") body += _("I've shared %s with you!\n\n") % wizard_data.name - body += _("The documents are not attached, you can view them online directly on my OpenERP server at:\n %s\n\n") % (result_line.share_url) + body += _("The documents are not attached, you can view them online directly on my Odoo server at:\n %s\n\n") % (result_line.share_url) if wizard_data.message: body += '%s\n\n' % (wizard_data.message) if result_line.newly_created: @@ -860,11 +860,11 @@ class share_wizard(osv.TransientModel): body += "%s: %s\n" % (_("Password"), result_line.password) body += "%s: %s\n" % (_("Database"), cr.dbname) else: - body += _("The documents have been automatically added to your current OpenERP documents.\n") + body += _("The documents have been automatically added to your current Odoo documents.\n") body += _("You may use your current login (%s) and password to view them.\n") % result_line.user_id.login body += "\n\n%s\n\n" % ( (user.signature or '') ) body += "--\n" - body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n" + body += _("Odoo is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n" "It is open source and can be found on http://www.openerp.com.") mail_ids.append(mail_mail.create(cr, uid, { 'email_from': user.email, diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py index 59b383b80e9..31807d59c0a 100644 --- a/addons/stock/report/stock_graph.py +++ b/addons/stock/report/stock_graph.py @@ -31,7 +31,7 @@ class stock_graph(object): def __init__(self, io): self._datas = {} self._canvas = canvas.init(fname=io, format='pdf') - self._canvas.set_author("OpenERP") + self._canvas.set_author("Odoo") self._canvas.set_title("Stock Level Forecast") self._names = {} self.val_min = '' diff --git a/addons/stock/static/description/index.html b/addons/stock/static/description/index.html index 6a197b154bc..7961f608070 100644 --- a/addons/stock/static/description/index.html +++ b/addons/stock/static/description/index.html @@ -14,7 +14,7 @@ </div> <div class="oe_span6"> <p class='oe_mt32'> -Decrease your process times, automate transactions, reduce your stock levels and get complete traceability on all operations with the OpenERP double entry inventory system. +Decrease your process times, automate transactions, reduce your stock levels and get complete traceability on all operations with the Odoo double entry inventory system. </p> <div class="oe_centeralign oe_websiteonly"> <a href="http://www.openerp.com/start?app=stock" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a> @@ -29,7 +29,7 @@ Decrease your process times, automate transactions, reduce your stock levels and <h3 class="oe_slogan">Nothing is lost, everything is moved</h3> <div class="oe_span6"> <p class='oe_mt32'> -Based on the concept of double entry that revolutionized accounting, OpenERP's +Based on the concept of double entry that revolutionized accounting, Odoo's inventory management isn't about consumption, loss or missing products; products are just moved from one location to another. </p><p> @@ -69,7 +69,7 @@ delivery orders, internal controls, etc. <h3 class="oe_slogan">Decrease your process time</h3> <div class="oe_span6"> <p class='oe_mt32'> -OpenERP prepares all operations for you, according to your own logistic rules: +Odoo prepares all operations for you, according to your own logistic rules: routes, waves, removal/put away strategies, minimum stock rules, etc. Optimizes the planning and jobs with the scheduler to reduce your process time. </p> @@ -133,7 +133,7 @@ system help you with fullfilment propositions. </div> <div class="oe_span6"> <p class='oe_mt32'> -Get your procurements accurate as the OpenERP WMS is fully integrated with +Get your procurements accurate as the Odoo WMS is fully integrated with sales and purchases for accurate forecasts. The accounting integration allows real time accounting valuation and deeper reporting on costs and revenues on your inventory operations. @@ -149,7 +149,7 @@ your inventory operations. <div class="oe_span6"> <p class='oe_mt32'> Assign serial numbers at every step of your reception or delivery flow. -OpenERP handles unique serial numbers, batches of identical products or packaging units. +Odoo handles unique serial numbers, batches of identical products or packaging units. </p> </div> <div class="oe_span6"> @@ -171,10 +171,10 @@ OpenERP handles unique serial numbers, batches of identical products or packagin <div class="oe_span6"> <p class='oe_mt32'> Manage your own internal and external locations, customers, suppliers or -manufacturing inventories with the OpenERP multi-warehouse management system +manufacturing inventories with the Odoo multi-warehouse management system based on a hierarchical location structure. </p><p> -OpenERP's Warehouse Management is designed to scale from a few thousands +Odoo's Warehouse Management is designed to scale from a few thousands operations to several millions of transactions. </p> </div> @@ -227,7 +227,7 @@ delivery process. Define custom routes or use pre-configured routes, e.g.: pick <div class="oe_span6"> <p class='oe_mt32'> Use routes, waves and orderpoint rules to optimize the way you pick products in -the warehouse. OpenERP supports most picking methods out-of-the-box like; wave +the warehouse. Odoo supports most picking methods out-of-the-box like; wave picking, batch picking and "by order" picking. </p> </div> @@ -327,7 +327,7 @@ efficiently incoming materials. <div class="oe_span6"> <div class="oe_quote"> <q> - We saved hundreds of thousands of dollars with OpenERP. + We saved hundreds of thousands of dollars with Odoo. </q> <cite class="oe_cite oe_clearfix"> <img class="oe_photo" src="Didier-Georgieff.jpg"> diff --git a/addons/stock/stock.py b/addons/stock/stock.py index a87c2d59082..c8661a4ce0d 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1890,7 +1890,7 @@ class stock_move(osv.osv): warning.update({ 'title': _('Information'), 'message': _("By changing this quantity here, you accept the " - "new quantity as complete: OpenERP will not " + "new quantity as complete: Odoo will not " "automatically generate a back order.")}) break @@ -3975,10 +3975,10 @@ class stock_warehouse_orderpoint(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type', '=', 'product')]), 'product_uom': fields.related('product_id', 'uom_id', type='many2one', relation='product.uom', string='Product Unit of Measure', readonly=True, required=True), 'product_min_qty': fields.float('Minimum Quantity', required=True, - help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\ + help="When the virtual stock goes below the Min Quantity specified for this field, Odoo generates "\ "a procurement to bring the forecasted quantity to the Max Quantity."), 'product_max_qty': fields.float('Maximum Quantity', required=True, - help="When the virtual stock goes below the Min Quantity, OpenERP generates "\ + help="When the virtual stock goes below the Min Quantity, Odoo generates "\ "a procurement to bring the forecasted quantity to the Quantity specified as Max Quantity."), 'qty_multiple': fields.integer('Qty Multiple', required=True, help="The procurement quantity will be rounded up to this multiple."), diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index b53f922e5e0..43e8c893be4 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -482,15 +482,15 @@ Click to add a location. </p><p> Define your locations to reflect your warehouse structure and - organization. OpenERP is able to manage physical locations + organization. Odoo is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. </p><p> - Every stock operation in OpenERP moves the products from one + Every stock operation in Odoo moves the products from one location to another one. For instance, if you receive products - from a supplier, OpenERP will move products from the Supplier + from a supplier, Odoo will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations. </p> @@ -885,7 +885,7 @@ <p class="oe_view_nocontent_create"> Click to create a stock operation. </p><p> - Most operations are prepared automatically by OpenERP according + Most operations are prepared automatically by Odoo according to your preconfigured logistics rules, but you can also record manual stock movements. </p> @@ -1507,7 +1507,7 @@ <field name="help" type="html"> <p class="oe_view_nocontent_create"> Click to add a reordering rule. - </p><p>You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or request for quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity.</p> + </p><p>You can define your minimum stock rules, so that Odoo will automatically create draft manufacturing orders or request for quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, Odoo will generate a procurement request to increase the stock up to the maximum quantity.</p> </field> </record> diff --git a/addons/survey/data/survey_demo_feedback.xml b/addons/survey/data/survey_demo_feedback.xml index 7b59bde24e4..b577b0bd053 100644 --- a/addons/survey/data/survey_demo_feedback.xml +++ b/addons/survey/data/survey_demo_feedback.xml @@ -12,7 +12,7 @@ </record> <!-- Page 1 --> <record model="survey.page" id="feedback_1"> - <field name="title">About your OpenERP usage</field> + <field name="title">About your Odoo usage</field> <field name="survey_id" ref="feedback_form" /> <field name="sequence">1</field> <field name="description"><p></p></field> @@ -20,7 +20,7 @@ <record model="survey.question" id="feedback_1_1"> <field name="page_id" ref="feedback_1" /> <field name="sequence">1</field> - <field name="question">Are you using OpenERP on a daily basis?</field> + <field name="question">Are you using Odoo on a daily basis?</field> <field name="type">simple_choice</field> <field name="display_mode">dropdown</field> <field name="constr_mandatory" eval="True" /> @@ -38,7 +38,7 @@ <record model="survey.label" id="choice_1_1_3"> <field name="question_id" ref="feedback_1_1"/> <field name="sequence">3</field> - <field name="value">Yes, I use the online version of OpenERP</field> + <field name="value">Yes, I use the online version of Odoo</field> </record> <record model="survey.label" id="choice_1_1_4"> <field name="question_id" ref="feedback_1_1"/> @@ -88,7 +88,7 @@ <field name="title">Ergonomy and ease of use</field> <field name="survey_id" ref="feedback_form" /> <field name="sequence">2</field> - <field name="description"><p>These questions relate to the ergonomy and ease of use of OpenERP. Try to remind your firsts days on OpenERP and + <field name="description"><p>These questions relate to the ergonomy and ease of use of Odoo. Try to remind your firsts days on Odoo and what have been your difficulties.</p></field> </record> <record model="survey.question" id="feedback_2_1"> @@ -132,7 +132,7 @@ what have been your difficulties.</p></field> <record model="survey.label" id="frow_2_1_3"> <field name="question_id_2" ref="feedback_2_1"/> <field name="sequence">3</field> - <field name="value">I use the contextual help in OpenERP</field> + <field name="value">I use the contextual help in Odoo</field> </record> <record model="survey.label" id="frow_2_1_4"> <field name="question_id_2" ref="feedback_2_1"/> @@ -147,7 +147,7 @@ what have been your difficulties.</p></field> <record model="survey.question" id="feedback_2_2"> <field name="page_id" ref="feedback_2" /> <field name="sequence">2</field> - <field name="question">What do you think about the process views of OpenERP, available in the web client ?</field> + <field name="question">What do you think about the process views of Odoo, available in the web client ?</field> <field name="type">matrix</field> <field name="matrix_subtype">simple</field> <field name="constr_mandatory" eval="True" /> @@ -175,7 +175,7 @@ what have been your difficulties.</p></field> <record model="survey.label" id="frow_2_2_1"> <field name="question_id_2" ref="feedback_2_2"/> <field name="sequence">1</field> - <field name="value">They help new users to understand OpenERP</field> + <field name="value">They help new users to understand Odoo</field> </record> <record model="survey.label" id="frow_2_2_2"> <field name="question_id_2" ref="feedback_2_2"/> @@ -361,7 +361,7 @@ what have been your difficulties.</p></field> <record model="survey.question" id="feedback_3_1"> <field name="page_id" ref="feedback_3" /> <field name="sequence">1</field> - <field name="question">How do you contribute or plan to contribute to OpenERP?</field> + <field name="question">How do you contribute or plan to contribute to Odoo?</field> <field name="type">multiple_choice</field> <field name="column_nb">6</field> <field name="constr_mandatory" eval="True" /> @@ -408,7 +408,7 @@ what have been your difficulties.</p></field> <field name="title">Questions for developers</field> <field name="survey_id" ref="feedback_form" /> <field name="sequence">4</field> - <field name="description"><p>If you do not contribute or develop in OpenERP, skip this page.</p></field> + <field name="description"><p>If you do not contribute or develop in Odoo, skip this page.</p></field> </record> <record model="survey.question" id="feedback_4_1"> <field name="page_id" ref="feedback_4" /> @@ -420,7 +420,7 @@ what have been your difficulties.</p></field> <record model="survey.label" id="choice_4_1_1"> <field name="question_id" ref="feedback_4_1"/> <field name="sequence">1</field> - <field name="value">I use Launchpad, like all official OpenERP projects</field> + <field name="value">I use Launchpad, like all official Odoo projects</field> </record> <record model="survey.label" id="choice_4_1_2"> <field name="question_id" ref="feedback_4_1"/> diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 16c245fc31a..5c812e5139c 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -70,7 +70,7 @@ def serialize_exception(f): se = _serialize_exception(e) error = { 'code': 200, - 'message': "OpenERP Server Error", + 'message': "Odoo Server Error", 'data': se } return werkzeug.exceptions.InternalServerError(simplejson.dumps(error)) diff --git a/addons/web/doc/_templates/sidebarintro.html b/addons/web/doc/_templates/sidebarintro.html index ecd51980e58..bbe4c472607 100644 --- a/addons/web/doc/_templates/sidebarintro.html +++ b/addons/web/doc/_templates/sidebarintro.html @@ -1,16 +1,16 @@ -<p class="logo"><a href="http://doc.openerp.com/"> +<p class="logo"><a href="https://doc.odoo.com/"> <img class="logo" src="{{ pathto('_static/openerp.png', 1) }}" alt="Logo"/> </a></p> <h3>Other Docs</h3> <ul> - <li><a href="http://doc.openerp.com/trunk/developers">OpenERP Developers Documentation</a></li> - <li><a href="http://doc.openerp.com/trunk/developers/server">OpenERP Server Developers Documentation</a></li> - <li><a href="http://doc.openerp.com/trunk/users">OpenERP Users Documentation</a></li> + <li><a href="https://doc.odoo.com/trunk">Odoo Developers Documentation</a></li> + <li><a href="https://doc.odoo.com/trunk/server">Odoo Server Developers Documentation</a></li> + <li><a href="https://doc.odoo.com/book">Odoo Users Documentation</a></li> </ul> <h3>Useful Links</h3> <ul> - <li><a href="http://www.openerp.com/">The OpenERP website</a></li> + <li><a href="https://www.odoo.com/">The Odoo website</a></li> <li><a href="http://python.org/">The Python programming language</a></li> </ul> diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index f5f8129d502..b035b220f28 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -252,7 +252,7 @@ instance.web.CrashManager = instance.web.Class.extend({ return; } if (error.data.name === "openerp.http.SessionExpiredException" || error.data.name === "werkzeug.exceptions.Forbidden") { - this.show_warning({type: "Session Expired", data: { message: _t("Your OpenERP session expired. Please refresh the current web page.") }}); + this.show_warning({type: "Session Expired", data: { message: _t("Your Odoo session expired. Please refresh the current web page.") }}); return; } if (error.data.exception_type === "except_osv" || error.data.exception_type === "warning" || error.data.exception_type === "access_error") { @@ -270,7 +270,7 @@ instance.web.CrashManager = instance.web.Class.extend({ } new instance.web.Dialog(this, { size: 'medium', - title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"), + title: "Odoo " + (_.str.capitalize(error.type) || "Warning"), buttons: [ {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }} ], @@ -285,7 +285,7 @@ instance.web.CrashManager = instance.web.Class.extend({ this.parents('.modal').modal('hide'); }; new instance.web.Dialog(this, { - title: "OpenERP " + _.str.capitalize(error.type), + title: "Odoo " + _.str.capitalize(error.type), buttons: buttons }, QWeb.render('CrashManager.error', {session: instance.session, error: error})).open(); }, @@ -337,7 +337,7 @@ instance.web.RedirectWarningHandler = instance.web.Dialog.extend(instance.web.Ex new instance.web.Dialog(this, { size: 'medium', - title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"), + title: "Odoo " + (_.str.capitalize(error.type) || "Warning"), buttons: [ {text: _t("Ok"), click: function() { self.$el.parents('.modal').modal('hide'); self.destroy();}}, {text: error.data.arguments[2], @@ -1190,7 +1190,7 @@ instance.web.WebClient = instance.web.Client.extend({ this._current_state = null; this.menu_dm = new instance.web.DropMisordered(); this.action_mutex = new $.Mutex(); - this.set('title_part', {"zopenerp": "OpenERP"}); + this.set('title_part', {"zopenerp": "Odoo"}); }, start: function() { var self = this; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 2cce789480c..1b04e554431 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -85,7 +85,7 @@ </div> </div> <p class="oe_grey" style="margin: 10px"> - Fill in this form to create an OpenERP database. You can + Fill in this form to create an Odoo database. You can create databases for different companies or for different goals (testing, production). Once the database is created, you will be able to install your first application. @@ -112,7 +112,7 @@ <td class="oe_form_group_cell"> <span class="oe_form_field oe_form_field_boolean oe_grey" > <input type="checkbox" name="demo_data" /> - Check this box to evaluate OpenERP. + Check this box to evaluate Odoo. </span> </td> </tr> @@ -371,8 +371,8 @@ <h3>Version <t t-esc="version_info.server_version"/></h3> <div class="oe_bottom"> - <p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br /> - OpenERP is a trademark of the <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">OpenERP SA Company</a>.</p> + <p>Copyright © 2004-TODAY Odoo SA. All Rights Reserved.<br /> + Odoo is a trademark of the <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">OpenERP SA Company</a>.</p> <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a></p> <p>For more information visit <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo.com</a></p> </div> diff --git a/addons/web/static/test/fulltest.html b/addons/web/static/test/fulltest.html index 47972dece90..e08d57d4210 100644 --- a/addons/web/static/test/fulltest.html +++ b/addons/web/static/test/fulltest.html @@ -2,7 +2,7 @@ <html style="height: 100%"> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>OpenERP Web Full Stack</title> + <title>Odoo Web Full Stack</title> <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css"> diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 984937698ce..bdb1ed5c162 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -123,7 +123,7 @@ <head> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>OpenERP</title> + <title>Odoo</title> <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> <link rel="stylesheet" href="/web/static/src/css/full.css" /> <t t-raw="head or ''"/> @@ -260,7 +260,7 @@ <a class="oe_login_manage_db" t-attf-href="/web/database/manager{{ '?debug' if debug else '' }}">Manage Databases</a> <span class="oe_footer_seperator"> | </span> </t> - <a href="http://www.openerp.com" target="_blank">Powered by <span>OpenERP</span></a> + <a href="https://www.odoo.com" target="_blank">Powered by <span>Odoo</span></a> </div> </div> </t> @@ -323,7 +323,7 @@ <head> <meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>OpenERP Web Tests</title> + <title>Odoo Web Tests</title> <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css"/> diff --git a/addons/web_api/static/src/example.html b/addons/web_api/static/src/example.html index 5408b1de36c..25ad8eaf297 100644 --- a/addons/web_api/static/src/example.html +++ b/addons/web_api/static/src/example.html @@ -13,7 +13,7 @@ border: 1px solid black; margin:0;padding:8px; } </style> - <title>OpenERP web_api example</title> + <title>Odoo web_api example</title> <script type="text/javascript" src="/web/webclient/js"></script> <script type="text/javascript"> $(function() { @@ -25,7 +25,7 @@ </script> </head> <body> - <h1>OpenERP web_api test</h1> + <h1>Odoo web_api test</h1> <h2>Example: Load the content of ir.model <button>Run it !</button></h2> <pre> <script type="text/javascript" src="/web/webclient/js"></script> diff --git a/addons/website/data/demo.xml b/addons/website/data/demo.xml index 63900506741..55feac2bd5d 100644 --- a/addons/website/data/demo.xml +++ b/addons/website/data/demo.xml @@ -3,10 +3,10 @@ <data> <record id="default_website" model="website"> - <field name="social_twitter">https://twitter.com/openerp</field> - <field name="social_facebook">https://www.facebook.com/OpenERP</field> - <field name="social_googleplus">https://plus.google.com/+openerp</field> - <field name="social_linkedin">http://www.linkedin.com/company/openerp</field> + <field name="social_twitter">https://twitter.com/odooapps</field> + <field name="social_facebook">https://www.facebook.com/Odoo</field> + <field name="social_googleplus">https://plus.google.com/+Odooapps</field> + <field name="social_linkedin">http://www.linkedin.com/company/odoo</field> </record> <record id="base.main_company" model="res.company"> diff --git a/addons/website/static/description/index.html b/addons/website/static/description/index.html index 57393345bb6..f84f65309ee 100644 --- a/addons/website/static/description/index.html +++ b/addons/website/static/description/index.html @@ -31,7 +31,7 @@ <h3 class="oe_slogan">What You See Is What You Get. Really!</h3> <div class="oe_span6"> <p class='oe_mt32'> - Create beautiful websites with no technical knowledge. OpenERP's unique + Create beautiful websites with no technical knowledge. Odoo's unique <em>'edit inline'</em> approach makes website creation surprisingly easy. No more complex backend; just click anywhere to change any content. @@ -58,7 +58,7 @@ </div> <div class="oe_span6"> <p class='oe_mt32'> - OpenERP's building blocks allow to design modern + Odoo's building blocks allow to design modern websites that are not possible with traditional WYSIWYG page editors. </p><p> @@ -82,7 +82,7 @@ references, blogs, etc. </p><p> Traditional eCommerce and CMS have poorly designed backends as it's not their - core focus. With the OpenERP integration, you benefit from the + core focus. With the Odoo integration, you benefit from the best management software to follow-up on your orders, your jobs applicants, your leads, etc. </p> @@ -148,7 +148,7 @@ <div class="oe_span6"> <p class='oe_mt32'> Get your website translated in multiple languages with no effort. - OpenERP proposes and propagates translations automatically + Odoo proposes and propagates translations automatically across pages, following what you edit on the master page. </p> Benefit from professional translators to translate all your @@ -164,7 +164,7 @@ <section class="oe_container oe_dark"> <div class="oe_row"> <h2 class="oe_slogan">Designer-Friendly Templates</h2> - <h3 class="oe_slogan">Designers love working on OpenERP</h3> + <h3 class="oe_slogan">Designers love working on Odoo</h3> <div class="oe_span6"> <p class='oe_mt32'> Templates are awesome and easy to design. You don't need to develop @@ -173,7 +173,7 @@ CSS. </p><p> Customize every page on the fly with the integrated template - editor. Distribute your work easily as an OpenERP module. + editor. Distribute your work easily as an Odoo module. </p> </div> <div class="oe_span6"> @@ -228,7 +228,7 @@ <section class="oe_container"> <div class="oe_row"> - <h2 class="oe_slogan">Integrated With OpenERP Apps</h2> + <h2 class="oe_slogan">Integrated With Odoo Apps</h2> <h3 class="oe_slogan oe_mb32">Get hundreds of open source apps for free</h3> <div class="oe_span4"> <a href="/apps/website_sale"> diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index cb0071a2ef8..0d7ae3e9821 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -35,7 +35,7 @@ <p> It might be possible to edit the relevant items or fix the issue in <a t-attf-href="#{backend_url}"> - the classic OpenERP interface</a>. + the classic Odoo interface</a>. </p> </section> </div> diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 9db068dc658..494673c93e5 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -35,7 +35,7 @@ </p> </div> <span class="carousel-img col-md-6 hidden-sm hidden-xs"> - <img class="carousel-image img-responsive" src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image"/> + <img class="carousel-image img-responsive" src="/website/static/src/img/banner/banner_picture.png" alt="Banner Odoo Image"/> </span> </div> </div> @@ -546,10 +546,10 @@ Point of Sale Questions <small>v7</small> </h2> <h3> - Which hardware does OpenERP POS support? + Which hardware does Odoo POS support? </h3> <p> - OpenERP's POS is a web application that can run on any device that + Odoo's POS is a web application that can run on any device that can display websites with little to no setup required. </p><p> The Point of Sale works perfectly on any kind of touch enabled @@ -610,7 +610,7 @@ <div class="col-md-4 col-md-offset-2 mt16 mb32"> <blockquote> <p> - OpenERP provides essential platform for our project management. + Odoo provides essential platform for our project management. Things are better organized and more visible with it. </p> <small>John Doe, CEO</small> @@ -674,7 +674,7 @@ <div class="row"> <blockquote class="mt48 mb16 col-md-4 col-md-offset-4"> <p> - OpenERP provides essential platform for our project management. + Odoo provides essential platform for our project management. Things are better organized and more visible with it. </p> <small>John Doe, CEO</small> @@ -803,7 +803,7 @@ <div class="row"> <blockquote class="mt48 mb16 col-md-4 col-md-offset-4"> <p> - OpenERP provides essential platform for our project management. + Odoo provides essential platform for our project management. Things are better organized and more visible with it. </p> <small>John Doe, CEO</small> diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml index efc25264633..03f3c13127d 100644 --- a/addons/website_blog/data/website_blog_data.xml +++ b/addons/website_blog/data/website_blog_data.xml @@ -4,7 +4,7 @@ <record id="blog_blog_1" model="blog.blog"> <field name="name">Our News</field> <field name="subtitle">Sharing our evolution with passion</field> - <field name="description">Presentation of new OpenERP features</field> + <field name="description">Presentation of new Odoo features</field> </record> <record id="menu_news" model="website.menu"> diff --git a/addons/website_blog/data/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml index d6827220414..4ba4e4eeeb2 100644 --- a/addons/website_blog/data/website_blog_demo.xml +++ b/addons/website_blog/data/website_blog_demo.xml @@ -14,11 +14,11 @@ <!-- POSTS --> <record id="blog_post_1" model="blog.post"> <field name="name">The Future of Emails</field> - <field name="subtitle">Ideas behing the OpenERP communication tools.</field> + <field name="subtitle">Ideas behing the Odoo communication tools.</field> <field name="blog_id" ref="blog_blog_1"/> <field name="tag_ids" eval="[(6, 0, [ref('blog_tag_1')])]"/> <field name="website_published" eval="True"/> - <field name="website_meta_keywords">OpenERP, email</field> + <field name="website_meta_keywords">Odoo, email</field> <field name="website_meta_description">The Future of Emails</field> <field name="background_image">/website_blog/static/src/img/post1.jpg</field> <field name="content"><![CDATA[ @@ -44,7 +44,7 @@ </section> <section class="mt16 mb16 readable"> <p> - At OpenERP, we build tools to bring productivity to + At Odoo, we build tools to bring productivity to enterprises. As emails and information flows are one of the biggest wastes of time in companies, we have to fix this. @@ -52,9 +52,9 @@ To disrupt emails, you need more than just another user interface. We need to rethink the whole communication flow. </p> - <h3>The Communication Mechanism of OpenERP</h3> + <h3>The Communication Mechanism of Odoo</h3> <p> - Here are the ideas behing the OpenERP communication tools: + Here are the ideas behing the Odoo communication tools: </p> <ul> <li> @@ -78,7 +78,7 @@ </li><li> A mix of push & pull: Today, people are victims of what others decide to push to them. - OpenERP differentiates: + Odoo differentiates: <ul> <li> Messages "for information": @@ -104,7 +104,7 @@ every message) </li><li> Folders and mailing lists are great tools but too - complex in traditional email clients. In OpenERP, a + complex in traditional email clients. In Odoo, a group of contacts that share a discussion can be created with one click. Every group should have it's own email address. @@ -132,7 +132,7 @@ New Features Launched </p> <p class="text-center"> - To add to an already comprehensive set of OpenERP + To add to an already comprehensive set of Odoo features, a website content management system (CMS or WMS) has been developed and a beta release is available from today, 31st January 2014. @@ -141,13 +141,13 @@ </section> <section class="readable"> <p> - OpenERP claims to be 'the Open Source software that makes + Odoo claims to be 'the Open Source software that makes building your company's website and selling your products online easy'. So how true is this statement? </p><p> - "OpenERP's latest launch will allow a business to go from + "Odoo's latest launch will allow a business to go from zero to trading online quicker than ever before,” Stuart - Mackintosh, MD of Open Source specialist and OpenERP + Mackintosh, MD of Open Source specialist and Odoo integration partner, OpusVL, explains. “The investment required to have a fully automated business system is dramatically reduced, enabling the small and medium @@ -163,11 +163,11 @@ </blockquote> <p> "This is another clever and highly disruptive move by - OpenERP,which will force other technology providers to + Odoo,which will force other technology providers to take another look at the value they are providing to ensure that their 'solutions' can still compete." </p><p> - "OpenERP now competes on many fronts, with no real + "Odoo now competes on many fronts, with no real competition out there to knock them off the top spot. With the launch of their integrated CMS and Ecommerce systems,it only elevates their position as one of the leading @@ -178,7 +178,7 @@ </p> <h4>Adding to industry leading technology</h4> <p> - Like many modern website editors, with OpenERP you can edit + Like many modern website editors, with Odoo you can edit content in-line, enabling you to see exactly what you are changing and ensure your changes suit the context. </p><p> diff --git a/addons/website_blog/static/description/index.html b/addons/website_blog/static/description/index.html index 6a1f940e405..4b099ebf316 100644 --- a/addons/website_blog/static/description/index.html +++ b/addons/website_blog/static/description/index.html @@ -11,7 +11,7 @@ </div> <div class="oe_span6"> <p class='oe_mt32'> - Express yourself with the OpenERP enterprise grade blogging + Express yourself with the Odoo enterprise grade blogging platform. Write beautiful blog posts, engage with visitors, translate content and moderate social streams. </p><p> @@ -115,11 +115,11 @@ <h3 class="oe_slogan">Get visibility on the impact of each blog post</h3> <div class="oe_span6"> <p class='oe_mt32'> - Get a clear visibility of your sales funnel. OpenERP's Google + Get a clear visibility of your sales funnel. Odoo's Google Analytics trackers are configured by default to track all kinds of events related to shopping carts, call-to-actions, etc. </p><p> - As OpenERP marketing tools (mass mailing, campaigns, etc) are also + As Odoo marketing tools (mass mailing, campaigns, etc) are also linked with Google Analytics, you get a 360° view of your business. </p> </div> @@ -141,7 +141,7 @@ <div class="oe_span6"> <p class='oe_mt32'> SEO tools are ready to use, with no configuration required. - OpenERP suggests keywords for your titles according to Google's + Odoo suggests keywords for your titles according to Google's most searched terms, Google Analytics tracks interests of your visitors, sitemaps are created automatically for quick Google indexing, etc. @@ -156,7 +156,7 @@ <section class="oe_container oe_dark"> <div class="oe_row"> <h2 class="oe_slogan">Designer-Friendly Themes</h2> - <h3 class="oe_slogan">Designers love working on OpenERP</h3> + <h3 class="oe_slogan">Designers love working on Odoo</h3> <div class="oe_span6"> <p class='oe_mt32'> Themes are awesome and easy to design. You don't need to develop @@ -192,7 +192,7 @@ process according to your needs. </p><p> Other access rights are related to business objects (products, people, - events, etc) and directly following OpenERP's standard access rights + events, etc) and directly following Odoo's standard access rights management, so you do not have to configure things twice. </p> </div> @@ -201,7 +201,7 @@ <section class="oe_container oe_dark"> <div class="oe_row"> - <h2 class="oe_slogan">Integrated With Others OpenERP Apps</h2> + <h2 class="oe_slogan">Integrated With Others Odoo Apps</h2> <h3 class="oe_slogan">Get hundreds of open source apps for free</h3> <div class="oe_span4"> <a href="/apps/website"> diff --git a/addons/website_crm/static/description/index.html b/addons/website_crm/static/description/index.html index 334e6932bf4..d580e4c9cde 100644 --- a/addons/website_crm/static/description/index.html +++ b/addons/website_crm/static/description/index.html @@ -13,7 +13,7 @@ <p class='oe_mt32'> This simple application integrates a contact form in your "Contact us" page. Forms submissions create leads automatically - in OpenERP CRM. + in Odoo CRM. </p> <div class="oe_centeralign oe_websiteonly"> <a href="http://www.openerp.com/start?app=website" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> website</a> diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml index 1b1576eef0c..f84e3dbe133 100644 --- a/addons/website_event/data/event_demo.xml +++ b/addons/website_event/data/event_demo.xml @@ -18,7 +18,7 @@ <h4>to learn .JS development</h4> </div> -<img class="carousel-image hidden-xs" alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png"> +<img class="carousel-image hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> </div> </div> </div> @@ -67,7 +67,7 @@ <div class="panel-heading text-center"> <h2 style="margin: 0">Day 2</h2> -<p class="text-muted" style="margin: 0">OpenERP Web Client</p> +<p class="text-muted" style="margin: 0">Odoo Web Client</p> </div> <ul class="list-group"><li class="list-group-item">Introduction to JQuery</li> @@ -135,7 +135,7 @@ <li>Participants preferably have a functional knowledge of our software (see Functional Training).</li> </ul><p></p> -<p>To get more information, visit the <a href="http://openerp.com/">OpenERP Official Website</a>.</p> +<p>To get more information, visit the <a href="http://openerp.com/">Odoo Official Website</a>.</p> </div> </div> </div> @@ -180,7 +180,7 @@ <h4>to learn .JS development</h4> </div> -<img class="carousel-image hidden-xs" alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png"> +<img class="carousel-image hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> </div> </div> </div> @@ -229,7 +229,7 @@ <div class="panel-heading text-center"> <h2 style="margin: 0">Day 2</h2> -<p class="text-muted" style="margin: 0">OpenERP Web Client</p> +<p class="text-muted" style="margin: 0">Odoo Web Client</p> </div> <ul class="list-group"><li class="list-group-item">Introduction to JQuery</li> @@ -297,7 +297,7 @@ <li>Participants preferably have a functional knowledge of our software (see Functional Training).</li> </ul><p></p> -<p>To get more information, visit the <a href="http://openerp.com/">OpenERP Official Website</a>.</p> +<p>To get more information, visit the <a href="http://openerp.com/">Odoo Official Website</a>.</p> </div> </div> </div> @@ -355,7 +355,7 @@ <h4>to learn .JS development</h4> </div> -<img class="carousel-image hidden-xs" alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png"> +<img class="carousel-image hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> </div> </div> </div> @@ -404,7 +404,7 @@ <div class="panel-heading text-center"> <h2 style="margin: 0">Day 2</h2> -<p class="text-muted" style="margin: 0">OpenERP Web Client</p> +<p class="text-muted" style="margin: 0">Odoo Web Client</p> </div> <ul class="list-group"><li class="list-group-item">Introduction to JQuery</li> @@ -472,7 +472,7 @@ <li>Participants preferably have a functional knowledge of our software (see Functional Training).</li> </ul><p></p> -<p>To get more information, visit the <a href="http://openerp.com/">OpenERP Official Website</a>.</p> +<p>To get more information, visit the <a href="http://openerp.com/">Odoo Official Website</a>.</p> </div> </div> </div> diff --git a/addons/website_event/static/description/index.html b/addons/website_event/static/description/index.html index 34669aa4da8..3a7b24219ae 100644 --- a/addons/website_event/static/description/index.html +++ b/addons/website_event/static/description/index.html @@ -12,7 +12,7 @@ <div class="oe_span6"> <p class='oe_mt32'> Organize, promote and sell events online. Whether you organize - meetings, conferences, trainings or webinars, OpenERP gives you + meetings, conferences, trainings or webinars, Odoo gives you all the features you need to manage your events. </p> <div class="oe_centeralign oe_websiteonly"> @@ -32,7 +32,7 @@ designed <em>'Building Blocks'</em>. Publish event photos, speakers, agenda, etc. </p><p> - OpenERP's unique <em>'edit inline'</em> approach makes website + Odoo's unique <em>'edit inline'</em> approach makes website creation surprisingly easy. "Want to introduce a speaker? to change the price of a ticket? to update a banner? promote sponsors?" just click and change. @@ -72,11 +72,11 @@ <h3 class="oe_slogan">Control your sales funnel with Google Analytics</h3> <div class="oe_span6"> <p class='oe_mt32'> - Get a clear visibility of your sales funnel. OpenERP's Google + Get a clear visibility of your sales funnel. Odoo's Google Analytics trackers are configured by default to track all kind of events related to shopping carts, call-to-actions, etc. </p><p> - As OpenERP marketing tools (mass mailing, campaigns, etc) are also + As Odoo marketing tools (mass mailing, campaigns, etc) are also linked with Google Analytics, you get a full view of your business. </p> </div> @@ -107,7 +107,7 @@ <section class="oe_container oe_dark"> <div class="oe_row"> <h2 class="oe_slogan">Designer-Friendly Themes</h2> - <h3 class="oe_slogan">Designers love working on OpenERP</h3> + <h3 class="oe_slogan">Designers love working on Odoo</h3> <div class="oe_span6"> <p class='oe_mt32'> Themes are awesome and easy to design. You don't need to develop @@ -139,7 +139,7 @@ <div class="oe_span6"> <p class='oe_mt32'> SEO tools are ready to use, with no configuration required. - OpenERP suggests keywords according to Google most searched + Odoo suggests keywords according to Google most searched terms, Google Analytics tracks your shopping cart events and sitemap are created automatically. </p><p> @@ -156,7 +156,7 @@ <h3 class="oe_slogan">Optimize: from Ads to Conversions</h3> <div class="oe_span6"> <p class='oe_mt32'> - Create new landing pages easily with the OpenERP inline edition + Create new landing pages easily with the Odoo inline edition feature. Send visitors of your different marketing campaigns to event landing pages to optimize conversions. </p> diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml index 784d962e471..4df98815c19 100644 --- a/addons/website_event_track/data/event_demo.xml +++ b/addons/website_event_track/data/event_demo.xml @@ -77,10 +77,10 @@ develops software to help develop websites. He sold his first company at 30 years old and manage to grow OpenCorp from 1 to 55 employees mostly by reselling services on - OpenERP. + Odoo. </p><p> Ayaan is the <b>author of several books</b>, including Amazon best seller - "How OpenERP will change the business world!". + "How Odoo will change the business world!". </p> </field> </record> diff --git a/addons/website_event_track/data/website_event_track_demo.xml b/addons/website_event_track/data/website_event_track_demo.xml index b54d114e127..3279cf80a5d 100644 --- a/addons/website_event_track/data/website_event_track_demo.xml +++ b/addons/website_event_track/data/website_event_track_demo.xml @@ -32,7 +32,7 @@ </record> <record id="event_track2" model="event.track"> - <field name="name">How to integrate hardware materials with the OpenERP point of sale.</field> + <field name="name">How to integrate hardware materials with the Odoo point of sale.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field> @@ -52,7 +52,7 @@ <field name="stage_id" ref="event_track_stage3"/> </record> <record id="event_track4" model="event.track"> - <field name="name">How to develop automated tests in the OpenERP web client.</field> + <field name="name">How to develop automated tests in the Odoo web client.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 9:00:00')"></field> @@ -62,7 +62,7 @@ <field name="stage_id" ref="event_track_stage4"/> </record> <record id="event_track5" model="event.track"> - <field name="name">The new way to promote your modules in the Apps platform and OpenERP website.</field> + <field name="name">The new way to promote your modules in the Apps platform and Odoo website.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:00:00')"></field> @@ -82,7 +82,7 @@ <field name="stage_id" ref="event_track_stage2"/> </record> <record id="event_track7" model="event.track"> - <field name="name">A technical explanation of OpenERP as a CMS and a eCommerce platform for version 8.</field> + <field name="name">A technical explanation of Odoo as a CMS and a eCommerce platform for version 8.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field> @@ -92,7 +92,7 @@ <field name="stage_id" ref="event_track_stage4"/> </record> <record id="event_track8" model="event.track"> - <field name="name">Discover OpenERP CRM: How to optimize your sales, from leads to sales orders.</field> + <field name="name">Discover Odoo CRM: How to optimize your sales, from leads to sales orders.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:00:00')"></field> @@ -103,7 +103,7 @@ <field name="stage_id" ref="event_track_stage3"/> </record> <record id="event_track9" model="event.track"> - <field name="name">How to use OpenERP for your HR process: recruitment, leaves management, appraisals, expenses, etc.</field> + <field name="name">How to use Odoo for your HR process: recruitment, leaves management, appraisals, expenses, etc.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="user_id" ref="base.user_root"/> @@ -125,7 +125,7 @@ <field name="stage_id" ref="event_track_stage1"/> </record> <record id="event_track11" model="event.track"> - <field name="name">Discover OpenERP Point-of-Sale: Your shop ready to use in 30 minutes.</field> + <field name="name">Discover Odoo Point-of-Sale: Your shop ready to use in 30 minutes.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field> @@ -135,7 +135,7 @@ <field name="stage_id" ref="event_track_stage2"/> </record> <record id="event_track12" model="event.track"> - <field name="name">Manage your events with OpenERP, the new training modules.</field> + <field name="name">Manage your events with Odoo, the new training modules.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 11:00:00')"></field> @@ -165,7 +165,7 @@ <field name="stage_id" ref="event_track_stage5"/> </record> <record id="event_track15" model="event.track"> - <field name="name">OpenERP Mobile for Notes, Meetings and Messages.</field> + <field name="name">Odoo Mobile for Notes, Meetings and Messages.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field> @@ -175,7 +175,7 @@ <field name="stage_id" ref="event_track_stage4"/> </record> <record id="event_track16" model="event.track"> - <field name="name">OpenERP as your Enterprise Social Network.</field> + <field name="name">Odoo as your Enterprise Social Network.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 11:00:00')"></field> @@ -185,7 +185,7 @@ <field name="stage_id" ref="event_track_stage3"/> </record> <record id="event_track17" model="event.track"> - <field name="name">The Art of Making an OpenERP Demo.</field> + <field name="name">The Art of Making an Odoo Demo.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:00:00')"></field> @@ -195,7 +195,7 @@ <field name="stage_id" ref="event_track_stage2"/> </record> <record id="event_track18" model="event.track"> - <field name="name">How to build your marketing strategy for the purpose of generating leads with OpenERP.</field> + <field name="name">How to build your marketing strategy for the purpose of generating leads with Odoo.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field> @@ -206,7 +206,7 @@ <field name="stage_id" ref="event_track_stage4"/> </record> <record id="event_track19" model="event.track"> - <field name="name">Advanced lead management with OpenERP: tips and tricks from the fields</field> + <field name="name">Advanced lead management with Odoo: tips and tricks from the fields</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 9:00:00')"></field> @@ -227,7 +227,7 @@ <field name="stage_id" ref="event_track_stage2"/> </record> <record id="event_track21" model="event.track"> - <field name="name">Recruiting high skilled talents with OpenERP HR apps</field> + <field name="name">Recruiting high skilled talents with Odoo HR apps</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field> @@ -247,7 +247,7 @@ <field name="stage_id" ref="event_track_stage1"/> </record> <record id="event_track23" model="event.track"> - <field name="name">Key Success factors selling OpenERP.</field> + <field name="name">Key Success factors selling Odoo.</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 7:00:00')"></field> @@ -277,7 +277,7 @@ <field name="stage_id" ref="event_track_stage4"/> </record> <record id="event_track27" model="event.track"> - <field name="name">OpenERP in 2014</field> + <field name="name">Odoo in 2014</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 04:00:00')"></field> @@ -287,7 +287,7 @@ <field name="color">3</field> </record> <record id="event_track28" model="event.track"> - <field name="name">OpenERP Status & Strategy 2014</field> + <field name="name">Odoo Status & Strategy 2014</field> <field name="website_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 5:00:00')"></field> diff --git a/addons/website_forum/data/forum_default_faq.html b/addons/website_forum/data/forum_default_faq.html index 8c6d32e43ed..9891c930a21 100644 --- a/addons/website_forum/data/forum_default_faq.html +++ b/addons/website_forum/data/forum_default_faq.html @@ -5,11 +5,11 @@ partners and programmers. You can ask questions about: </p> <ul> - <li>how to install OpenERP on a specific infrastructure,</li> - <li>how to configure or customize OpenERP to specific business needs,</li> - <li>what's the best way to use OpenERP for a specific business need,</li> + <li>how to install Odoo on a specific infrastructure,</li> + <li>how to configure or customize Odoo to specific business needs,</li> + <li>what's the best way to use Odoo for a specific business need,</li> <li>how to develop modules for your own need,</li> - <li>specific questions about OpenERP service offers, etc.</li> + <li>specific questions about Odoo service offers, etc.</li> </ul> <p> <b>Before you ask - please make sure to search for a similar question.</b> You can @@ -135,7 +135,7 @@ <h2><a class="faq-question">Why can other people edit my questions/answers?</a></h2> <p> The goal of this site is create a relevant knowledge base that would answer - questions related to OpenERP. + questions related to Odoo. </p><p> Therefore questions and answers can be edited like wiki pages by experienced users of this site in order to improve the overall quality of the knowledge base content. diff --git a/addons/website_forum/data/forum_demo.xml b/addons/website_forum/data/forum_demo.xml index 85a8a8512bf..1223c950152 100644 --- a/addons/website_forum/data/forum_demo.xml +++ b/addons/website_forum/data/forum_demo.xml @@ -29,9 +29,9 @@ <field name="forum_id" ref="website_forum.forum_help"/> <field name="content"><![CDATA[<p>I use Wordpress as a CMS and eCommerce platform. The developing in Wordpress is quite easy and solid but it missing ERP feature (there is single plugin to integrate with Frontaccounting) so I wonder: -Can I use OpenERP as a replacement CMS of Wordpress + eCommerce plugin? +Can I use Odoo as a replacement CMS of Wordpress + eCommerce plugin? -In simple words does OpenERP became CMS+ERP platform?</p>]]></field> +In simple words does Odoo became CMS+ERP platform?</p>]]></field> <field name="tag_ids" eval="[(4,ref('website_forum.tags_2'))]"/> </record> @@ -49,8 +49,8 @@ In simple words does OpenERP became CMS+ERP platform?</p>]]></field> </record> <record id="answer_1" model="forum.post"> <field name="forum_id" ref="website_forum.forum_help"/> - <field name="content">OpenERP v8 (next release) provides a web module and an e-commerce module: www.openerp.com/website_cms - The CMS editor in OpernERP web is nice but I prefer drupal for customization and there is a drupal module for OpenERP. I think WP is better than OpenERP web too. + <field name="content">Odoo v8 (next release) provides a web module and an e-commerce module: www.odoo.com/page/website-builder + The CMS editor in Odoo web is nice but I prefer Drupal for customization and there is a Drupal module for Odoo. I think WP is better than Odoo web too. </field> <field name="parent_id" ref="question_1"/> </record> diff --git a/addons/website_forum_doc/views/website_doc.xml b/addons/website_forum_doc/views/website_doc.xml index d675eaedd5a..7e7e33117d8 100644 --- a/addons/website_forum_doc/views/website_doc.xml +++ b/addons/website_forum_doc/views/website_doc.xml @@ -243,14 +243,14 @@ <h4>Good answer structure</h4> <ol> <li>Describe the business solution</li> - <li>Explain how to implement it in OpenERP</li> + <li>Explain how to implement it in Odoo</li> <li>Benefits of having done this setup</li> </ol> </div> <div class="col-sm-6"> <h4>Bad answer structure</h4> <ol> - <li>Explain how to configure in OpenERP</li> + <li>Explain how to configure in Odoo</li> <li>No business benefit</li> </ol> </div> diff --git a/addons/website_hr_recruitment/data/hr_job_demo.xml b/addons/website_hr_recruitment/data/hr_job_demo.xml index c65d4a02ee0..9f5433ee07c 100644 --- a/addons/website_hr_recruitment/data/hr_job_demo.xml +++ b/addons/website_hr_recruitment/data/hr_job_demo.xml @@ -298,7 +298,7 @@ <li class="list-group-item">Quantify and negotiate the resources required</li> <li class="list-group-item">Follow and check the development part</li> <li class="list-group-item">Help with the configuration of the software</li> - <li class="list-group-item">Deliver generic OpenERP functional training sessions</li> + <li class="list-group-item">Deliver generic Odoo functional training sessions</li> <li class="list-group-item">Will report to the Head of Professional Services</li> </ul> <div class="panel-footer text-center"> diff --git a/addons/website_hr_recruitment/static/description/index.html b/addons/website_hr_recruitment/static/description/index.html index f1b255a0758..d2ff63ecfab 100644 --- a/addons/website_hr_recruitment/static/description/index.html +++ b/addons/website_hr_recruitment/static/description/index.html @@ -29,7 +29,7 @@ <div class="oe_span6"> <p class='oe_mt32'> Get a clean and professional look for your job annouces. - OpenERP's unique <em>'edit inline'</em> approach makes website + Odoo's unique <em>'edit inline'</em> approach makes website and job descriptions creation surprisingly easy. </p><p> Drag & Drop well designed <em>'Building Blocks'</em> to diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/templates.xml index 02d9d5ff59f..a1e21880612 100644 --- a/addons/website_hr_recruitment/views/templates.xml +++ b/addons/website_hr_recruitment/views/templates.xml @@ -23,7 +23,7 @@ <p> With a small team of smart people, we released the most disruptive enterprise management software in the world. - OpenERP is fully open source, super easy, full featured + Odoo is fully open source, super easy, full featured (3000+ apps) and its online offer is 3 times cheaper than traditional competitors like SAP and Ms Dynamics. </p> diff --git a/addons/website_partner/data/demo.xml b/addons/website_partner/data/demo.xml index 8bb724f0ad5..9fa1ba68ca1 100644 --- a/addons/website_partner/data/demo.xml +++ b/addons/website_partner/data/demo.xml @@ -57,20 +57,20 @@ Throughout this time we have served a large number of clients belonging to a div With our assistance we covered the various stages that make up a project, with a methodology that places the user at the center of the process and privileged agent. <br /> -This path puts us uniquely equipped to lead projects implementation, training and customization of OpenERP.]]></field> +This path puts us uniquely equipped to lead projects implementation, training and customization of Odoo.]]></field> </record> <record id="base.res_partner_2" model="res.partner"> <field name="website_short_description">Agrolait is a specialized service provider for 10 years in the implementation of open source ERP , BI and e-commerce solutions. Audaxis has 100 employees based in France , Belgium, Luxembourg and Switzerland. Building on 20 years of...</field> <field name="website_description"><![CDATA[Agrolait is a specialized service provider for 10 years in the implementation of open source ERP , BI and e- commerce solutions. Audaxis has 100 employees based in France , Belgium, Luxembourg and Switzerland.<br /> <br /> -Building on 20 years of experience in ERP solutions , our consultants combine technological expertise , application and business to bring you informed throughout your OpenERP project board.<br /> <br /> +Building on 20 years of experience in ERP solutions , our consultants combine technological expertise , application and business to bring you informed throughout your Odoo project board.<br /> <br /> Our project methodology , designed for SMEs / SMIs , is a quality assurance guarantee : architecture , installation, integration , customization, training , project management , support, maintenance , and migration , our commitment to you is total.<br /> <br /> -Premium Partner PTC Agrolait is certified by OpenERP to provide functional and technical training in France and Tunisia. <br /> <br /> +Premium Partner PTC Agrolait is certified by Odoo to provide functional and technical training in France and Tunisia. <br /> <br /> -We operate in several sectors : distribution, retail , industry, services , associations, with strong expertise in the supply chain management (SCM) and the specific accounting for the Belgian and French markets . With its cluster of web expertise , Agrolait makes you benefit from the best advice in OpenERP integration with portals .]]></field> +We operate in several sectors : distribution, retail , industry, services , associations, with strong expertise in the supply chain management (SCM) and the specific accounting for the Belgian and French markets . With its cluster of web expertise , Agrolait makes you benefit from the best advice in Odoo integration with portals .]]></field> </record> <record id="base.res_partner_24" model="res.partner"> @@ -81,7 +81,7 @@ In view of the technological advances that have fundamentally changed the expect With over 20 years experience in information systems, the founders of OpenCorp were given a mission to shake up the market based on a catalog of effective, stable and affordable solutions to help its customers to gain competitive advantage. <br /> <br /> -It is in this context qu'OpenCorp is today one of the first resellers of OpenERP 7.0 SaaS. Our philosophy "back to the standard" can significantly reduce the costs associated with project implementation. <br /> <br /> +It is in this context qu'OpenCorp is today one of the first resellers of Odoo 7.0 SaaS. Our philosophy "back to the standard" can significantly reduce the costs associated with project implementation. <br /> <br /> Experts in business analysis, our consultants will also accompany you in analyzing your needs by documenting your processes, identifying opportunities for improvement and preparing the mandates of your projects. <br /> <br /> @@ -89,8 +89,8 @@ With OpenCorp, you are guaranteed a controlled implementation of an operational </record> <record id="base.res_partner_3" model="res.partner"> - <field name="website_short_description">China Export is committed to deliver a complete integrated business solution to fulfill your business requirements and meet your ever changing needs. China Export partners with OpenERP to build a feature rich, extensible...</field> - <field name="website_description"><![CDATA[China Export is committed to deliver a complete integrated business solution to fulfill your business requirements and meet your ever changing needs. China Export partners with OpenERP to build a feature rich, extensible and cost-effective system for small and medium sized businesses. China Export’s commission is to help you build such a system for your company by leveraging a cost-effective open source software (OpenERP), our experienced consulting and services to keep your projects on-target and within budget, and an approach to support that ensure high-responsiveness.]]></field> + <field name="website_short_description">China Export is committed to deliver a complete integrated business solution to fulfill your business requirements and meet your ever changing needs. China Export partners with Odoo to build a feature rich, extensible...</field> + <field name="website_description"><![CDATA[China Export is committed to deliver a complete integrated business solution to fulfill your business requirements and meet your ever changing needs. China Export partners with Odoo to build a feature rich, extensible and cost-effective system for small and medium sized businesses. China Export’s commission is to help you build such a system for your company by leveraging a cost-effective open source software (Odoo), our experienced consulting and services to keep your projects on-target and within budget, and an approach to support that ensure high-responsiveness.]]></field> </record> <record id="base.res_partner_25" model="res.partner"> @@ -105,20 +105,20 @@ With OpenCorp, you are guaranteed a controlled implementation of an operational a. Setting-up: support for getting the relevant business license and meeting the associated administrative PRC requirements. <br/> b. Management: definition and implementation of procedures, proposal on the company organization. <br/> c. Finance: bookkeeping, tax declaration, financial reporting and key indicators. <br/> -d. Decisional Information System: set-up of server, network, implementation of a customized data management system (OpenERP, Excel). <br/> +d. Decisional Information System: set-up of server, network, implementation of a customized data management system (Odoo, Excel). <br/> e. Human resources: recruitment, payroll management.]]></field> </record> <record id="base.res_partner_13" model="res.partner"> - <field name="website_short_description">Axelor is a service company specializing in the integration of Open Source ERP. She is co-editor including the web version of Open ERP and concentrates all its activities to OpenERP integration and implementation of supply...</field> + <field name="website_short_description">Axelor is a service company specializing in the integration of Open Source ERP. She is co-editor including the web version of Open ERP and concentrates all its activities to Odoo integration and implementation of supply...</field> <field name="website_description"><![CDATA[Axelor is a service company specializing in the integration of Open Source ERP. She is co-editor including the web version of Open ERP and concentrates all its activities to Open ERP integration and implementation of supply Saas (ASP) based on Open ERP projects. Axelor can now claim many references to Open ERP implementations in various industries.<br/> <br/> The company has its own R & D performing many innovations to the continuous improvement of Open ERP, such as the new web version, the plug-in MS Office and connectors to other applications. Its main advantages are its integration methodology and rigor to the management of major projects for the audit and design phase up to production and customer support.]]></field> </record> <record id="base.res_partner_12" model="res.partner"> - <field name="website_short_description">Founded in 2001, Camptocamp is OpenERP Gold Partner since 2006 in Switzerland, France and Austria and has about 50 employees all Professional Open Source...</field> - <field name="website_description"><![CDATA[Founded in 2001, Camptocamp is OpenERP Gold Partner since 2006 in Switzerland, France and Austria and has about 50 employees all Professional Open Source. <br/> <br/> -Camptocamp specializes in the implementation of OpenERP in companies of 10 to several hundred employees in the following areas:<br/> + <field name="website_short_description">Founded in 2001, Camptocamp is Odoo Gold Partner since 2006 in Switzerland, France and Austria and has about 50 employees all Professional Open Source...</field> + <field name="website_description"><![CDATA[Founded in 2001, Camptocamp is Odoo Gold Partner since 2006 in Switzerland, France and Austria and has about 50 employees all Professional Open Source. <br/> <br/> +Camptocamp specializes in the implementation of Odoo in companies of 10 to several hundred employees in the following areas:<br/> <ul><li>trading (buy / sell / stock), especially in the field of e-commerce;</li> <li>service companies;</li> <li>nongovernmental organizations (NGOs) of international humanitarian rank.</li> </ul> @@ -132,11 +132,11 @@ Camptocamp has developed a strong expertise in the following areas: <li>automation with showers and barcode: scenarios to scan receipts, shipments, internal movements, inventories, manufacturing... ;</li> <li>specific issues multi-inventory tracking and offline synchronization;</li></ul></li> <li>e-commerce :<ul> -<li>Magento OpenERP connector (bidirectional) to synchronize orders, customers, products, prices, payment methods and delivery, shipping... ;</li> -<li>PrestaShop OpenERP connector;</li></ul></li> -<li>development and implementation of business applications 100% specific leveraging the power of the OpenERP framework (OpenObject).</li></ul> +<li>Magento Odoo connector (bidirectional) to synchronize orders, customers, products, prices, payment methods and delivery, shipping... ;</li> +<li>PrestaShop Odoo connector;</li></ul></li> +<li>development and implementation of business applications 100% specific leveraging the power of the Odoo framework (OpenObject).</li></ul> <br /> -In addition, thanks to its heavy involvement in the ecosystem OpenERP for several years, has been promoted by Camptocamp Editor OpenERP SA status OpenERP best contributor in 2012 and 2013.<br/> +In addition, thanks to its heavy involvement in the ecosystem Odoo for several years, has been promoted by Camptocamp Editor Odoo SA status Odoo best contributor in 2012 and 2013.<br/> ]]></field> </record> @@ -151,8 +151,8 @@ Above all, you need a reliable and professional advisors / companions who will l </record> <record id="base.res_partner_8" model="res.partner"> - <field name="website_short_description">We offer implementation, customization and training for OpenERP. Since tinyerp 4, we also develop custom modules. In addition to individual solutions are preconfigured systems for: - ...</field> - <field name="website_description"><![CDATA[We offer implementation, customization and training for OpenERP. Since tinyerp 4, we also develop custom modules. In addition to individual solutions are preconfigured systems for:-<br/> + <field name="website_short_description">We offer implementation, customization and training for Odoo. Since tinyerp 4, we also develop custom modules. In addition to individual solutions are preconfigured systems for: - ...</field> + <field name="website_description"><![CDATA[We offer implementation, customization and training for Odoo. Since tinyerp 4, we also develop custom modules. In addition to individual solutions are preconfigured systems for:-<br/> - Food production (eg fruit and vegetables) <br/> - Service provider with project management <br/> - Machinery and equipment manufacturers]]></field> @@ -173,44 +173,44 @@ Phase 3: In the third phase recommends prioritizing specific interests of the co </record> <record id="base.res_partner_7" model="res.partner"> - <field name="website_short_description">Bank Wealthy and sons has developed expertise in all areas of OpenERP, working with clients to create accounting, invoicing, VAT, and reporting customisations to fulfil their business needs. Bank Wealthy and sons work closely with the OpenERP community to send changes upstream to further enhance OpenERP. Providing a full range...</field> - <field name="website_description"><![CDATA[Bank Wealthy and sons has developed expertise in all areas of OpenERP, working with clients to create accounting, invoicing, VAT, and reporting customisations to fulfil their business needs. Bank Wealthy and sons work closely with the OpenERP community to send changes upstream to further enhance OpenERP. <br/><br/> + <field name="website_short_description">Bank Wealthy and sons has developed expertise in all areas of Odoo, working with clients to create accounting, invoicing, VAT, and reporting customisations to fulfil their business needs. Bank Wealthy and sons work closely with the Odoo community to send changes upstream to further enhance Odoo. Providing a full range...</field> + <field name="website_description"><![CDATA[Bank Wealthy and sons has developed expertise in all areas of Odoo, working with clients to create accounting, invoicing, VAT, and reporting customisations to fulfil their business needs. Bank Wealthy and sons work closely with the Odoo community to send changes upstream to further enhance Odoo. <br/><br/> -Providing a full range of free software services for the private and public sectors since 1998, Bank Wealthy and sons is now one of the largest independent open source consultancies, with Open Source Support Centres in the UK, Germany, the US and Canada. With a worldwide team of over 40 free software developers, including many active OpenERP contributors, Bank Wealthy and sons is Your One-Stop Shop for Open Source Support™.]]></field> +Providing a full range of free software services for the private and public sectors since 1998, Bank Wealthy and sons is now one of the largest independent open source consultancies, with Open Source Support Centres in the UK, Germany, the US and Canada. With a worldwide team of over 40 free software developers, including many active Odoo contributors, Bank Wealthy and sons is Your One-Stop Shop for Open Source Support™.]]></field> </record> <record id="base.res_partner_21" model="res.partner"> <field name="website_short_description">Global Solutions helps organisations of all shapes and sizes gain a competitive advantage through Free and Open Source software. Our experienced team can provide strategic advice, implementation, integration with exis...</field> - <field name="website_description"><![CDATA[Global Solutions helps organisations of all shapes and sizes gain a competitive advantage through Free and Open Source software. Our experienced team can provide strategic advice, implementation, integration with existing systems, hosting and support services for a wide range of open source applications. Working with our customers Global Solutions helps to select and deliver best-of-breed solutions using Open Source products. Key skills and partnerships include Ubuntu, vtiger CRM, OpenEMM, Alfresco and of course OpenERP. + <field name="website_description"><![CDATA[Global Solutions helps organisations of all shapes and sizes gain a competitive advantage through Free and Open Source software. Our experienced team can provide strategic advice, implementation, integration with existing systems, hosting and support services for a wide range of open source applications. Working with our customers Global Solutions helps to select and deliver best-of-breed solutions using Open Source products. Key skills and partnerships include Ubuntu, vtiger CRM, OpenEMM, Alfresco and of course Odoo. <br/> <br/> Founded in 2006, our clients range from SMEs to globally recognised brands and public sector organisations.]]></field> </record> <record id="base.res_partner_15" model="res.partner"> - <field name="website_short_description">Millennium Industries is a London based OpenERP partner. Their specialist areas include accounting, CRM, manufacturing, stock, logistics, and supply chain management. The company has completed over 15 projects with intric...</field> - <field name="website_description"><![CDATA[Millennium Industries is a London based OpenERP partner. Their specialist areas include accounting, CRM, manufacturing, stock, logistics, and supply chain management. The company has completed over 15 projects with intricate consolidation and stock-accounting requirements for which they can provide references. <br/> <br/> + <field name="website_short_description">Millennium Industries is a London based Odoo partner. Their specialist areas include accounting, CRM, manufacturing, stock, logistics, and supply chain management. The company has completed over 15 projects with intric...</field> + <field name="website_description"><![CDATA[Millennium Industries is a London based Odoo partner. Their specialist areas include accounting, CRM, manufacturing, stock, logistics, and supply chain management. The company has completed over 15 projects with intricate consolidation and stock-accounting requirements for which they can provide references. <br/> <br/> -Millennium Industries have developed several accounting modules for OpenERP and are the leading experts in the UK for this area. Additionally, a forefront success story of theirs is the nominal level data migrations from Sage Line 50 to OpenERP that allows unprecedented efficiency in system switchover. <br/> <br/> +Millennium Industries have developed several accounting modules for Odoo and are the leading experts in the UK for this area. Additionally, a forefront success story of theirs is the nominal level data migrations from Sage Line 50 to Odoo that allows unprecedented efficiency in system switchover. <br/> <br/> Last but not least, Millennium Industries is the only UK partner with their own Europe-based fully staffed development centre, aimed to deliver to the exact client specification projects of any complexity. <br/> <br/> Please contact Millennium Industries direct to discuss your business requirement and the company would be delighted to help.]]></field> </record> <record id="base.res_partner_10" model="res.partner"> - <field name="website_short_description">The Jackson Group is an active and leading partner of OpenERP in the US. As OpenERP's longest active US partner, we help our clients leverage new methods, cost-effective tools and fresh technologies to simplify infrastructure, lower cost, and improve operations. Our goal is to help our clients become...</field> - <field name="website_description"><![CDATA[The Jackson Group is an active and leading partner of OpenERP in the US. -As OpenERP's longest active US partner, we help our clients leverage new methods, cost-effective tools and fresh technologies to simplify infrastructure, lower cost, and improve operations.<br/> <br/> + <field name="website_short_description">The Jackson Group is an active and leading partner of Odoo in the US. As Odoo's longest active US partner, we help our clients leverage new methods, cost-effective tools and fresh technologies to simplify infrastructure, lower cost, and improve operations. Our goal is to help our clients become...</field> + <field name="website_description"><![CDATA[The Jackson Group is an active and leading partner of Odoo in the US. +As Odoo's longest active US partner, we help our clients leverage new methods, cost-effective tools and fresh technologies to simplify infrastructure, lower cost, and improve operations.<br/> <br/> Our goal is to help our clients become high-performing, competitive and profitable businesses. We leverage robust model that combines:<br/> <ul><li> -Implementations of feature rich, extensible, and cost-effective Open Source software (OpenERP) </li> +Implementations of feature rich, extensible, and cost-effective Open Source software (Odoo) </li> <li>Experienced consulting services </li> <li>Domestic US, near-shore and offshore based resources </li> <li>A highly-responsive support model </li> -<li>A strategy that drives US Localization and adds new capabilities to OpenERP </li> +<li>A strategy that drives US Localization and adds new capabilities to Odoo </li> </ul><br/><br/> -The Jackson Group’s OpenERP consulting services include: <br/> +The Jackson Group’s Odoo consulting services include: <br/> <ul> <li> Roadmap Development </li> <li>Program/Project Management </li> @@ -232,9 +232,9 @@ At Think Big Systems we bring operational experience combined with technological <record id="base.res_partner_9" model="res.partner"> <field name="website_short_description">Best Designers is an IT services organization, established by 3 industry experts headquartered at Mumbai, India. The organization serve customers with Open Source Enterprise Software applications. We are specialized in...</field> - <field name="website_description"><![CDATA[Best Designers is an IT services organization, established by 3 industry experts headquartered at Mumbai, India. The organization serve customers with Open Source Enterprise Software applications. We are specialized in <b>ERP Implementation, CRM Implementation, E-Commerce to ERP Integrations, Document Management Systems and Open Source Training.</b> Our key products include <b>OpenERP, Alfresco and Magento.</b> Our core objective is to deliver quality in <b>OpenERP Implementation Services</b> incorporating supreme value to enterprises globally, at an affordable price. Our experience in managing projects right from selecting tools and platforms to implement solutions has shown results in <b>Reducing IT Budgets for SME making Technology Affordable. </b> + <field name="website_description"><![CDATA[Best Designers is an IT services organization, established by 3 industry experts headquartered at Mumbai, India. The organization serve customers with Open Source Enterprise Software applications. We are specialized in <b>ERP Implementation, CRM Implementation, E-Commerce to ERP Integrations, Document Management Systems and Open Source Training.</b> Our key products include <b>Odoo, Alfresco and Magento.</b> Our core objective is to deliver quality in <b>Odoo Implementation Services</b> incorporating supreme value to enterprises globally, at an affordable price. Our experience in managing projects right from selecting tools and platforms to implement solutions has shown results in <b>Reducing IT Budgets for SME making Technology Affordable. </b> <br/> <br/> -Our ERP expertise is since 2005 and we mainly focus on OpenERP Implementation across the globe, being an <b>Off-shore Development Partner from India</b>, we are also associated with other OpenERP Partners across the globe to implement OpenERP Business Applications. In order to provide world class ERP, E–Commerce and Enterprise Solutions, we have designed innovative Implementation Methodologies and concepts, which help us provide reliable business solutions that meet present as well as future demands. +Our ERP expertise is since 2005 and we mainly focus on Odoo Implementation across the globe, being an <b>Off-shore Development Partner from India</b>, we are also associated with other Odoo Partners across the globe to implement Odoo Business Applications. In order to provide world class ERP, E–Commerce and Enterprise Solutions, we have designed innovative Implementation Methodologies and concepts, which help us provide reliable business solutions that meet present as well as future demands. <br/><br/> Best Designers has now emerged serving the Small and Medium Business – SMB’s with lots of Free and Open Source Software's, Our team is proficient to deliver quick and quality solutions. With a blend of experts with proven track record, our enterprise solution Business Consultants, ERP Consultants, Network Engineers, Software Developers, Web Architects, Software Testers and Search Engine Optimizers makes it possible to offer our clients affordable solutions that are both innovative and highly influential. ]]></field> diff --git a/addons/website_quote/data/website_quotation_demo.xml b/addons/website_quote/data/website_quotation_demo.xml index 56bc4b05c6c..61a8bbd90c8 100644 --- a/addons/website_quote/data/website_quotation_demo.xml +++ b/addons/website_quote/data/website_quotation_demo.xml @@ -9,7 +9,7 @@ <field name="type">service</field> <field name="uom_id" ref="product.product_uom_unit"/> <field name="uom_po_id" ref="product.product_uom_unit"/> - <field name="description_sale">Learn directly from our team and network of OpenERP experts. Choose from the available training sessions for a better functional understanding of OpenERP</field> + <field name="description_sale">Learn directly from our team and network of Odoo experts. Choose from the available training sessions for a better functional understanding of Odoo</field> </record> <record id="product_product_quote_1" model="product.product"> @@ -25,7 +25,7 @@ <field name="type">service</field> <field name="uom_id" ref="product.product_uom_unit"/> <field name="uom_po_id" ref="product.product_uom_unit"/> - <field name="description_sale">Learn directly from our team and network of OpenERP experts. Choose from the available training sessions for a better technical understanding of OpenERP</field> + <field name="description_sale">Learn directly from our team and network of Odoo experts. Choose from the available training sessions for a better technical understanding of Odoo</field> </record> <record id="product_product_quote_2" model="product.product"> @@ -41,7 +41,7 @@ <field name="type">service</field> <field name="uom_id" ref="product.product_uom_unit"/> <field name="uom_po_id" ref="product.product_uom_unit"/> - <field name="description_sale">Learn directly from our team and network of OpenERP experts. Choose from the available training sessions for a better functional understanding of OpenERP</field> + <field name="description_sale">Learn directly from our team and network of Odoo experts. Choose from the available training sessions for a better functional understanding of Odoo</field> </record> <record id="product_product_quote_3" model="product.product"> @@ -63,9 +63,9 @@ <p> Our partnership offer includes all you need to grow your business and deliver quality services - with the OpenERP Partner Program. + with the Odoo Partner Program. </p><p> - It includes <strong>discounts on OpenERP + It includes <strong>discounts on Odoo Enterprise</strong>, technical and/or functional <strong>trainings</strong>, <strong>support</strong> services, @@ -108,7 +108,7 @@ management software</strong> in the world. </p><p> Benefit from the growing customer demand - and our OpenERP brand. + and our Odoo brand. </p> </div> </div> @@ -124,7 +124,7 @@ highly valuable software. </p><p> Grow by developing a <strong>recurring - revenue flow</strong> from OpenERP + revenue flow</strong> from Odoo Enterprise's commission system. </p> </div> @@ -138,7 +138,7 @@ <p> We will assign you a dedicated account manager, an experienced sales person, to help you develop your - OpenERP business. The account manager helps you get + Odoo business. The account manager helps you get leads, close deals, gives you feedback and best practices, delivers sales training and is your direct point of contact for any request you may have. @@ -152,7 +152,7 @@ </div> <div class="col-md-7"> <p> - For an extra fee, partners can get access to OpenERP's + For an extra fee, partners can get access to Odoo's core developers and functional experts. This can help you succeed in delivering more complex or bigger projects by getting the support of highly experienced @@ -172,10 +172,10 @@ </div> <div class="col-md-7"> <p> - OpenERP promotes its partners through various ways: + Odoo promotes its partners through various ways: publication on our website, official communication, publication of your success stories, etc. As soon as - you become an OpenERP partner and have followed the + you become an Odoo partner and have followed the official trainings, you will be visible on the partner directory listing. </p> @@ -195,8 +195,8 @@ <p> Every year, we redirect more than 100,000 customer requests to our official partners. These are prospects - that filled a form on the OpenERP website and wanted to - use OpenERP. The right partner to fulfill the customer + that filled a form on the Odoo website and wanted to + use Odoo. The right partner to fulfill the customer request is selected based on the customer localization (nearest partner) and the grade of the partner. </p> @@ -208,12 +208,12 @@ </section> <section data-snippet-id="text-block"> - <h2>Benefit from the OpenERP branding</h2> + <h2>Benefit from the Odoo branding</h2> <p> Every year, we redirect more than 100,000 customer requests to our official partners. These are prospects - that filled a form on the OpenERP website and wanted to - use OpenERP. The right partner to fulfill the customer + that filled a form on the Odoo website and wanted to + use Odoo. The right partner to fulfill the customer request is selected based on the customer localization (nearest partner) and the grade of the partner. </p> @@ -229,7 +229,7 @@ <p class="mt23"> Save time in your implementation project by having your developments tested automatically by our automated test - servers. At every code commit, you get a full OpenERP + servers. At every code commit, you get a full Odoo instance that you can try out online. When this instance is deployed, your code is automatically put through our 2000+ automated unit tests. @@ -260,7 +260,7 @@ <section data-snippet-id="text-image"> <div class="row"> <div class="col-md-12 mb32"> - <p>These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live sessions by our senior instructors. At the end of the training, you can pass the OpenERP Certification exam in one of the 5000+ Pearson VUE test centers worldwide.</p> + <p>These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live sessions by our senior instructors. At the end of the training, you can pass the Odoo Certification exam in one of the 5000+ Pearson VUE test centers worldwide.</p> </div> <div class="col-md-offset-1"> <h3>Your advantages</h3> @@ -341,7 +341,7 @@ <div class="panel-heading text-center"> <h3 style="margin: 0">Day 2</h3> - <p class="text-muted" style="margin: 0">OpenERP Web Client</p> + <p class="text-muted" style="margin: 0">Odoo Web Client</p> </div> <ul class="list-group"> <li class="list-group-item">Introduction to JQuery</li> @@ -410,7 +410,7 @@ <li>Participants preferably have a functional knowledge of our software (see Functional Training).</li> </ul><p></p> - <p>To get more information, visit the <a href="http://openerp.com/">OpenERP Official Website</a>.</p> + <p>To get more information, visit the <a href="http://openerp.com/">Odoo Official Website</a>.</p> </div> </div> </div> @@ -439,12 +439,12 @@ <div class="col-md-12 mt16 mb0" data-snippet-id="colmd"> <p><span style="text-align: -webkit-center; ">Upon completion of the training, the participant will be able to:</span></p> <ul class="list-group"> - <li class="list-group-item"> Install and administer OpenERP.</li> - <li class="list-group-item"> Become an OpenERP Consultant.</li> + <li class="list-group-item"> Install and administer Odoo.</li> + <li class="list-group-item"> Become an Odoo Consultant.</li> <li class="list-group-item"> Do the GAP analysis of any Business Process.</li> - <li class="list-group-item"> Understand the functional concepts, business processes byOpenERP.</li> - <li class="list-group-item"> Operate/Work with OpenERP Smoothly on regular basis.</li> - <li class="list-group-item"> Configure OpenERP using the standard modules.</li> + <li class="list-group-item"> Understand the functional concepts, business processes byOdoo.</li> + <li class="list-group-item"> Operate/Work with Odoo Smoothly on regular basis.</li> + <li class="list-group-item"> Configure Odoo using the standard modules.</li> <li class="list-group-item"> Change the look and feel from the front-end(GUI) rather than aneed of technical knowledge.</li> </ul> @@ -516,7 +516,7 @@ <li>Participants preferably have a functional knowledge of our software (see Functional Training).</li> </ul><p></p> - <p>To get more information, visit the <a href="http://openerp.com/">OpenERP Official Website</a>.</p> + <p>To get more information, visit the <a href="http://openerp.com/">Odoo Official Website</a>.</p> </div> </div> </div> diff --git a/addons/website_sale/static/description/index.html b/addons/website_sale/static/description/index.html index 8a006ff9c56..e86260cd9a0 100644 --- a/addons/website_sale/static/description/index.html +++ b/addons/website_sale/static/description/index.html @@ -11,7 +11,7 @@ </div> <div class="oe_span6"> <p class='oe_mt32'> - OpenERP e-Commerce is unlike anything you have ever seen before. + Odoo e-Commerce is unlike anything you have ever seen before. Get an awesome catalog of products and great product description pages. </p><p> @@ -31,7 +31,7 @@ <h3 class="oe_slogan">Get rid of old WYSIWYG editors</h3> <div class="oe_span6"> <p class='oe_mt32'> - OpenERP's unique <em>'edit inline'</em> and building blocks approach makes + Odoo's unique <em>'edit inline'</em> and building blocks approach makes product pages creation surprisingly easy. "Want to change the price of a product? or put it in bold? Want to add a banner for a specific product?" just click and change. What you see is @@ -62,7 +62,7 @@ products related to what the shopper put in his cart. (e.g. accessories) </p><p> - OpenERP's upselling algorythm allows you to show visitors + Odoo's upselling algorythm allows you to show visitors similar but more expensive products than the one in view, with incentives. </p><p> @@ -80,11 +80,11 @@ <h3 class="oe_slogan">Control your sales funnel with Google Analytics</h3> <div class="oe_span6"> <p class='oe_mt32'> - Get a clear visibility of your sales funnel. OpenERP's Google + Get a clear visibility of your sales funnel. Odoo's Google Analytics trackers are configured by default to track all kind of events related to shopping carts, call-to-actions, etc. </p><p> - As OpenERP marketing tools (mass mailing, campaigns, etc) are also + As Odoo marketing tools (mass mailing, campaigns, etc) are also linked with Google Analytics, you get a complete view of your business. </p> </div> @@ -106,7 +106,7 @@ <div class="oe_span6"> <p class='oe_mt32'> Get your website translated in multiple languages with no effort. - OpenERP proposes and propagates translations automatically + Odoo proposes and propagates translations automatically across pages. </p> Our translation "on demand" features allows you to benefit from @@ -153,7 +153,7 @@ <div class="oe_span6"> <p class='oe_mt32'> SEO tools are ready to use, with no configuration required. - OpenERP suggests keywords according to Google most searched + Odoo suggests keywords according to Google most searched terms, Google Analytics tracks your shopping cart events, sitemap are created automatically for Google indexation, etc. </p><p> @@ -170,7 +170,7 @@ <h3 class="oe_slogan">Optimize: from Ads to Conversions</h3> <div class="oe_span6"> <p class='oe_mt32'> - Create new landing pages easily with the OpenERP inline edition + Create new landing pages easily with the Odoo inline edition feature. Send visitors of your different marketing campaigns to specific landing pages to optimize conversions. </p> @@ -214,14 +214,14 @@ <h3 class="oe_slogan">Integrated vs Interfaced</h3> <div class="oe_span6"> <p class='oe_mt32'> - Benefit from the power of OpenERP, in your online store: a + Benefit from the power of Odoo, in your online store: a powerfull tax engine, flexible pricing structures, a real inventory management solution, a reseller interface, support for products with different behaviours; physical goods, events, services, variants and options, etc. </p><p> You don't need to interface with your warehouse, sales or - accounting software. Everything is integrated with OpenERP. No + accounting software. Everything is integrated with Odoo. No pain, real time. </p> </div> diff --git a/addons/website_twitter/views/twitter_view.xml b/addons/website_twitter/views/twitter_view.xml index 8600ceca039..90eefb22904 100644 --- a/addons/website_twitter/views/twitter_view.xml +++ b/addons/website_twitter/views/twitter_view.xml @@ -21,9 +21,9 @@ <li>Create a new Twitter application on <a href="https://apps.twitter.com/app/new" target="new">https://apps.twitter.com/app/new</a> with the following values: <ul> - <li><strong>Name: </strong> OpenERP Tweet Scroller</li> - <li><strong>Description: </strong> OpenERP Tweet Scroller </li> - <li><strong>Website: </strong> <tt>http://www.openerp.com</tt></li> + <li><strong>Name: </strong> Odoo Tweet Scroller</li> + <li><strong>Description: </strong> Odoo Tweet Scroller </li> + <li><strong>Website: </strong> <tt>https://www.odoo.com</tt></li> <li><strong>Callback URL: </strong> leave it blank</li> <li>Accept terms of use and click on the Create button at the bottom</li> </ul> diff --git a/doc/_templates/sidebarintro.html b/doc/_templates/sidebarintro.html index 95b047733e3..47444e53968 100644 --- a/doc/_templates/sidebarintro.html +++ b/doc/_templates/sidebarintro.html @@ -4,13 +4,13 @@ <h3>Other Docs</h3> <ul> - <li><a href="http://doc.openerp.com/trunk/developers">OpenERP Developers Documentation</a></li> - <li><a href="http://doc.openerp.com/trunk/developers/web">OpenERP Web Developers Documentation</a></li> - <li><a href="http://doc.openerp.com/trunk/users">OpenERP Users Documentation</a></li> + <li><a href="https://doc.odoo.com/trunk">Odoo Developers Documentation</a></li> + <li><a href="https://doc.odoo.com/trunk/training">Odoo Web Developers Documentation</a></li> + <li><a href="https://doc.odoo.com/book">Odoo Users Documentation</a></li> </ul> <h3>Useful Links</h3> <ul> - <li><a href="http://www.openerp.com/">The OpenERP website</a></li> + <li><a href="https://www.odoo.com/">The Odoo website</a></li> <li><a href="http://python.org/">The Python programming language</a></li> </ul> diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml index 2aa520d7c55..bd5ede5464d 100644 --- a/openerp/addons/base/ir/ir_actions.xml +++ b/openerp/addons/base/ir/ir_actions.xml @@ -557,7 +557,7 @@ <field name="res_model">ir.actions.todo</field> <field name="view_id" ref="ir_actions_todo_tree"/> <field name="view_type">form</field> - <field name="help">The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field> + <field name="help">The configuration wizards are used to help you configure a new instance of Odoo. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field> </record> <menuitem id="menu_ir_actions_todo_form" action="act_ir_actions_todo_form" parent="base.next_id_6"/> <record id="action_run_ir_action_todo" model="ir.actions.server"> diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py index e589e2cae06..d2296526394 100644 --- a/openerp/addons/base/ir/ir_sequence.py +++ b/openerp/addons/base/ir/ir_sequence.py @@ -97,7 +97,7 @@ class ir_sequence(openerp.osv.osv.osv): 'number_next': openerp.osv.fields.integer('Next Number', required=True, help="Next number of this sequence"), 'number_next_actual': openerp.osv.fields.function(_get_number_next_actual, fnct_inv=_set_number_next_actual, type='integer', required=True, string='Next Number', help='Next number that will be used. This number can be incremented frequently so the displayed value might already be obsolete'), 'number_increment': openerp.osv.fields.integer('Increment Number', required=True, help="The next number of the sequence will be incremented by this number"), - 'padding' : openerp.osv.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' : openerp.osv.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': openerp.osv.fields.many2one('res.company', 'Company'), } _defaults = { diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py index 45f1b813457..9f24be260fb 100644 --- a/openerp/addons/base/ir/ir_ui_menu.py +++ b/openerp/addons/base/ir/ir_ui_menu.py @@ -428,7 +428,7 @@ class ir_ui_menu(osv.osv): 'parent_right': fields.integer('Parent Right', select=True), 'groups_id': fields.many2many('res.groups', 'ir_ui_menu_group_rel', 'menu_id', 'gid', 'Groups', help="If you have groups, the visibility of this menu will be based on these groups. "\ - "If this field is empty, OpenERP will compute visibility based on the related object's read access."), + "If this field is empty, Odoo will compute visibility based on the related object's read access."), 'complete_name': fields.function(_get_full_name, string='Full Path', type='char', size=128), 'icon': fields.selection(tools.icons, 'Icon', size=64), diff --git a/openerp/addons/base/ir/ir_ui_menu_view.xml b/openerp/addons/base/ir/ir_ui_menu_view.xml index 00a2f8c87c2..a2724c9503c 100644 --- a/openerp/addons/base/ir/ir_ui_menu_view.xml +++ b/openerp/addons/base/ir/ir_ui_menu_view.xml @@ -66,7 +66,7 @@ <field name="view_id" ref="edit_menu"/> <field name="context">{'ir.ui.menu.full_list':True}</field> <field name="search_view_id" ref="edit_menu_access_search"/> - <field name="help">Manage and customize the items available and displayed in your OpenERP system menu. You can delete an item by clicking on the box at the beginning of each line and then delete it through the button that appeared. Items can be assigned to specific groups in order to make them accessible to some users within the system.</field> + <field name="help">Manage and customize the items available and displayed in your Odoo system menu. You can delete an item by clicking on the box at the beginning of each line and then delete it through the button that appeared. Items can be assigned to specific groups in order to make them accessible to some users within the system.</field> </record> <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.next_id_2" sequence="1"/> diff --git a/openerp/addons/base/ir/ir_ui_view_view.xml b/openerp/addons/base/ir/ir_ui_view_view.xml index 61b5af9b06d..f67b9558387 100644 --- a/openerp/addons/base/ir/ir_ui_view_view.xml +++ b/openerp/addons/base/ir/ir_ui_view_view.xml @@ -82,7 +82,7 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">ir.ui.view</field> <field name="view_id" ref="view_view_tree"/> - <field name="help">Views allows you to personalize each view of OpenERP. You can add new fields, move fields, rename them or delete the ones that you do not need.</field> + <field name="help">Views allows you to personalize each view of Odoo. You can add new fields, move fields, rename them or delete the ones that you do not need.</field> </record> <menuitem action="action_ui_view" id="menu_action_ui_view" parent="base.next_id_2" sequence="2"/> diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml index ad5998b091b..5ade7918454 100644 --- a/openerp/addons/base/module/module_data.xml +++ b/openerp/addons/base/module/module_data.xml @@ -99,7 +99,7 @@ <record model="ir.module.category" id="module_category_report_designer"> <field name="name">Advanced Reporting</field> - <field name="description">Lets you install various tools to simplify and enhance OpenERP's report creation.</field> + <field name="description">Lets you install various tools to simplify and enhance Odoo's report creation.</field> <field name="sequence">14</field> </record> diff --git a/openerp/addons/base/report/preview_report.rml b/openerp/addons/base/report/preview_report.rml index 8643f04db75..f3a54527a13 100644 --- a/openerp/addons/base/report/preview_report.rml +++ b/openerp/addons/base/report/preview_report.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <document filename="preview_report.pdf"> - <template title="Preview Report" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> + <template title="Preview Report" author="Odoo (sales@odoo.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> </pageTemplate> diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml index 5c4a87f9b83..5cb5d2d5e7d 100644 --- a/openerp/addons/base/res/res_bank_view.xml +++ b/openerp/addons/base/res/res_bank_view.xml @@ -167,7 +167,7 @@ You can reorder bank accounts from the list view. </p> <p> - If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data. + If you use the accounting application of Odoo, journals and accounts will be created automatically based on these data. </p> </field> </record> diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index 1a83e8d8465..fc0c442c493 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -371,7 +371,7 @@ class res_company(osv.osv): <!-- left margin --> <rotate degrees="90"/> <fill color="grey"/> - <drawString x="2.65cm" y="-0.4cm">generated by OpenERP.com</drawString> + <drawString x="2.65cm" y="-0.4cm">generated by Odoo.com</drawString> <fill color="black"/> <rotate degrees="-90"/> diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index f1fb225d951..7d062fac30b 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -55,7 +55,7 @@ <div> <field name="rml_header1" placeholder="e.g. Global Business Solutions"/> </div> - <field name="website" widget="url" placeholder="e.g. www.openerp.com" + <field name="website" widget="url" placeholder="e.g. www.odoo.com" on_change="onchange_footer(custom_footer, phone, fax, email, website, vat, company_registry, bank_ids)"/> </group> <group> @@ -132,7 +132,7 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">res.company</field> <field name="view_type">form</field> - <field name="help">Create and manage the companies that will be managed by OpenERP from here. Shops or subsidiaries can be created and maintained from here.</field> + <field name="help">Create and manage the companies that will be managed by Odoo from here. Shops or subsidiaries can be created and maintained from here.</field> </record> <menuitem action="action_res_company_form" id="menu_action_res_company_form" parent="base.menu_res_company_global"/> <record id="action_res_company_tree" model="ir.actions.act_window"> diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 4e25279e555..a360ff26e79 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -172,7 +172,7 @@ </div> <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}' attrs="{'readonly': [('use_parent_address','=',True)]}"/> </div> - <field name="website" widget="url" placeholder="e.g. www.openerp.com"/> + <field name="website" widget="url" placeholder="e.g. www.odoo.com"/> </group> <group> <field name="function" placeholder="e.g. Sales Director" @@ -424,7 +424,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> @@ -463,7 +463,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> @@ -483,7 +483,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 supplier: discussions, history of purchases, documents, etc. </p> diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 5f2ad711ffe..a864725a9cc 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -335,7 +335,7 @@ class res_users(osv.osv): def unlink(self, cr, uid, ids, context=None): if 1 in ids: - raise osv.except_osv(_('Can not remove root user!'), _('You can not remove the admin user as it is used internally for resources created by OpenERP (updates, module installation, ...)')) + raise osv.except_osv(_('Can not remove root user!'), _('You can not remove the admin user as it is used internally for resources created by Odoo (updates, module installation, ...)')) db = cr.dbname if db in self._uid_cache: for id in ids: diff --git a/openerp/addons/base/workflow/workflow_view.xml b/openerp/addons/base/workflow/workflow_view.xml index b69bba72dd2..23ca704cff0 100644 --- a/openerp/addons/base/workflow/workflow_view.xml +++ b/openerp/addons/base/workflow/workflow_view.xml @@ -52,7 +52,7 @@ <field name="act_to"/> <field name="signal"/> </arrow> - <label string="When customizing a workflow, be sure you do not modify an existing node or arrow, but rather add new nodes or arrows. If you absolutly need to modify a node or arrow, you can only change fields that are empty or set to the default value. If you don't do that, your customization will be overwrited at the next update or upgrade to a future version of OpenERP."/> + <label string="When customizing a workflow, be sure you do not modify an existing node or arrow, but rather add new nodes or arrows. If you absolutly need to modify a node or arrow, you can only change fields that are empty or set to the default value. If you don't do that, your customization will be overwrited at the next update or upgrade to a future version of Odoo."/> </diagram> </field> </record> diff --git a/openerp/release.py b/openerp/release.py index 8cc3235bfdf..5d3be4f50ae 100644 --- a/openerp/release.py +++ b/openerp/release.py @@ -34,8 +34,8 @@ version_info = (8, 0, 0, RELEASE_CANDIDATE, 1) version = '.'.join(map(str, version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '') series = serie = major_version = '.'.join(map(str, version_info[:2])) -description = 'OpenERP Server' -long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic +description = 'Odoo Server' +long_desc = '''Odoo is a complete ERP and CRM. The main features are accounting (analytic and financial), stock management, sales and purchases management, tasks automation, marketing campaigns, help desk, POS, etc. Technical features include a distributed server, flexible workflows, an object database, a dynamic GUI, diff --git a/openerp/report/render/simple.py b/openerp/report/render/simple.py index cb3831c141f..d26d5772ed9 100644 --- a/openerp/report/render/simple.py +++ b/openerp/report/render/simple.py @@ -38,7 +38,7 @@ class simple(render.render): title = parser.documentElement.tagName doc = SimpleDocTemplate(self.result, pagesize=A4, title=title, - author='OpenERP, Fabien Pinckaers', leftmargin=10*mm, rightmargin=10*mm) + author='Odoo, Fabien Pinckaers', leftmargin=10*mm, rightmargin=10*mm) styles = reportlab.lib.styles.getSampleStyleSheet() title_style = copy.deepcopy(styles["Heading1"]) diff --git a/openerp/tools/config.py b/openerp/tools/config.py index e4205f0b5f5..a9132ff42bc 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -119,7 +119,7 @@ class configmanager(object): group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules default=web") group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(), - help="Directory where to store OpenERP data") + help="Directory where to store Odoo data") parser.add_option_group(group) # XML-RPC / HTTP @@ -230,7 +230,7 @@ class configmanager(object): parser.add_option_group(group) group = optparse.OptionGroup(parser, "Internationalisation options", - "Use these options to translate OpenERP to another language." + "Use these options to translate Odoo to another language." "See i18n section of the user manual. Option '-d' is mandatory." "Option '-l' is mandatory in case of importation" ) |