[MERGE] forward port branch saas-11 up to dc4d6b6

44 files changed, 681 insertions, 109 deletions

diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 86de39f5344..d7043ccb832 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -283,7 +283,7 @@
                                         <field name="code"/>
                                         <field name="refund_sequence" attrs="{'invisible': [('type', 'not in', ['sale', 'purchase'])]}" groups="base.group_no_one"/>
                                         <field name="sequence_id" required="0" attrs="{'readonly': 1}" groups="base.group_no_one"/>
-                                        <field name="refund_sequence_id" attrs="{'required': [('refund_sequence', '=', True)], 'invisible': ['|',('type', 'not in', ['sale', 'purchase']), ('refund_sequence', '!=', True)]}" required="0" groups="base.group_no_one"/>
+                                        <field name="refund_sequence_id" attrs="{'invisible': ['|',('type', 'not in', ['sale', 'purchase']), ('refund_sequence', '!=', True)], 'required': [('type', 'in', ['sale', 'purchase']), ('refund_sequence', '=', True)]}" groups="base.group_no_one"/>
                                     </group>
                                     <group>
                                         <field name="default_debit_account_id" domain="[('deprecated', '=', False)]" />
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 49c8acc6c34..b8727bbe76c 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -449,7 +449,7 @@ class AccountAssetDepreciationLine(models.Model):
             current_currency = line.asset_id.currency_id
             amount = current_currency.compute(line.amount, company_currency)
             sign = (category_id.journal_id.type == 'purchase' or category_id.journal_id.type == 'sale' and 1) or -1
-            asset_name = line.asset_id.name + ' (%s/%s)' % (line.sequence, line.asset_id.method_number)
+            asset_name = line.asset_id.name + ' (%s/%s)' % (line.sequence, len(line.asset_id.depreciation_line_ids))
             prec = self.env['decimal.precision'].precision_get('Account')
             move_line_1 = {
                 'name': asset_name,
diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
index a53f2959138..ba2cb3892fc 100644
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -51,15 +51,15 @@ class AccountInvoiceLine(models.Model):
 
     @api.one
     def asset_create(self):
-        if self.asset_category_id and self.asset_category_id.method_number > 1:
+        if self.asset_category_id:
             vals = {
                 'name': self.name,
                 'code': self.invoice_id.number or False,
                 'category_id': self.asset_category_id.id,
-                'value': self.price_subtotal,
+                'value': self.price_subtotal_signed,
                 'partner_id': self.invoice_id.partner_id.id,
                 'company_id': self.invoice_id.company_id.id,
-                'currency_id': self.invoice_id.currency_id.id,
+                'currency_id': self.invoice_id.company_currency_id.id,
                 'date': self.asset_start_date or self.invoice_id.date_invoice,
                 'invoice_id': self.invoice_id.id,
             }
diff --git a/addons/account_tax_cash_basis/tax_cash_basis.py b/addons/account_tax_cash_basis/tax_cash_basis.py
index 8f45ab3e3a9..b68e348c59e 100644
--- a/addons/account_tax_cash_basis/tax_cash_basis.py
+++ b/addons/account_tax_cash_basis/tax_cash_basis.py
@@ -35,30 +35,57 @@ class ResCompany(models.Model):
 class AccountPartialReconcileCashBasis(models.Model):
     _inherit = 'account.partial.reconcile'
 
-    def create_tax_cash_basis_entry(self, value_before_reconciliation):
-        #Search in account_move if we have any taxes account move lines
+    def _check_tax_exigible(self, line):
+        """ Function overwritten in account_tax_exigible to make sure we consider only the lines having tax_exigible set to False """
+        return False
+
+    def _get_tax_cash_basis_lines(self, value_before_reconciliation):
+        # Search in account_move if we have any taxes account move lines
         tax_group = {}
         total_by_cash_basis_account = {}
+        line_to_create = []
+        move_date = self.debit_move_id.date
         for move in (self.debit_move_id.move_id, self.credit_move_id.move_id):
+            if move_date < move.date:
+                move_date = move.date
             for line in move.line_ids:
-                if line.tax_line_id and line.tax_line_id.use_cash_basis:
-                    #amount to write is the current cash_basis amount minus the one before the reconciliation
-                    matched_percentage = value_before_reconciliation[move.id]
-                    amount = (line.credit_cash_basis - line.debit_cash_basis) - (line.credit - line.debit) * matched_percentage
-                    #group by line account
-                    acc = line.account_id.id
-                    if tax_group.get(acc, False):
-                        tax_group[acc] += amount
-                    else:
-                        tax_group[acc] = amount
-                    #Group by cash basis account
-                    acc = line.tax_line_id.cash_basis_account.id
-                    if total_by_cash_basis_account.get(acc, False):
-                        total_by_cash_basis_account[acc] += amount
-                    else:
-                        total_by_cash_basis_account[acc] = amount
-        line_to_create = []
-        for k,v in tax_group.items():
+                #TOCHECK: normal and cash basis taxes shoudn't be mixed together (on the same invoice line for example) as it will
+                #create reporting issues. Not sure of the behavior to implement in that case, though.
+                # amount to write is the current cash_basis amount minus the one before the reconciliation
+                matched_percentage = value_before_reconciliation[move.id]
+                amount = (line.credit_cash_basis - line.debit_cash_basis) - (line.credit - line.debit) * matched_percentage
+                if not self._check_tax_exigible(line):
+                    if line.tax_line_id and line.tax_line_id.use_cash_basis:
+                        # group by line account
+                        acc = line.account_id.id
+                        if tax_group.get(acc, False):
+                            tax_group[acc] += amount
+                        else:
+                            tax_group[acc] = amount
+                        # Group by cash basis account and tax
+                        acc = line.tax_line_id.cash_basis_account.id
+                        key = (acc, line.tax_line_id.id)
+                        if key in total_by_cash_basis_account:
+                            total_by_cash_basis_account[key] += amount
+                        else:
+                            total_by_cash_basis_account[key] = amount
+                    if any([tax.use_cash_basis for tax in line.tax_ids]):
+                        for tax in line.tax_ids:
+                            line_to_create.append((0, 0, {
+                                'name': '/',
+                                'debit': line.debit_cash_basis - line.debit * matched_percentage,
+                                'credit': line.credit_cash_basis - line.credit * matched_percentage,
+                                'account_id': line.account_id.id,
+                                'tax_ids': [(6, 0, [tax.id])],
+                                }))
+                            line_to_create.append((0, 0, {
+                                'name': '/',
+                                'credit': line.debit_cash_basis - line.debit * matched_percentage,
+                                'debit': line.credit_cash_basis - line.credit * matched_percentage,
+                                'account_id': line.account_id.id,
+                                }))
+
+        for k, v in tax_group.items():
             line_to_create.append((0, 0, {
                 'name': '/',
                 'debit': v if v > 0 else 0.0,
@@ -66,27 +93,39 @@ class AccountPartialReconcileCashBasis(models.Model):
                 'account_id': k,
                 }))
 
-        #Create counterpart vals
-        for k,v in total_by_cash_basis_account.items():
+        # Create counterpart vals
+        for key, v in total_by_cash_basis_account.items():
+            k, tax_id = key
             line_to_create.append((0, 0, {
                 'name': '/',
                 'debit': abs(v) if v < 0 else 0.0,
                 'credit': v if v > 0 else 0.0,
                 'account_id': k,
+                'tax_line_id': tax_id,
                 }))
+        return line_to_create, move_date
 
-        #Create move
+    def create_tax_cash_basis_entry(self, value_before_reconciliation):
+        line_to_create, move_date = self._get_tax_cash_basis_lines(value_before_reconciliation)
         if len(line_to_create) > 0:
-            #Check if company_journal for cash basis is set if not, raise exception
+            # Check if company_journal for cash basis is set if not, raise exception
             if not self.company_id.tax_cash_basis_journal_id:
                 raise UserError(_('There is no tax cash basis journal defined ' \
                                     'for this company: "%s" \nConfigure it in Accounting/Configuration/Settings') % \
                                       (self.company_id.name))
-            move = self.env['account.move'].create({
+            move_vals = {
                 'journal_id': self.company_id.tax_cash_basis_journal_id.id,
                 'line_ids': line_to_create,
-                'tax_cash_basis_rec_id': self.id})
-            #post move
+                'tax_cash_basis_rec_id': self.id
+            }
+            # The move date should be the maximum date between payment and invoice (in case
+            # of payment in advance). However, we should make sure the move date is not
+            # recorded after the period lock date as the tax statement for this period is
+            # probably already sent to the estate.
+            if move_date > self.company_id.period_lock_date:
+                move_vals['date'] = move_date
+            move = self.env['account.move'].with_context(dont_create_taxes=True).create(move_vals)
+            # post move
             move.post()
 
     @api.model
diff --git a/addons/account_tax_exigible/__init__.py b/addons/account_tax_exigible/__init__.py
new file mode 100644
index 00000000000..18647072982
--- /dev/null
+++ b/addons/account_tax_exigible/__init__.py
@@ -0,0 +1,46 @@
+import models
+
+from openerp import SUPERUSER_ID
+
+def _migration_script(cr, registry):
+    #1. set the tax_exigible at True on all account.move lines not related to a tax in cash basis
+    cr.execute('''UPDATE account_move_line SET tax_exigible='t' ''')
+
+    cr.execute('''SELECT id FROM account_tax WHERE use_cash_basis = 't' ''')
+    tax_ids = tuple([x[0] for x in cr.fetchall()])
+    if tax_ids:
+        cr.execute('''UPDATE account_move_line SET tax_exigible='f' WHERE id IN (SELECT id FROM account_move_line WHERE tax_line_id IN %s OR id IN (SELECT account_move_line_id FROM account_move_line_account_tax_rel WHERE account_tax_id IN %s))''', (tax_ids, tax_ids))
+
+    #2. Fix the moves already created by the tax case based feature
+    #  create account.move.lines for tax_line_id and tax_ids that weren't correctly set/created at the time of reconciliation
+    existing_move = registry['account.move'].search(cr, SUPERUSER_ID, [('tax_cash_basis_rec_id', '!=', False)])
+    for m in registry['account.move'].browse(cr, SUPERUSER_ID, existing_move):
+        partial_rec = m.tax_cash_basis_rec_id
+        for move in (partial_rec.debit_move_id.move_id, partial_rec.credit_move_id.move_id):
+            matched_percentage = partial_rec.amount and (partial_rec.amount / move.amount) or 0.0
+            for l in move.line_ids:
+                if l.tax_exigible:
+                    continue
+
+                move_to_fix = registry['account.move'].search(cr, SUPERUSER_ID, [('tax_cash_basis_rec_id', '=', partial_rec.id)])[0]
+                amount = (l.debit - l.credit) * matched_percentage
+
+                registry['account.move.line'].create(cr, SUPERUSER_ID, {
+                    'name': '/',
+                    'debit': amount > 0 and amount or 0.0,
+                    'credit': amount < 0 and -amount or 0.0,
+                    'account_id': l.account_id.id,
+                    'tax_line_id': l.tax_line_id and l.tax_line_id.id or False,
+                    'tax_ids': l.tax_ids and [(6, 0, l.tax_ids.ids)] or [],
+                    'tax_exigible': True,
+                    'move_id': move_to_fix,
+                }, apply_taxes=False, context={'check_move_validity': False})
+                registry['account.move.line'].create(cr, SUPERUSER_ID, {
+                    'name': '/',
+                    'debit': -amount > 0 and -amount or 0.0,
+                    'credit': -amount < 0 and amount or 0.0,
+                    'account_id': l.account_id.id,
+                    'move_id': move_to_fix,
+                    'tax_exigible': True,
+                }, context={'check_move_validity': False})
+    return
diff --git a/addons/account_tax_exigible/__openerp__.py b/addons/account_tax_exigible/__openerp__.py
new file mode 100644
index 00000000000..11244bd9aa7
--- /dev/null
+++ b/addons/account_tax_exigible/__openerp__.py
@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name': 'Tax exigible',
+    'version': '1.0',
+    'category': 'Accounting',
+    'description': """
+    This is a bugfix-module backporting 39d68ac and adding the concept of tax exigibility on journal items.
+    """,
+    'depends': ['account_tax_cash_basis'],
+    'data': [],
+    'test': [],
+    'demo': [],
+    'auto_install': True,
+    'installable': True,
+    'post_init_hook': '_migration_script',
+}
diff --git a/addons/account_tax_exigible/models/__init__.py b/addons/account_tax_exigible/models/__init__.py
new file mode 100644
index 00000000000..00c67c4c228
--- /dev/null
+++ b/addons/account_tax_exigible/models/__init__.py
@@ -0,0 +1 @@
+import account_move
\ No newline at end of file
diff --git a/addons/account_tax_exigible/models/account_move.py b/addons/account_tax_exigible/models/account_move.py
new file mode 100644
index 00000000000..9f9e8c2bbd8
--- /dev/null
+++ b/addons/account_tax_exigible/models/account_move.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from openerp import fields, models, api
+
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+    tax_exigible = fields.Boolean(string='Appears in VAT report', default=True,
+        help="Technical field used to mark a tax line as exigible in the vat report or not (only exigible journal items are displayed). By default all new journal items are directly exigible, but with the module account_tax_cash_basis, some will become exigible only when the payment is recorded.")
+
+    @api.model
+    def create(self, vals, apply_taxes=True):
+        taxes = False
+        if vals.get('tax_line_id'):
+            taxes = [{'use_cash_basis': self.env['account.tax'].browse(vals['tax_line_id']).use_cash_basis}]
+        if vals.get('tax_ids'):
+            taxes = self.env['account.move.line'].resolve_2many_commands('tax_ids', vals['tax_ids'])
+        if taxes and any([tax['use_cash_basis'] for tax in taxes]) and not vals.get('tax_exigible'):
+            vals['tax_exigible'] = False
+        return super(AccountMoveLine, self).create(vals, apply_taxes=apply_taxes)
+
+class AccountPartialReconcileCashBasis(models.Model):
+    _inherit = 'account.partial.reconcile'
+
+    def _check_tax_exigible(self, line):
+        return line.tax_exigible
+
+    def _get_tax_cash_basis_lines(self, value_before_reconciliation):
+        lines, move_date = super(AccountPartialReconcileCashBasis, self)._get_tax_cash_basis_lines(value_before_reconciliation)
+        for i in range(len(lines)):
+            vals = lines[i][2]
+            vals['tax_exigible'] = True
+            lines[i] = (0, 0, vals)
+        return lines, move_date
diff --git a/addons/hr_timesheet/project_timesheet.py b/addons/hr_timesheet/project_timesheet.py
index 5b6ebd60132..72bee4a4e46 100644
--- a/addons/hr_timesheet/project_timesheet.py
+++ b/addons/hr_timesheet/project_timesheet.py
@@ -55,7 +55,7 @@ class Task(models.Model):
 
     parent_id = fields.Many2one('project.task', string='Parent Task')
     child_ids = fields.One2many('project.task', 'parent_id', string="Sub-tasks")
-    subtask_project_id = fields.Many2one('project.project', related="project_id.subtask_project_id", string='Sub-task Project')
+    subtask_project_id = fields.Many2one('project.project', related="project_id.subtask_project_id", string='Sub-task Project', readonly=True)
     subtask_count = fields.Integer(compute='_get_subtask_count', type='integer', string="Sub-task count")
 
     _constraints = [(osv.osv._check_recursion, 'Circular references are not permitted between tasks and sub-tasks', ['parent_id'])]
diff --git a/addons/link_tracker/controller/main.py b/addons/link_tracker/controller/main.py
index 1d7707fb65a..1f6caf4f7f4 100644
--- a/addons/link_tracker/controller/main.py
+++ b/addons/link_tracker/controller/main.py
@@ -8,6 +8,7 @@ from openerp.http import request
 class link_tracker(http.Controller):
     @http.route('/r/<string:code>', type='http', auth='none', website=True)
     def full_url_redirect(self, code, **post):
-        request.env['link.tracker.click'].add_click(code, request.httprequest.remote_addr, request.session['geoip'].get('country_code'), stat_id=False)
+        country_code = request.session.geoip and request.session.geoip.get('country_code') or False
+        request.env['link.tracker.click'].add_click(code, request.httprequest.remote_addr, country_code, stat_id=False)
         redirect_url = request.env['link.tracker'].get_url_from_code(code)
         return werkzeug.utils.redirect(redirect_url or '', 301)
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index d37e9dcf282..0398b179859 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -670,7 +670,7 @@ var chat_manager = {
             // post a message in a channel or execute a command
             return ChannelModel.call(data.command ? 'execute_command' : 'message_post', [options.channel_id], _.extend(msg, {
                 message_type: 'comment',
-                content_subtype: 'plaintext',
+                content_subtype: 'html',
                 subtype: 'mail.mt_comment',
                 command: data.command,
             }));
diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml
index 244cb15bd2f..1bbb796eb70 100644
--- a/addons/note/views/note_views.xml
+++ b/addons/note/views/note_views.xml
@@ -74,7 +74,7 @@
           <field name="open"/>
           <field name="memo"/>
           <field name="date_done"/>
-          <field name="message_follower_ids"/>
+          <field name="message_partner_ids"/>
           <field name="tag_ids"/>
           <templates>
             <t t-name="kanban-box">
@@ -101,9 +101,9 @@
                   <!-- title -->
                   <field name="name"/>
                 </span>
-                <t t-if="record.message_follower_ids.raw_value.length &gt; 1">
+                <t t-if="record.message_partner_ids.raw_value.length &gt; 1">
                     <div class="clearfix"></div>
-                      <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
+                      <t t-foreach="record.message_partner_ids.raw_value" t-as="follower">
                         <img t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar pull-right" t-att-data-member_id="follower"/>
                       </t>
                     <div class="clearfix"></div>
diff --git a/addons/payment_adyen/models/adyen.py b/addons/payment_adyen/models/adyen.py
index f9f17126a13..f492354c883 100644
--- a/addons/payment_adyen/models/adyen.py
+++ b/addons/payment_adyen/models/adyen.py
@@ -36,9 +36,9 @@ class AcquirerAdyen(osv.Model):
         return providers
 
     _columns = {
-        'adyen_merchant_account': fields.char('Merchant Account', required_if_provider='adyen'),
-        'adyen_skin_code': fields.char('Skin Code', required_if_provider='adyen'),
-        'adyen_skin_hmac_key': fields.char('Skin HMAC Key', required_if_provider='adyen'),
+        'adyen_merchant_account': fields.char('Merchant Account', required_if_provider='adyen', groups='base.group_user'),
+        'adyen_skin_code': fields.char('Skin Code', required_if_provider='adyen', groups='base.group_user'),
+        'adyen_skin_hmac_key': fields.char('Skin HMAC Key', required_if_provider='adyen', groups='base.group_user'),
     }
 
     def _adyen_generate_merchant_sig_sha256(self, acquirer, inout, values):
diff --git a/addons/payment_authorize/models/authorize.py b/addons/payment_authorize/models/authorize.py
index 828fd614ded..891ecfc2cc9 100644
--- a/addons/payment_authorize/models/authorize.py
+++ b/addons/payment_authorize/models/authorize.py
@@ -30,8 +30,8 @@ class PaymentAcquirerAuthorize(models.Model):
         providers.append(['authorize', 'Authorize.Net'])
         return providers
 
-    authorize_login = fields.Char(string='API Login Id', required_if_provider='authorize')
-    authorize_transaction_key = fields.Char(string='API Transaction Key', required_if_provider='authorize')
+    authorize_login = fields.Char(string='API Login Id', required_if_provider='authorize', groups='base.group_user')
+    authorize_transaction_key = fields.Char(string='API Transaction Key', required_if_provider='authorize', groups='base.group_user')
 
     def _authorize_generate_hashing(self, values):
         data = '^'.join([
diff --git a/addons/payment_buckaroo/models/buckaroo.py b/addons/payment_buckaroo/models/buckaroo.py
index 80cfbc2ddfb..e91290be54b 100644
--- a/addons/payment_buckaroo/models/buckaroo.py
+++ b/addons/payment_buckaroo/models/buckaroo.py
@@ -44,8 +44,8 @@ class AcquirerBuckaroo(osv.Model):
         return providers
 
     _columns = {
-        'brq_websitekey': fields.char('WebsiteKey', required_if_provider='buckaroo'),
-        'brq_secretkey': fields.char('SecretKey', required_if_provider='buckaroo'),
+        'brq_websitekey': fields.char('WebsiteKey', required_if_provider='buckaroo', groups='base.group_user'),
+        'brq_secretkey': fields.char('SecretKey', required_if_provider='buckaroo', groups='base.group_user'),
     }
 
     def _buckaroo_generate_digital_sign(self, acquirer, inout, values):
diff --git a/addons/payment_ogone/models/ogone.py b/addons/payment_ogone/models/ogone.py
index 618a83f5e27..a44e32b33b8 100644
--- a/addons/payment_ogone/models/ogone.py
+++ b/addons/payment_ogone/models/ogone.py
@@ -47,11 +47,11 @@ class PaymentAcquirerOgone(osv.Model):
         return providers
 
     _columns = {
-        'ogone_pspid': fields.char('PSPID', required_if_provider='ogone'),
-        'ogone_userid': fields.char('API User ID', required_if_provider='ogone'),
-        'ogone_password': fields.char('API User Password', required_if_provider='ogone'),
-        'ogone_shakey_in': fields.char('SHA Key IN', size=32, required_if_provider='ogone'),
-        'ogone_shakey_out': fields.char('SHA Key OUT', size=32, required_if_provider='ogone'),
+        'ogone_pspid': fields.char('PSPID', required_if_provider='ogone', groups='base.group_user'),
+        'ogone_userid': fields.char('API User ID', required_if_provider='ogone', groups='base.group_user'),
+        'ogone_password': fields.char('API User Password', required_if_provider='ogone', groups='base.group_user'),
+        'ogone_shakey_in': fields.char('SHA Key IN', size=32, required_if_provider='ogone', groups='base.group_user'),
+        'ogone_shakey_out': fields.char('SHA Key OUT', size=32, required_if_provider='ogone', groups='base.group_user'),
         'ogone_alias_usage': fields.char('Alias Usage', help="""If you want to use Ogone Aliases,
                                                                 this default Alias Usage will be presented to
                                                                 the customer as the reason you want to
diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py
index 7a91127d2f0..d91d5951aeb 100644
--- a/addons/payment_paypal/models/paypal.py
+++ b/addons/payment_paypal/models/paypal.py
@@ -39,17 +39,17 @@ class AcquirerPaypal(osv.Model):
         return providers
 
     _columns = {
-        'paypal_email_account': fields.char('Paypal Email ID', required_if_provider='paypal'),
+        'paypal_email_account': fields.char('Paypal Email ID', required_if_provider='paypal', groups='base.group_user'),
         'paypal_seller_account': fields.char(
-            'Paypal Merchant ID',
+            'Paypal Merchant ID', groups='base.group_user',
             help='The Merchant ID is used to ensure communications coming from Paypal are valid and secured.'),
-        'paypal_use_ipn': fields.boolean('Use IPN', help='Paypal Instant Payment Notification'),
+        'paypal_use_ipn': fields.boolean('Use IPN', help='Paypal Instant Payment Notification', groups='base.group_user'),
         # Server 2 server
         'paypal_api_enabled': fields.boolean('Use Rest API'),
-        'paypal_api_username': fields.char('Rest API Username'),
-        'paypal_api_password': fields.char('Rest API Password'),
-        'paypal_api_access_token': fields.char('Access Token'),
-        'paypal_api_access_token_validity': fields.datetime('Access Token Validity'),
+        'paypal_api_username': fields.char('Rest API Username', groups='base.group_user'),
+        'paypal_api_password': fields.char('Rest API Password', groups='base.group_user'),
+        'paypal_api_access_token': fields.char('Access Token', groups='base.group_user'),
+        'paypal_api_access_token_validity': fields.datetime('Access Token Validity', groups='base.group_user'),
     }
 
     _defaults = {
diff --git a/addons/payment_sips/controllers/main.py b/addons/payment_sips/controllers/main.py
index 0bf4a5f52b3..02c975d94e2 100644
--- a/addons/payment_sips/controllers/main.py
+++ b/addons/payment_sips/controllers/main.py
@@ -32,7 +32,7 @@ class SipsController(http.Controller):
 
         sips = acquirer_obj.search([('provider', '=', 'sips')], limit=1)
 
-        security = sips._sips_generate_shasign(post)
+        security = sips.sudo()._sips_generate_shasign(post)
         if security == post['Seal']:
             _logger.debug('Sips: validated data')
             res = tx_obj.sudo().form_feedback(post, 'sips')
diff --git a/addons/payment_sips/models/sips.py b/addons/payment_sips/models/sips.py
index df669fd3804..afec4d0cd9e 100644
--- a/addons/payment_sips/models/sips.py
+++ b/addons/payment_sips/models/sips.py
@@ -38,8 +38,8 @@ class AcquirerSips(models.Model):
     _inherit = 'payment.acquirer'
     # Fields
     sips_merchant_id = fields.Char('SIPS API User Password',
-                                   required_if_provider='sips')
-    sips_secret = fields.Char('SIPS Secret', size=64, required_if_provider='sips')
+                                   required_if_provider='sips', groups='base.group_user')
+    sips_secret = fields.Char('SIPS Secret', size=64, required_if_provider='sips', groups='base.group_user')
 
     # Methods
     def _get_sips_urls(self, environment):
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index e1f6d24ddd7..e6b8245af20 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -58,6 +58,7 @@ Main Features
         'views/res_config_view.xml',
         'views/report_statement.xml',
         'views/report_userlabel.xml',
+        'views/report_saledetails.xml',
         'views/point_of_sale.xml',
         'views/point_of_sale_dashboard.xml',
     ],
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index f4af63e4c61..3c110494630 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -22,3 +22,10 @@ class PosController(http.Controller):
             'session_info': json.dumps(request.env['ir.http'].session_info())
         }
         return request.render('point_of_sale.index', qcontext=context)
+
+    @http.route('/pos/sale_details_report', type='http', auth='user')
+    def print_sale_details(self, date_start=False, date_stop=False, **kw):
+        r = request.env['report.point_of_sale.report_saledetails']
+        pdf = request.env['report'].with_context(date_start=date_start, date_stop=date_stop).get_pdf(r, 'point_of_sale.report_saledetails')
+        pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
+        return request.make_response(pdf, headers=pdfhttpheaders)
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 071591ec7c7..9a6c286c5de 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 import logging
+from datetime import timedelta
 from functools import partial
 
 import psycopg2
@@ -8,7 +9,7 @@ import psycopg2
 from odoo import api, fields, models, tools, _
 from odoo.tools import float_is_zero
 from odoo.exceptions import UserError
-
+from odoo.http import request
 import odoo.addons.decimal_precision as dp
 
 _logger = logging.getLogger(__name__)
@@ -787,3 +788,104 @@ class PosOrderLineLot(models.Model):
     order_id = fields.Many2one('pos.order', related="pos_order_line_id.order_id")
     lot_name = fields.Char('Lot Name')
     product_id = fields.Many2one('product.product', related='pos_order_line_id.product_id')
+
+
+class ReportSaleDetails(models.AbstractModel):
+
+    _name = 'report.point_of_sale.report_saledetails'
+
+
+    @api.model
+    def get_sale_details(self, date_start=False, date_stop=False, company=False):
+        """ Serialise the orders of the day information
+
+        params: date_start, date_stop string representing the day of order
+        """
+        if not company:
+            company = self.env.user.company_id
+
+        today = fields.Datetime.from_string(fields.Date.context_today(self))
+        if date_start:
+            date_start = fields.Datetime.from_string(date_start)
+        else:
+            # start by default today 00:00:00
+            date_start = today
+
+        if date_stop:
+            # set time to 23:59:59
+            date_stop = fields.Datetime.from_string(date_stop) + timedelta(days=1, seconds=-1)
+        else:
+            # stop by default today 23:59:59
+            date_stop = today + timedelta(days=1, seconds=-1)
+
+        # avoid a date_stop smaller than date_start
+        date_stop = max(date_stop, date_start)
+
+        date_start = fields.Datetime.to_string(date_start)
+        date_stop = fields.Datetime.to_string(date_stop)
+        orders = self.env['pos.order'].search([('date_order', '>=', date_start), ('date_order', '<=', date_stop),
+                              ('state', 'in', ['paid','invoiced','done']),
+                              ('company_id', '=', company.id)])
+        user_currency = self.env.user.company_id.currency_id
+
+        total = 0.0
+        products_sold = {}
+        taxes = {}
+        for order in orders:
+            if user_currency != order.pricelist_id.currency_id:
+                total += order.pricelist_id.currency_id.compute(order.amount_total, user_currency)
+            else:
+                total += order.amount_total
+            currency = order.session_id.currency_id
+
+            for line in order.lines:
+                key = (line.product_id, line.price_unit, line.discount)
+                products_sold.setdefault(key, 0.0)
+                products_sold[key] += line.qty
+
+                if line.tax_ids_after_fiscal_position:
+                    line_taxes = line.tax_ids_after_fiscal_position.compute_all(line.price_unit * (1-(line.discount or 0.0)/100.0), currency, line.qty, product=line.product_id, partner=line.order_id.partner_id or False)
+                    for tax in line_taxes['taxes']:
+                        taxes.setdefault(tax['id'], {'name': tax['name'], 'total':0.0})
+                        taxes[tax['id']]['total'] += tax['amount']
+
+        st_line_ids = self.env["account.bank.statement.line"].search([('pos_statement_id', 'in', orders.ids)]).ids
+        if st_line_ids:
+            self.env.cr.execute("""
+                SELECT aj.name, sum(amount) total
+                FROM account_bank_statement_line AS absl,
+                     account_bank_statement AS abs,
+                     account_journal AS aj 
+                WHERE absl.statement_id = abs.id
+                    AND abs.journal_id = aj.id 
+                    AND absl.id IN %s 
+                GROUP BY aj.name
+            """, (tuple(st_line_ids),))
+            payments = self.env.cr.dictfetchall()
+        else:
+            payments = []
+
+        return {
+            'total_paid': user_currency.round(total),
+            'payments': payments,
+            'company_name': self.env.user.company_id.name,
+            'taxes': taxes.values(),
+            'products': [{
+                'product_id': product.id,
+                'product_name': product.name[:20],
+                'code': product.default_code,
+                'quantity': qty,
+                'price_unit': price_unit,
+                'discount': discount,
+                'uom': product.uom_id.name
+            } for (product, price_unit, discount), qty in products_sold.items()]
+        }
+
+    @api.multi
+    def render_html(self, data=None):
+        company = request.env.user.company_id
+        date_start = self.env.context.get('date_start', False)
+        date_stop = self.env.context.get('date_stop', False)
+        data = dict(data or {}, date_start=date_start, date_stop=date_stop)
+        data.update(self.get_sale_details(date_start, date_stop, company))
+        return self.env['report'].render('point_of_sale.report_saledetails', data)
\ No newline at end of file
diff --git a/addons/point_of_sale/static/src/js/chrome.js b/addons/point_of_sale/static/src/js/chrome.js
index 926fe23eee7..f7bf1f78010 100644
--- a/addons/point_of_sale/static/src/js/chrome.js
+++ b/addons/point_of_sale/static/src/js/chrome.js
@@ -406,6 +406,23 @@ var ProxyStatusWidget = StatusWidget.extend({
     },
 });
 
+
+/* --------- The Sale Details --------- */
+
+// Generates a report to print the sales of the
+// day on a ticket
+
+var SaleDetailsButton = PosBaseWidget.extend({
+    template: 'SaleDetailsButton',
+    start: function(){
+        var self = this;
+        this.$el.click(function(){
+            self.pos.proxy.print_sale_details();
+        });
+    },
+});
+
+
 /*--------------------------------------*\
  |             THE CHROME               |
 \*======================================*/
@@ -663,6 +680,11 @@ var Chrome = PosBaseWidget.extend({
             'widget': OrderSelectorWidget,
             'replace':  '.placeholder-OrderSelectorWidget',
         },{
+            'name':   'sale_details',
+            'widget': SaleDetailsButton,
+            'append':  '.pos-rightheader',
+            'condition': function(){ return this.pos.config.use_proxy; },
+        },{
             'name':   'proxy_status',
             'widget': ProxyStatusWidget,
             'append':  '.pos-rightheader',
@@ -769,6 +791,7 @@ return {
     HeaderButtonWidget: HeaderButtonWidget,
     OrderSelectorWidget: OrderSelectorWidget,
     ProxyStatusWidget: ProxyStatusWidget,
+    SaleDetailsButton: SaleDetailsButton,
     StatusWidget: StatusWidget,
     SynchNotificationWidget: SynchNotificationWidget,
     UsernameWidget: UsernameWidget,
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 76daa045c10..3a5e0ba45a0 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -2,8 +2,10 @@ odoo.define('point_of_sale.devices', function (require) {
 "use strict";
 
 var core = require('web.core');
+var Model = require('web.DataModel');
 var Session = require('web.Session');
 
+var QWeb = core.qweb;
 var _t = core._t;
 
 // the JobQueue schedules a sequence of 'jobs'. each job is
@@ -434,6 +436,23 @@ var ProxyDevice  = core.Class.extend(core.mixins.PropertiesMixin,{
         send_printing_job();
     },
 
+    print_sale_details: function() { 
+        var self = this;
+        new Model('report.point_of_sale.report_saledetails').call('get_sale_details').then(function(result){
+            var env = {
+                company: self.pos.company,
+                pos: self.pos,
+                products: result.products,
+                payments: result.payments,
+                taxes: result.taxes,
+                total_paid: result.total_paid,
+                date: (new Date()).toLocaleString(),
+            };
+            var report = QWeb.render('SaleDetailsReport', env);
+            self.print_receipt(report);
+        })
+    },
+
     // asks the proxy to log some information, as with the debug.log you can provide several arguments.
     log: function(){
         return this.message('log',{'arguments': _.toArray(arguments)});
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 7f54a6ddd78..1282d35d3a9 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1405,13 +1405,14 @@ exports.Orderline = Backbone.Model.extend({
     },
     compute_all: function(taxes, price_unit, quantity, currency_rounding) {
         var self = this;
-        var total_excluded = round_pr(price_unit * quantity, currency_rounding);
-        var total_included = total_excluded;
-        var base = total_excluded;
         var list_taxes = [];
+        var currency_rounding_bak = currency_rounding;
         if (this.pos.company.tax_calculation_rounding_method == "round_globally"){
            currency_rounding = currency_rounding * 0.00001;
         }
+        var total_excluded = round_pr(price_unit * quantity, currency_rounding);
+        var total_included = total_excluded;
+        var base = total_excluded;
         _(taxes).each(function(tax) {
             tax = self._map_tax_fiscal_position(tax);
             if (tax.amount_type === 'group'){
@@ -1445,7 +1446,11 @@ exports.Orderline = Backbone.Model.extend({
                 }
             }
         });
-        return {taxes: list_taxes, total_excluded: total_excluded, total_included: total_included};
+        return {
+            taxes: list_taxes,
+            total_excluded: round_pr(total_excluded, currency_rounding_bak),
+            total_included: round_pr(total_included, currency_rounding_bak)
+        };
     },
     get_all_prices: function(){
         var price_unit = this.get_unit_price() * (1.0 - (this.get_discount() / 100.0));
diff --git a/addons/point_of_sale/static/src/js/report.js b/addons/point_of_sale/static/src/js/report.js
new file mode 100644
index 00000000000..783ace7f655
--- /dev/null
+++ b/addons/point_of_sale/static/src/js/report.js
@@ -0,0 +1,63 @@
+odoo.define('point_of_sale.report', function (require) {
+"use strict";
+
+var chat_manager = require('mail.chat_manager');
+var composer = require('mail.composer');
+var ChatThread = require('mail.ChatThread');
+var utils = require('mail.utils');
+
+var config = require('web.config');
+var core = require('web.core');
+var data = require('web.data');
+var Dialog = require('web.Dialog');
+var framework = require('web.framework');
+var Model = require('web.Model');
+
+var pyeval = require('web.pyeval');
+var SearchView = require('web.SearchView');
+
+var ActionManager = require('web.ActionManager');
+var ControlPanelMixin = require('web.ControlPanelMixin');
+var datepicker = require('web.datepicker');
+var Widget = require('web.Widget');
+
+var QWeb = core.qweb;
+var _t = core._t;
+
+// TODO replace in v10 with proper wizard
+var PosDetailsWidget = Widget.extend(ControlPanelMixin, {
+    template: 'WizardSaleDetailsReport',
+    events: {
+        "click .js_generate": "renderReport",
+    },
+
+    renderElement: function() {
+        this._super();
+
+        var current_date = new moment();
+        this.dp_start = new datepicker.DateWidget(this);
+        this.dp_start.insertBefore(this.$el.find('.js_date_start'));
+        this.dp_start.set_value(current_date.format('YYYY-MM-DD'));
+
+        this.dp_stop = new datepicker.DateWidget(this);
+        this.dp_stop.insertAfter(this.$el.find('.js_date_stop'));
+        this.dp_stop.set_value(current_date.format('YYYY-MM-DD'));
+
+    },
+
+    renderReport: function() {
+        var start = this.dp_start.get_value();
+        var stop = this.dp_stop.get_value();
+        var url = '/pos/sale_details_report?date_start='+start+'&date_stop='+stop;
+        window.open(url, '_blank');
+
+    },
+
+});
+
+
+core.action_registry.add('report_pos_details', PosDetailsWidget);
+
+return PosDetailsWidget;
+
+});
diff --git a/addons/point_of_sale/static/src/js/widget_base.js b/addons/point_of_sale/static/src/js/widget_base.js
index 4a529dd1bf5..5f7f4285d95 100644
--- a/addons/point_of_sale/static/src/js/widget_base.js
+++ b/addons/point_of_sale/static/src/js/widget_base.js
@@ -38,7 +38,7 @@ var PosBaseWidget = Widget.extend({
         var currency = (this.pos && this.pos.currency) ? this.pos.currency : {symbol:'$', position: 'after', rounding: 0.01, decimals: 2};
         var decimals = currency.decimals;
 
-        if (precision && (typeof this.pos.dp[precision]) !== undefined) {
+        if (precision && this.pos.dp[precision] !== undefined) {
             decimals = this.pos.dp[precision];
         }
 
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 57fe6d20cc7..c3ba7c8953f 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -84,6 +84,14 @@
         </div>
     </t>
 
+    <t t-name="SaleDetailsButton">
+        <div class="oe_status">
+            <div class="js_connected oe_icon">
+                <i class='fa fa-fw fa-print'></i>
+            </div>
+        </div>
+    </t>
+
     <t t-name="HeaderButtonWidget">
         <div class="header-button">
             <t t-esc="widget.label" />
@@ -836,6 +844,114 @@
         </receipt>
     </t>
 
+    <t t-name="SaleDetailsReport">
+        <receipt align='center' width='40' value-thousands-separator='' >
+            <t t-if='pos.company_logo_base64'>
+                <img t-att-src='pos.company_logo_base64' />
+                <br/>
+            </t>
+            <t t-if='!pos.company_logo_base64'>
+                <h1><t t-esc='company.name' /></h1>
+                <br/>
+            </t>
+            <br /><br />
+
+            <!-- Orderlines -->
+
+            <div class='orderlines' line-ratio='0.6'>
+                <t t-foreach='products' t-as='line'>
+                    <line>
+                        <left><t t-esc='line.product_name' /></left>
+                        <right>
+                            <value value-decimals='2' value-autoint='on'>
+                                <t t-esc='line.quantity' />
+                            </value>
+                            <t t-if='line.uom !== "Unit(s)"'>
+                                <t t-esc='line.uom' /> 
+                            </t>
+                        </right>
+                        <right>
+                            <value><t t-esc='line.price_unit' /></value>
+                        </right>
+                    </line>
+                    <t t-if='line.discount !== 0'>
+                        <line indent='1'><left>Discount: <t t-esc='line.discount' />%</left></line>
+                    </t>
+                </t>
+            </div>
+
+            <br/>
+            <line><left>------------------------</left></line>
+            <br/>
+
+            <line>
+                <left>Payments:</left>
+            </line>
+            <line t-foreach='payments' t-as='payment'>
+                <left><t t-esc='payment.name' /></left>
+                <right>
+                    <t t-esc='payment.total'/>
+                </right>
+            </line>
+
+            <br/>
+            <line><left>------------------------</left></line>
+            <br/>
+
+            <line>
+                <left>Taxes:</left>
+            </line>
+            <line t-foreach='taxes' t-as='taxe'>
+                <left><t t-esc='taxe.name' /></left>
+                <right>
+                    <t t-esc='taxe.total'/>
+                </right>
+            </line>
+
+            <br/>
+            <line><left>------------------------</left></line>
+            <br/>
+
+            <line>
+                <left>Total:</left>
+                <right>
+                    <t t-esc='total_paid'/>
+                </right>
+            </line>
+
+            <br/>
+            <div font='b'>
+                <div><t t-esc='date' /></div>
+            </div>
+
+        </receipt>
+    </t>
+
+
+    <t t-name="WizardSaleDetailsReport">
+        <div class="o_form_view"><div class="oe_form_sheetbg o_form_sheet_bg"><div class="oe_form_sheet oe_form_sheet_width o_form_sheet">
+            <div class="pos_details_dates">
+                <h3>Select Dates for the report</h3>
+                <table class="table-condensed">
+                    <tr>
+                        <td><strong>Start date</strong></td>
+                        <td><div class="js_date_start"></div></td>
+                    </tr>
+                    <tr>
+                        <td><strong>Stop date</strong></td>
+                        <td><div class="js_date_stop"></div></td>
+                    </tr>
+                </table>
+                <p>
+                    <button class="js_generate">Generate report</button>
+                </p>
+            </div>
+
+
+        </div></div></div>
+    </t>
+
+
     <t t-name="PopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-alert">
diff --git a/addons/point_of_sale/views/point_of_sale_report.xml b/addons/point_of_sale/views/point_of_sale_report.xml
index f9787c1b4c7..94ad5b1e811 100644
--- a/addons/point_of_sale/views/point_of_sale_report.xml
+++ b/addons/point_of_sale/views/point_of_sale_report.xml
@@ -17,5 +17,11 @@
         <field name="report_name">point_of_sale.report_invoice</field>
     </record>
 
+    <record id="sale_details_report" model="ir.actions.report.xml">
+        <field name="name">Sale Details</field>
+        <field name="model">report.point_of_sale.details</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">point_of_sale.report_saledetails</field>
+    </record>
 
 </odoo>
diff --git a/addons/point_of_sale/views/point_of_sale_template.xml b/addons/point_of_sale/views/point_of_sale_template.xml
index 673c6e3e943..a30340fa4d7 100644
--- a/addons/point_of_sale/views/point_of_sale_template.xml
+++ b/addons/point_of_sale/views/point_of_sale_template.xml
@@ -4,6 +4,7 @@
         <xpath expr="." position="inside">
             <link rel="stylesheet" href="/point_of_sale/static/src/less/pos_dashboard.less"/>
             <script type="text/javascript" src="/point_of_sale/static/src/js/tour.js"></script>
+            <script type="text/javascript" src="/point_of_sale/static/src/js/report.js"></script>
         </xpath>
     </template>
 </odoo>
diff --git a/addons/point_of_sale/views/pos_order_report_view.xml b/addons/point_of_sale/views/pos_order_report_view.xml
index ce5aa141a4f..148b4e2b0bf 100644
--- a/addons/point_of_sale/views/pos_order_report_view.xml
+++ b/addons/point_of_sale/views/pos_order_report_view.xml
@@ -68,5 +68,11 @@
             <field name="context">{'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
+        <record id="action_report_pos_details" model="ir.actions.client">
+            <field name="name">Sale Details</field>
+            <field name="tag">report_pos_details</field>
+        </record>
+
         <menuitem id="menu_report_pos_order_all" name="Orders" action="action_report_pos_order_all" parent="menu_point_rep" sequence="3"/>
+        <menuitem id="menu_report_order_details" name="Sale Details" action="action_report_pos_details" parent="menu_point_rep" sequence="4"/>
 </odoo>
diff --git a/addons/point_of_sale/views/report_saledetails.xml b/addons/point_of_sale/views/report_saledetails.xml
new file mode 100644
index 00000000000..888eab47217
--- /dev/null
+++ b/addons/point_of_sale/views/report_saledetails.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+<template id="report_saledetails">
+    <t t-call="report.html_container">
+    <t t-call="report.internal_layout">
+        <div class="page">
+
+            <div class="text-center">
+                <h2>Sale Details</h2>
+
+                <strong><t t-esc="date_start"/> - <t t-esc="date_stop"/></strong>
+            </div>
+
+            <!-- Orderlines -->
+            <h3>Products</h3>
+            <table  class="table table-condensed">
+                <thead><tr>
+                    <th>Product</th>
+                    <th>Quantity</th>
+                    <th>Price Unit</th>
+                </tr></thead>
+                <tbody>
+                <tr t-foreach='products' t-as='line'>
+                    <td><t t-esc="line['product_name']" /></td>
+                    <td>
+                        <t t-esc="line['quantity']" />
+                        <t t-if='line["uom"] != "Unit(s)"'>
+                            <t t-esc='line["uom"]' /> 
+                        </t>
+                    </td>
+                    <td>
+                        <t t-esc='line["price_unit"]' />
+                    <t t-if='line["discount"] != 0'>
+                        Disc: <t t-esc='line["discount"]' />%
+                    </t>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+
+            <br/>
+
+            <h3>Payments</h3>
+            <table  class="table table-condensed">
+                <thead><tr>
+                    <th>Name</th>
+                    <th>Total</th>
+                </tr></thead>
+                <tbody>
+                <tr t-foreach='payments' t-as='payment'>
+                    <td><t t-esc="payment['name']" /></td>
+                    <td><t t-esc="payment['total']" /></td>
+                </tr>
+                </tbody>
+            </table>
+
+            <br/>
+
+            <h3>Taxes</h3>
+            <table  class="table table-condensed">
+                <thead><tr>
+                    <th>Name</th>
+                    <th>Total</th>
+                </tr></thead>
+                <tbody>
+                <tr t-foreach='taxes' t-as='tax'>
+                    <td><t t-esc="tax['name']" /></td>
+                    <td><t t-esc="tax['total']" /></td>
+                </tr>
+                </tbody>
+            </table>
+
+            <br/>
+            <br/>
+
+            <strong>Total: <t t-esc='total_paid'/></strong>
+
+        </div>
+    </t>
+    </t>
+</template>
+</data>
+</openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 4293c45cdc5..e5b76df20df 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -418,6 +418,7 @@
             <field name="res_model">product.template</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="view_type">form</field>
+            <field name="context">{}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to define a new product.
diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index fcc8dc25bd3..af1bbd1c0bb 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -524,7 +524,7 @@ class ProductTemplate(models.Model):
         action = self.env.ref('stock.act_product_stock_move_open').read()[0]
         if self:
             action['context'] = {'default_product_id': products.ids[0]}
-        action['domain'] = [('product_id.product_tmpl_id', 'in', products.ids)]
+        action['domain'] = [('product_id.product_tmpl_id', 'in', self.ids)]
         return action
 
 
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 8aa400378ec..d810a5f7ffd 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -918,6 +918,7 @@ class Picking(models.Model):
             moves.action_confirm()
         return moves
 
+    @api.model
     def _prepare_values_extra_move(self, op, product, remaining_qty):
         """
         Creates an extra move when there is no corresponding original move to be copied
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 508f623a75b..d25407c4296 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -97,7 +97,7 @@ def ensure_db(redirect='/web/database/selector'):
     # If the db is taken out of a query parameter, it will be checked against
     # `http.db_filter()` in order to ensure it's legit and thus avoid db
     # forgering that could lead to xss attacks.
-    db = request.params.get('db')
+    db = request.params.get('db') and request.params.get('db').strip()
 
     # Ensure db is legit
     if db and db not in http.db_filter([db]):
diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js
index 78bc5f39bfd..a350dadb59e 100644
--- a/addons/web/static/src/js/framework/data.js
+++ b/addons/web/static/src/js/framework/data.js
@@ -710,6 +710,13 @@ var DataSetSearch = DataSet.extend({
             this._length -= (before - this.ids.length);
         }
     },
+    add_ids: function(ids, at) {
+        var before = this.ids.length;
+        this._super(ids, at);
+        if(this._length){
+            this._length += (this.ids.length - before);
+        }
+    },
     unlink: function(ids, callback, error_callback) {
         var self = this;
         return this._super(ids).done(function() {
diff --git a/addons/web_kanban/static/src/js/kanban_column.js b/addons/web_kanban/static/src/js/kanban_column.js
index 0094ad01743..f848c266944 100644
--- a/addons/web_kanban/static/src/js/kanban_column.js
+++ b/addons/web_kanban/static/src/js/kanban_column.js
@@ -116,6 +116,7 @@ var KanbanColumn = Widget.extend({
                     } else {
                         // adding record to this column
                         self.records.push(record);
+                        self.dataset.add_ids([record.id]);
                         record.setParent(self);
                         ui.item.addClass('o_updating');
                         self.trigger_up('kanban_column_add_record', {record: record});
diff --git a/addons/web_kanban/static/src/js/kanban_view.js b/addons/web_kanban/static/src/js/kanban_view.js
index 7173ffa7f1e..6f792dcfbc7 100644
--- a/addons/web_kanban/static/src/js/kanban_view.js
+++ b/addons/web_kanban/static/src/js/kanban_view.js
@@ -554,9 +554,7 @@ var KanbanView = View.extend({
                     active_model: this.model,
                 });
         }
-        this.do_execute_action(event.data, this.dataset, event.target.id).then(function () {
-            self.reload_record(event.target);
-        });
+        this.do_execute_action(event.data, this.dataset, event.target.id, _.bind(self.reload_record, this, event.target));
     },
 
     /*
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 6bf0e805fec..5b20a4869d9 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -87,33 +87,29 @@ options.registry.slider = options.Class.extend({
         return $clone;
     },
     remove_slide: function (type) {
-        if(type !== "click") return;
-
-        if (this.remove_process) {
-            return;
-        }
+        if (type !== "click" || this.remove_process) return;
         var self = this;
-        var cycle = this.$inner.find('.item').length - 1;
-        var index = this.$inner.find('.item.active').index();
+
+        var $items = this.$inner.find('.item');
+        var cycle = $items.length - 1;
+        var $active = $items.filter('.active');
+        var index = $active.index();
 
         if (cycle > 0) {
             this.remove_process = true;
-            var $el = this.$inner.find('.item.active');
-            self.$target.on('slid.bs.carousel', function (event) {
-                $el.remove();
+            this.$target.on('slid.bs.carousel.slide_removal', function (event) {
+                $active.remove();
                 self.$indicators.find("li:last").remove();
-                self.$target.off('slid.bs.carousel');
+                self.$target.off('slid.bs.carousel.slide_removal');
                 self.rebind_event();
                 self.remove_process = false;
                 if (cycle === 1) {
-                    self.on_remove_slide(event);
+                    self.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
                 }
             });
-            setTimeout(function () {
-                self.$target.carousel( index > 0 ? --index : cycle );
-            }, 500);
-        } else {
-            this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
+            _.defer(function () {
+                self.$target.carousel(index > 0 ? --index : cycle);
+            });
         }
     },
     interval : function (type, value) {
@@ -141,18 +137,24 @@ options.registry.carousel = options.registry.slider.extend({
     },
     start : function () {
         var self = this;
-        this._super();
+        this._super.apply(this, arguments);
 
         // set background and prepare to clean for save
         this.$target.on('slid.bs.carousel', function () {
-            if(self.editor && self.editor.styles.background) {
-                self.editor.styles.background.$target = self.$target.find(".item.active");
                 self.editor.styles.background_position.$target = self.editor.styles.background.$target;
-                self.editor.styles.background.set_active();
                 self.editor.styles.background_position.set_active();
                 self.editor.styles.background.$target.trigger("snippet-option-change", [self.editor.styles.background]);
-            }
             self.$target.carousel("pause");
+            if (!self.editor) return;
+
+            _.each(["background", "background_position", "colorpicker"], function (opt_name) {
+                var s_option = self.editor.styles[opt_name];
+                if (!s_option) return;
+
+                s_option.$target = self.$target.find(".item.active");
+                s_option.set_active();
+                s_option.$target.trigger("snippet-option-change", [s_option]);
+            });
         });
         this.$target.trigger('slid.bs.carousel');
     },
diff --git a/addons/website_payment/controllers/main.py b/addons/website_payment/controllers/main.py
index d2d86734c3a..ac6441c0a0c 100644
--- a/addons/website_payment/controllers/main.py
+++ b/addons/website_payment/controllers/main.py
@@ -46,7 +46,7 @@ class website_payment(http.Controller):
 
         partner_id = user.partner_id.id if user.partner_id.id != request.website.partner_id.id else False
 
-        payment_form = acquirer.render(reference, float(amount), currency.id, values={'return_url': '/website_payment/confirm', 'partner_id': partner_id})[0]
+        payment_form = acquirer.sudo().render(reference, float(amount), currency.id, values={'return_url': '/website_payment/confirm', 'partner_id': partner_id})[0]
         values = {
             'reference': reference,
             'acquirer': acquirer,
diff --git a/addons/website_quote/views/website_quotation_backend.xml b/addons/website_quote/views/website_quotation_backend.xml
index cc54d9c1a7b..1c79d73c51b 100644
--- a/addons/website_quote/views/website_quotation_backend.xml
+++ b/addons/website_quote/views/website_quotation_backend.xml
@@ -123,19 +123,6 @@
                               </tree>
                             </field>
                         </page>
-                        <page string="Suggested Products">
-                            <field name="options">
-                              <tree string="Sales Quotation Template Lines" editable="bottom">
-                                <field name="product_id"/>
-                                <field name="name"/>
-                                <field name="quantity"/>
-                                <field name="uom_id" groups="product.group_uom"/>
-                                <field name="price_unit" invisible="1"/>
-                                <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                <field name="website_description" invisible="1"/>
-                              </tree>
-                            </field>
-                        </page>
                         <page string="Other Settings">
                             <group>
                                 <field name="require_payment" widget="radio"/>
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index bb4a6078c0a..0562501a4db 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -80,6 +80,9 @@ odoo.define('website_sale.website_sale', function (require) {
     $('.oe_website_sale').each(function () {
         var oe_website_sale = this;
 
+        $selects.filter('[name="shipping_country_id"]').val(data['shipping_country_id']).change();
+        $selects.filter('[name="shipping_state_id"]').val(data['shipping_state_id']);
+
         $(oe_website_sale).on("change", 'input[name="add_qty"]', function (event) {
             var product_ids = [];
             var product_dom = $(".js_product .js_add_cart_variants[data-attribute_value_ids]").last();
diff --git a/openerp/models.py b/openerp/models.py
index f4fe6ab20b0..95cb156d5a4 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -1370,14 +1370,14 @@ class BaseModel(object):
     @api.model
     def _get_default_form_view(self):
         """ Generates a default single-line form view using all fields
-        of the current model except the m2m and o2m ones.
+        of the current model.
 
         :returns: a form view as an lxml document
         :rtype: etree._Element
         """
         group = E.group(col="4")
         for fname, field in self._fields.iteritems():
-            if field.automatic or field.type in ('one2many', 'many2many'):
+            if field.automatic:
                 continue
             group.append(E.field(name=fname))
             if field.type == 'text':