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

[FIX] morning typo fix

Browse Source
This commit is contained in:
Martin Trigaux
2015-11-05 10:42:12 +01:00
parent ddfbb690fb
commit 36c05660ee
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/web_planner_data.xml
+1 -1
View File
@@ -87,7 +87,7 @@
<t t-call="web_planner.page">
<t t-set="page_title">Your KPIs</t>
<p class="text-muted">
What are the main KPIs you need to track for your the sales actities?
What are the main KPIs you need to track for your the sales activities?
</p>
<div class="row">
<div class="o_planner_notebook_container col-md-12">
addons/mail/views/contact_views.xml
+1 -1
View File
@@ -15,7 +15,7 @@
Click to add a contact in your address book.
</p><p>
Odoo helps you easily track all activities related to
a customer; discussions, history of business opportunities,
a customer: discussions, history of business opportunities,
documents, etc.
</p>
</field>
addons/pos_restaurant/restaurant_view.xml
+1 -1
View File
@@ -131,7 +131,7 @@
</p><p>
Each Order Printer has an IP Address that defines the PosBox/Hardware
Proxy where the printer can be found, and a list of product categories.
An Order Printer will only print updates for prodcuts belonging to one of
An Order Printer will only print updates for products belonging to one of
its categories.
</p>
</field>
addons/web_planner/views/web_planner_views.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<field name="arch" type="xml">
<search string="Planner">
<filter name="active" string="Active" domain="[('active', '=', True)]"/>
<filter name="unactive" string="Unactive" domain="[('active', '=', False)]"/>
<filter name="unactive" string="Inactive" domain="[('active', '=', False)]"/>
</search>
</field>
</record>
addons/website_links/views/website_links_template.xml
+1 -1
View File
@@ -83,7 +83,7 @@
<div class="col-sm-offset-1 col-sm-3 hidden-xs">
<p class="text-muted text-justify">Share this page with a <strong>short link</strong> that includes <strong>analytics trackers</strong>.</p>
<p class="text-muted text-justify">Thoses trackers can be used in Google Analytics to track clicks and visitors, or in Odoo reports to track opportunities and related revenues.</p>
<p class="text-muted text-justify">Those trackers can be used in Google Analytics to track clicks and visitors, or in Odoo reports to track opportunities and related revenues.</p>
</div>
</div>
openerp/addons/base/res/res_partner_view.xml
+1 -1
View File
@@ -441,7 +441,7 @@
Click to add a contact in your address book.
</p><p>
Odoo helps you easily track all activities related to
a customer; discussions, history of business opportunities,
a customer: discussions, history of business opportunities,
documents, etc.
</p>
</field>
openerp/addons/base/res/res_users.py
+2 -2
View File
@@ -346,9 +346,9 @@ class res_users(osv.osv):
if values.get('active') == False:
for current_id in ids:
if current_id == SUPERUSER_ID:
raise UserError(_("You cannot unactivate the admin user."))
raise UserError(_("You cannot deactivate the admin user."))
elif current_id == uid:
raise UserError(_("You cannot unactivate the user you're currently logged in as."))
raise UserError(_("You cannot deactivate the user you're currently logged in as."))
if ids == [uid]:
for key in values.keys():