diff --git a/.tx/config b/.tx/config
index e2ade130fff..b4d4949d878 100644
--- a/.tx/config
+++ b/.tx/config
@@ -317,7 +317,7 @@ file_filter = addons/im_livechat/i18n/<lang>.po
 source_file = addons/im_livechat/i18n/im_livechat.pot
 source_lang = en
 
-[odoo-master.l10n_multilang]
+[odoo-10.l10n_multilang]
 file_filter = addons/l10n_multilang/i18n/<lang>.po
 source_file = addons/l10n_multilang/i18n/l10n_multilang.pot
 source_lang = en
diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 2512fe8ac30..439daf7bf33 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -1343,9 +1343,10 @@ class AccountInvoiceTax(models.Model):
             base = 0.0
             for line in tax.invoice_id.invoice_line_ids:
                 if tax.tax_id in line.invoice_line_tax_ids:
-                    base += line.price_subtotal
-                    # To add include base amount taxes
-                    base += sum((line.invoice_line_tax_ids.filtered(lambda t: t.include_base_amount) - tax.tax_id).mapped('amount'))
+                    price_unit = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+                    base += (line.invoice_line_tax_ids - tax.tax_id).compute_all(
+                        price_unit, line.invoice_id.currency_id, line.quantity, line.product_id, line.invoice_id.partner_id
+                    )['base']
             tax.base = base
 
     invoice_id = fields.Many2one('account.invoice', string='Invoice', ondelete='cascade', index=True)
diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index c3733ba3f50..9b4367f2992 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -280,7 +280,7 @@ class HrExpense(models.Model):
         if help_message:
             alias_record = self.env.ref('hr_expense.mail_alias_expense')
             if alias_record and alias_record.alias_domain and alias_record.alias_name:
-                link = "<a id='o_mail_test' href='mailto:%(email)s&subject=Lunch+with+customer%%3A+%%2412.32'>%(email)s</a>" % {
+                link = "<a id='o_mail_test' href='mailto:%(email)s?subject=Lunch%%20with%%20customer%%3A%%20%%2412.32'>%(email)s</a>" % {
                     'email': '%s@%s' % (alias_record.alias_name, alias_record.alias_domain)
                 }
                 return '<p class="oe_view_nocontent_create">%s<br/>%s</p>%s' % (
diff --git a/addons/payment_paypal/controllers/main.py b/addons/payment_paypal/controllers/main.py
index a74ab8e1d29..180c028edd1 100644
--- a/addons/payment_paypal/controllers/main.py
+++ b/addons/payment_paypal/controllers/main.py
@@ -62,7 +62,7 @@ class PaypalController(http.Controller):
         self.paypal_validate_data(**post)
         return ''
 
-    @http.route('/payment/paypal/dpn', type='http', auth="none", methods=['POST'], csrf=False)
+    @http.route('/payment/paypal/dpn', type='http', auth="none", methods=['POST', 'GET'], csrf=False)
     def paypal_dpn(self, **post):
         """ Paypal DPN """
         _logger.info('Beginning Paypal DPN form_feedback with post data %s', pprint.pformat(post))  # debug
diff --git a/addons/point_of_sale/models/pos_config.py b/addons/point_of_sale/models/pos_config.py
index a68cbf05334..ad25692e1e3 100644
--- a/addons/point_of_sale/models/pos_config.py
+++ b/addons/point_of_sale/models/pos_config.py
@@ -71,7 +71,7 @@ class PosConfig(models.Model):
     iface_invoicing = fields.Boolean(string='Invoicing', help='Enables invoice generation from the Point of Sale', default=True)
     iface_big_scrollbars = fields.Boolean('Large Scrollbars', help='For imprecise industrial touchscreens')
     iface_print_auto = fields.Boolean(string='Automatic Receipt Printing', default=False,
-        help='The receipt will automatically be p-rinted at the end of each order')
+        help='The receipt will automatically be printed at the end of each order')
     iface_print_skip_screen = fields.Boolean(string='Skip Receipt Screen', default=True,
         help='The receipt screen will be skipped if the receipt can be printed automatically.')
     iface_precompute_cash = fields.Boolean(string='Prefill Cash Payment',
diff --git a/addons/point_of_sale/static/description/index.html b/addons/point_of_sale/static/description/index.html
index 56d377abe38..df254603ebf 100644
--- a/addons/point_of_sale/static/description/index.html
+++ b/addons/point_of_sale/static/description/index.html
@@ -32,7 +32,7 @@
 <section class="oe_container">
     <div class="oe_row oe_spaced">
         <h2 class="oe_slogan" style="color:#A24689;">An interface designed for productivity</h2>
-        <h3 class="oe_slogan oe_mb32">The Point of Sales that keeps everything where you need it</h3>
+        <h3 class="oe_slogan oe_mb32">The point of sale that keeps everything where you need it</h3>
         <div class="oe_span4 text-center">
             <span class="fa fa-paint-brush fa-2x"/>
             <h4 class="oe_mt16 oe_mb8">
@@ -80,7 +80,7 @@
                 While an Internet connection is required to start the Point of Sale, it will stay operational even after complete disconnection. Because it's extremely flexible, you can configure Odoo POS to meet your precise needs.
             </p>
             <p class="oe_mt8">
-                No installation and no specific hardware is required to use Odoo POS. Our solution for point of sales is compatible with desktop PCs, iPads and other tablet computers, laptops and industrial POS machines.
+                No installation and no specific hardware is required to use Odoo POS. Our solution for points of sale is compatible with desktop PCs, iPads and other tablet computers, laptops and industrial POS machines.
             </p>
         </div>
     </div>
@@ -128,7 +128,7 @@
     <div class="oe_row oe_spaced">
         <div class="lead text-center">
             <p>
-            Odoo Point of Sales is more than an ordinary POS.
+            Odoo Point of Sale is more than an ordinary POS.
             <br/>
             Our app provides extra features to deliver awesome customer service.
             </p>
@@ -145,7 +145,7 @@
         </div>
         <div class='oe_span6'>
             <p class="oe_mt32 text-justify">
-            Give your shopper a positive experience by improving your services. Handle refunds, track warranties, follow customer claims, plan order deliveries, etc... in one interface. Bring your sales at the next level. Odoo POS can produce customer invoices in just a few clicks and synchronize with Odoo Accounting. Your accounting will be easier and more accurate. Our Point of Sales helps you to control sales and cash in real time but also to keep your whole operations under control.
+            Give your shopper a positive experience by improving your services. Handle refunds, track warranties, follow customer claims, plan order deliveries, etc... in one interface. Bring your sales at the next level. Odoo POS can produce customer invoices in just a few clicks and synchronize with Odoo Accounting. Your accounting will be easier and more accurate. Our Point of Sale helps you to control sales and cash in real time but also to keep your whole operations under control.
             </p>
         </div>
     </div>
diff --git a/addons/point_of_sale/views/res_config_view.xml b/addons/point_of_sale/views/res_config_view.xml
index 91244ec7593..4e82b88ef7d 100644
--- a/addons/point_of_sale/views/res_config_view.xml
+++ b/addons/point_of_sale/views/res_config_view.xml
@@ -9,7 +9,7 @@
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group string="Importable Point of Sales Data">
+                    <group string="Importable Point of Sale Data">
                         <label for="div" string="Beverages"/>
                         <div>
                             <div>
diff --git a/addons/pos_data_drinks/__manifest__.py b/addons/pos_data_drinks/__manifest__.py
index ed096f7220a..13b7335b2aa 100644
--- a/addons/pos_data_drinks/__manifest__.py
+++ b/addons/pos_data_drinks/__manifest__.py
@@ -7,9 +7,9 @@
     'version': '1.0',
     'category': 'Point of Sale',
     'sequence': 99,
-    'summary': 'Common Drinks data for point of sales',
+    'summary': 'Common Drinks data for points of sale',
     'description': """
-        Common drinks data for point of sales
+        Common drinks data for points of sale
     """,
     'depends': ['point_of_sale'],
     'data': [
diff --git a/addons/sale/data/sale_data.xml b/addons/sale/data/sale_data.xml
index bfa78f5e596..fb9bfb15dce 100644
--- a/addons/sale/data/sale_data.xml
+++ b/addons/sale/data/sale_data.xml
@@ -34,7 +34,7 @@
 
         <!-- Salesteam-related subtypes for messaging / Chatter -->
         <record id="mt_salesteam_order_sent" model="mail.message.subtype">
-            <field name="name">Quotation Send</field>
+            <field name="name">Quotation sent</field>
             <field name="sequence">20</field>
             <field name="res_model">crm.team</field>
             <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
diff --git a/addons/web/static/src/js/control_panel.js b/addons/web/static/src/js/control_panel.js
index 4c8faec9ad7..56f02d90eaf 100644
--- a/addons/web/static/src/js/control_panel.js
+++ b/addons/web/static/src/js/control_panel.js
@@ -67,7 +67,7 @@ var ControlPanel = Widget.extend({
         };
 
         // Prevent the search dropdowns to close when clicking inside them
-        this.$el.on('click.bs.dropdown', '.oe-search-options .dropdown-menu', function (e) {
+        this.$el.on('click.bs.dropdown', '.o_search_options .dropdown-menu', function (e) {
             e.stopPropagation();
         });
 
diff --git a/addons/web/static/src/js/web_client.js b/addons/web/static/src/js/web_client.js
index c6033d6cbad..d94f686c440 100644
--- a/addons/web/static/src/js/web_client.js
+++ b/addons/web/static/src/js/web_client.js
@@ -58,10 +58,10 @@ return AbstractWebClient.extend({
     toggle_bars: function(value) {
         this.$('tr:has(td.navbar),.oe_leftbar').toggle(value);
     },
-    update_logo: function() {
+    update_logo: function(reload) {
         var company = session.company_id;
         var img = session.url('/web/binary/company_logo' + '?db=' + session.db + (company ? '&company=' + company : ''));
-        this.$('.oe_logo img').attr('src', '').attr('src', img);
+        this.$('.o_sub_menu_logo img').attr('src', '').attr('src', img + (reload ? "#" + Date.now() : ''));
         this.$('.oe_logo_edit').toggleClass('oe_logo_edit_admin', session.is_superuser);
     },
     logo_edit: function(ev) {
@@ -76,12 +76,13 @@ return AbstractWebClient.extend({
                     action_buttons: true,
                     headless: true,
                 };
-                self.action_manager.do_action(result);
-                var form = self.action_manager.dialog_widget.views.form.controller;
-                form.on("on_button_cancel", self.action_manager, self.action_manager.dialog_stop);
-                form.on('record_saved', self, function() {
-                    self.action_manager.dialog_stop();
-                    self.update_logo();
+                self.action_manager.do_action(result).then(function () {
+                    var form = self.action_manager.dialog_widget.views.form.controller;
+                    form.on("on_button_cancel", self.action_manager, self.action_manager.dialog_stop);
+                    form.on('record_saved', self, function() {
+                        self.action_manager.dialog_stop();
+                        self.update_logo();
+                    });
                 });
             });
         });
diff --git a/addons/web_editor/static/src/js/snippets.editor.js b/addons/web_editor/static/src/js/snippets.editor.js
index a628b6110e8..d603210b576 100644
--- a/addons/web_editor/static/src/js/snippets.editor.js
+++ b/addons/web_editor/static/src/js/snippets.editor.js
@@ -562,7 +562,7 @@ data.Class = Widget.extend({
                         animation.start(true, $target);
 
                         self.call_for_all_snippets($target, function (editor, $snippet) {
-                            editor.drop_and_build_snippet();
+                            _.defer(function () { editor.drop_and_build_snippet(); });
                         });
                         self.create_snippet_editor($target);
                         self.cover_target($target.data('overlay'), $target);
@@ -582,12 +582,10 @@ data.Class = Widget.extend({
         var self = this;
         $snippet.add(data.globalSelector.all($snippet)).each(function () {
             var $snippet = $(this);
-            setTimeout(function () {
-                self.create_snippet_editor($snippet);
-                if ($snippet.data("snippet-editor")) {
-                    callback.call(self, $snippet.data("snippet-editor"), $snippet);
-                }
-            });
+            self.create_snippet_editor($snippet);
+            if ($snippet.data("snippet-editor")) {
+                callback.call(self, $snippet.data("snippet-editor"), $snippet);
+            }
         });
     },
 
@@ -884,17 +882,25 @@ data.Editor = Class.extend({
     },
     _drag_and_drop_stop: function () {
         var self = this;
-        var $dropzone = this.$target.prev();
-        var prev = $dropzone.length && $dropzone[0].previousSibling;
+
+        $(".oe_drop_zone").droppable('destroy').remove();
+
+        var prev = this.$target.first()[0].previousSibling;
         var next = this.$target.last()[0].nextSibling;
         var $parent = this.$target.parent();
 
-        $(".oe_drop_clone").after(this.$target);
+        var $clone = $(".oe_drop_clone");
+        if (prev === $clone[0]) {
+            prev = $clone[0].previousSibling;
+        } else if (next === $clone[0]) {
+            next = $clone[0].nextSibling;
+        }
+        $clone.after(this.$target);
 
         this.$overlay.removeClass("hidden");
         $("body").removeClass('move-important');
-        $('.oe_drop_zone').droppable('destroy').remove();
-        $(".oe_drop_clone, .oe_drop_to_remove").remove();
+        $clone.remove();
+        $(".oe_drop_to_remove").remove();
 
         if (this.dropped) {
             this.buildingBlock.getParent().rte.historyRecordUndo(this.$target);
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 7215231c665..6f24f911257 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -18,17 +18,23 @@ from odoo.addons.website_portal.controllers.main import website_account
 
 class WebsiteAccount(website_account):
 
-    @http.route()
-    def account(self):
-        response = super(WebsiteAccount, self).account()
-        lead_count = request.env['crm.lead'].search_count([
-            ('partner_assigned_id', '=', request.env.user.partner_id.id),
+    def get_domain_my_lead(self, user):
+        return [
+            ('partner_assigned_id', 'child_of', user.commercial_partner_id.id),
             ('type', '=', 'lead')
-        ])
-        opp_count = request.env['crm.lead'].search_count([
-            ('partner_assigned_id', '=', request.env.user.partner_id.id),
+        ]
+
+    def get_domain_my_opp(self, user):
+        return [
+            ('partner_assigned_id', 'child_of', user.commercial_partner_id.id),
             ('type', '=', 'opportunity')
-        ])
+        ]
+
+    @http.route()
+    def account(self, **kw):
+        response = super(WebsiteAccount, self).account(**kw)
+        lead_count = request.env['crm.lead'].search_count(self.get_domain_my_lead(request.env.user))
+        opp_count = request.env['crm.lead'].search_count(self.get_domain_my_opp(request.env.user))
         response.qcontext.update({'lead_count': lead_count, 'opp_count': opp_count})
         return response
 
@@ -36,7 +42,7 @@ class WebsiteAccount(website_account):
     def portal_my_leads(self, page=1, date_begin=None, date_end=None, lead=None, sortby=None, **kw):
         values = self._prepare_portal_layout_values()
         CrmLead = request.env['crm.lead']
-        domain = [('partner_assigned_id', '=', request.env.user.partner_id.id), ('type', '=', 'lead')]
+        domain = self.get_domain_my_lead(request.env.user)
 
         sortings = {
             'date': {'label': _('Newest'), 'order': 'create_date desc'},
@@ -79,7 +85,7 @@ class WebsiteAccount(website_account):
     def portal_my_opportunities(self, page=1, date_begin=None, date_end=None, opportunity=None, sortby=None, **kw):
         values = self._prepare_portal_layout_values()
         CrmLead = request.env['crm.lead']
-        domain = [('partner_assigned_id', '=', request.env.user.partner_id.id), ('type', '=', 'opportunity')]
+        domain = self.get_domain_my_opp(request.env.user)
 
         today = fields.Date.today()
         this_week_end_date = fields.Date.to_string(fields.Date.from_string(today) + datetime.timedelta(days=7))
@@ -185,9 +191,7 @@ class WebsiteCrmPartnerAssign(WebsitePartnerPage):
         if not country and not country_all:
             country_code = request.session['geoip'].get('country_code')
             if country_code:
-                country_ids = country_obj.search([('code', '=', country_code)])
-                if country_ids:
-                    country = country_obj.browse(country_ids[0])
+                country = country_obj.search([('code', '=', country_code)], limit=1)
         if country:
             grade_domain += [('country_id', '=', country.id)]
         grades = partner_obj.sudo().read_group(
diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 51cef4ed21e..fdcfdb6d61c 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -170,7 +170,7 @@ class CrmLead(models.Model):
                                   ORDER BY distance LIMIT 1""", (longitude, latitude, lead.id))
                     res = self._cr.dictfetchone()
                     if res:
-                        partner_ids.append(res['id'])
+                        partner_ids = Partner.browse([res['id']])
 
                 total_weight = 0
                 toassign = []
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index 5fdb3dae5aa..3e9638fbf64 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -194,7 +194,7 @@
     </template>
     <template id="portal_my_home_menu_lead" name="Portal layout : lead menu entry" inherit_id="website_portal.portal_layout" priority="22">
         <xpath expr="//ul[contains(@class,'o_portal_submenu')]" position="inside">
-            <t t-if="user.partner_id.grade_id.id != False">
+            <t t-if="user.commercial_partner_id.grade_id">
                 <li t-att-class="page_name == 'lead' and 'active'">
                      <a href="/my/leads">Leads</a>
                 </li>
@@ -207,7 +207,7 @@
 
     <template id="portal_my_home_lead" name="Portal My Home : lead entries" inherit_id="website_portal.portal_my_home" priority="22">
         <xpath expr="//div[contains(@class,'o_my_home_content')]" position="inside">
-            <t t-if="user.partner_id.grade_id.id != False">
+            <t t-if="user.commercial_partner_id.grade_id">
                 <h3 class="page-header">
                     <a href="/my/leads">Your Leads
                         <small class="ml8">
@@ -259,20 +259,18 @@
                 <table class="table table-hover">
                     <thead>
                         <tr class="active">
-                            <th class="col-md-5">Name</th>
+                            <th class="col-xs-2">Date</th>
+                            <th class="col-xs-5">Name</th>
                             <th>Contact Name</th>
-                            <th>Stage</th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr t-foreach="leads" t-as="lead">
+                            <td><span t-field="lead.create_date" t-field-options='{"widget": "date"}' /></td>
                             <td>
                                 <a t-attf-href="/my/lead/#{lead.id}"><span t-field="lead.name"/></a>
                             </td>
                             <td><span t-field="lead.contact_name" /></td>
-                            <td>
-                                <span class="label label-primary" title="Current stage of the lead" t-esc="lead.stage_id.name" />
-                            </td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index a8e1995a91a..0bebe2efc7f 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -12,13 +12,14 @@
         </template>
 
         <template id="share_page_menu" inherit_id="website.user_navbar">
-            <xpath expr="//li[@groups='website.group_website_designer']//ul" position="inside">
+            <xpath expr="//li/a[@data-action='promote-current-page']/.." position="after">
                 <li>
                     <a href="/r" id="o_website_links_share_page">
-                        <span title="Track this page to count clicks">Share this Page</span>
+                        <span title="Track this page to count clicks">Track this Page</span>
                     </a>
                 </li>
             </xpath>
+
         </template>
 
         <template id="asset_website_links_menu" inherit_id="website.assets_editor">
diff --git a/addons/website_portal/controllers/main.py b/addons/website_portal/controllers/main.py
index 522b5ae7fe2..6477e1ef53d 100644
--- a/addons/website_portal/controllers/main.py
+++ b/addons/website_portal/controllers/main.py
@@ -50,7 +50,7 @@ class website_account(http.Controller):
             })
         return groups
 
-    @http.route(['/my', '/my/home'], type='http', auth="public", website=True)
+    @http.route(['/my', '/my/home'], type='http', auth="user", website=True)
     def account(self, **kw):
         values = self._prepare_portal_layout_values()
         return request.render("website_portal.portal_my_home", values)
diff --git a/addons/website_portal_sale/controllers/main.py b/addons/website_portal_sale/controllers/main.py
index 85ff187cdf3..3acc93988c9 100644
--- a/addons/website_portal_sale/controllers/main.py
+++ b/addons/website_portal_sale/controllers/main.py
@@ -11,9 +11,9 @@ from odoo.addons.website_portal.controllers.main import website_account
 class website_account(website_account):
 
     @http.route()
-    def account(self):
+    def account(self, **kw):
         """ Add sales documents to main account page """
-        response = super(website_account, self).account()
+        response = super(website_account, self).account(**kw)
         partner = request.env.user.partner_id
 
         SaleOrder = request.env['sale.order']
diff --git a/addons/website_project_issue/controllers/main.py b/addons/website_project_issue/controllers/main.py
index 8c066b420b1..8d1976c29ec 100644
--- a/addons/website_project_issue/controllers/main.py
+++ b/addons/website_project_issue/controllers/main.py
@@ -13,7 +13,9 @@ class WebsiteAccount(website_account):
     def _prepare_portal_layout_values(self):
         values = super(WebsiteAccount, self)._prepare_portal_layout_values()
         # domain is needed to hide non portal project for employee
-        issue_count = request.env['project.issue'].search_count([('project_id.privacy_visibility','=','portal')])
+        # portal users can't see the privacy_visibility, fetch the domain for them in sudo
+        portal_projects = request.env['project.project'].sudo().search([('privacy_visibility', '=', 'portal')])
+        issue_count = request.env['project.issue'].search_count([('project_id', 'in', portal_projects.ids)])
         values.update({
             'issue_count': issue_count,
         })
@@ -41,7 +43,9 @@ class WebsiteAccount(website_account):
                 str(proj.id): {'label': proj.name, 'domain': [('project_id', '=', proj.id)]}
             })
 
-        domain = [('project_id.privacy_visibility','=','portal')]
+        # portal users can't see the privacy_visibility, fetch the domain for them in sudo
+        portal_projects = request.env['project.project'].sudo().search([('privacy_visibility', '=', 'portal')])
+        domain = [('project_id', 'in', portal_projects.ids)]
         domain += project_filters.get(project, project_filters['all'])['domain']
         order = sortings.get(sortby, sortings['date'])['order']
 
diff --git a/doc/cla/corporate/goopen.md b/doc/cla/corporate/goopen.md
new file mode 100644
index 00000000000..91f5cded22a
--- /dev/null
+++ b/doc/cla/corporate/goopen.md
@@ -0,0 +1,15 @@
+Slovenia, 2016-09-05
+
+GoOpen, računalniške storitve, Aleš Ferlan s.p. agrees to the terms of the
+Odoo Corporate Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Aleš Ferlan alefer89@protonmail.com
+
+List of contributors:
+
+Aleš Ferlan alefer89@protonmail.com
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst
index 3209154c41b..5b906bfcd7a 100644
--- a/doc/setup/deploy.rst
+++ b/doc/setup/deploy.rst
@@ -233,15 +233,15 @@ connections to the secure port
 
 .. warning::
 
-  In case you are using the Point of Sale module in combinaison with a `POSBox`_,
+  In case you are using the Point of Sale module in combination with a `POSBox`_,
   you must disable the HTTPS configuration for the route ``/pos/web`` to avoid
-  mix-content errors.
+  mixed-content errors.
 
 Configuration sample
 --------------------
 
 * redirect http requests to https
-* proxiing requests to odoo
+* proxy requests to odoo
 
 in ``/etc/odoo.conf`` set:
 
@@ -440,4 +440,4 @@ of the supported browsers by Odoo version is the following:
 .. _use an SSH tunnel:
     http://www.postgresql.org/docs/9.3/static/ssh-tunnels.html
 .. _WSGI: http://wsgi.readthedocs.org/
-.. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2
\ No newline at end of file
+.. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2
diff --git a/odoo/addons/base/module/module_data.xml b/odoo/addons/base/module/module_data.xml
index 51b3f3d5a9a..7781aa38bdc 100644
--- a/odoo/addons/base/module/module_data.xml
+++ b/odoo/addons/base/module/module_data.xml
@@ -141,7 +141,7 @@
 
         <record model="ir.module.category" id="module_category_point_of_sale">
             <field name="name">Point of Sale</field>
-            <field name="description">Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more.</field>
+            <field name="description">Helps you get the most out of your points of sale with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more.</field>
             <field name="sequence">21</field>
         </record>