diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 05256bbce1c..42d4c6f71b7 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -311,7 +311,7 @@ class hr_expense_expense(osv.osv):
                 is_price_include = tax_obj.read(cr,uid,tax['id'],['price_include'],context)['price_include']
                 if is_price_include:
                     ## We need to deduce the price for the tax
-                    res[-1]['price'] = res[-1]['price']  - (tax['amount'] * tax['base_sign'] or 0.0)
+                    res[-1]['price'] = res[-1]['price'] - tax['amount']
                     # tax amount countains base amount without the tax
                     base_tax_amount = (base_tax_amount - tax['amount']) * tax['base_sign']
                 else:
@@ -322,7 +322,7 @@ class hr_expense_expense(osv.osv):
                              'name':tax['name'],
                              'price_unit': tax['price_unit'],
                              'quantity': 1,
-                             'price':  tax['amount'] * tax['base_sign'] or 0.0,
+                             'price': tax['amount'] or 0.0,
                              'account_id': tax['account_collected_id'] or mres['account_id'],
                              'tax_code_id': tax['tax_code_id'],
                              'tax_amount': tax['amount'] * tax['base_sign'],
diff --git a/addons/hr_expense/tests/__init__.py b/addons/hr_expense/tests/__init__.py
new file mode 100644
index 00000000000..8c94d56e555
--- /dev/null
+++ b/addons/hr_expense/tests/__init__.py
@@ -0,0 +1,5 @@
+from . import test_journal_entries
+
+fast_suite = [
+    test_journal_entries
+]
\ No newline at end of file
diff --git a/addons/hr_expense/tests/test_journal_entries.py b/addons/hr_expense/tests/test_journal_entries.py
new file mode 100644
index 00000000000..4df277c3f49
--- /dev/null
+++ b/addons/hr_expense/tests/test_journal_entries.py
@@ -0,0 +1,60 @@
+from openerp.tests.common import TransactionCase
+from openerp import netsvc, workflow
+
+
+class TestCheckJournalEntry(TransactionCase):
+    """
+    Check journal entries when the expense product is having tax which is tax included. 
+    """
+
+    def setUp(self):
+        super(TestCheckJournalEntry, self).setUp()
+        cr, uid = self.cr, self.uid
+        self.expense_obj = self.registry('hr.expense.expense')
+        self.exp_line_obj = self.registry('hr.expense.line')
+        self.product_obj = self.registry('product.product')
+        self.tax_obj = self.registry('account.tax')
+        self.code_obj = self.registry('account.tax.code')
+        _, self.product_id = self.registry("ir.model.data").get_object_reference(cr, uid, "hr_expense", "air_ticket")
+        _, self.employee_id = self.registry("ir.model.data").get_object_reference(cr, uid, "hr", "employee_mit")
+        self.base_code_id = self.code_obj.create(cr, uid, {'name': 'Expense Base Code'})
+        self.tax_id = self.tax_obj.create(cr, uid, {
+            'name': 'Expense 10%',
+            'amount': 0.10,
+            'type': 'percent',
+            'type_tax_use': 'purchase',
+            'price_include': True,
+            'base_code_id': self.base_code_id,
+            'base_sign': -1,
+        })
+        self.product_obj.write(cr, uid, self.product_id, {'supplier_taxes_id': [(6, 0, [self.tax_id])]})
+        self.expense_id = self.expense_obj.create(cr, uid, {
+            'name': 'Expense for Minh Tran',
+            'employee_id': self.employee_id,
+        })
+        self.exp_line_obj.create(cr, uid, {
+            'name': 'Car Travel Expenses',
+            'product_id': self.product_id,
+            'unit_amount': 700.00,
+            'expense_id': self.expense_id
+        })
+
+    def test_journal_entry(self):
+        cr, uid = self.cr, self.uid
+        #Submit to Manager
+        workflow.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'confirm', cr)
+        #Approve
+        workflow.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'validate', cr)
+        #Create Expense Entries
+        workflow.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'done', cr)
+        self.expense = self.expense_obj.browse(cr, uid, self.expense_id)
+        self.assertEquals(self.expense.state, 'done', 'Expense is not in Waiting Payment state')
+        self.assertTrue(self.expense.account_move_id.id, 'Expense Journal Entry is not created')
+        for line in self.expense.account_move_id.line_id:
+            if line.credit:
+                self.assertEquals(line.credit, 700.00, 'Expense Payable Amount is not matched for journal item')
+            else:
+                if line.tax_code_id:
+                    self.assertEquals(line.debit, 636.36, 'Tax Amount is not matched for journal item')
+                else:
+                    self.assertEquals(line.debit, 63.64, 'Tax Base Amount is not matched for journal item')
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bf5430c52de..0eb7fcff550 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -95,7 +95,7 @@
                         <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type_icon + '.png'"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
-                    <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
+                    <div t-if="!attachment.upload" class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -107,7 +107,7 @@
                         <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
-                    <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
+                    <div t-if="!attachment.upload" class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 563d6a85084..c652e678a34 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1240,7 +1240,7 @@ class Action(http.Controller):
             except Exception:
                 action_id = 0   # force failed read
 
-        base_action = Actions.read([action_id], ['name', 'type'], request.context)
+        base_action = Actions.read([action_id], ['type'], request.context)
         if base_action:
             ctx = request.context
             action_type = base_action[0]['type']
@@ -1250,7 +1250,7 @@ class Action(http.Controller):
                 ctx.update(additional_context)
             action = request.session.model(action_type).read([action_id], False, ctx)
             if action:
-                value = clean_action(dict(action[0], **base_action[0]))
+                value = clean_action(action[0])
         return value
 
     @http.route('/web/action/run', type='json', auth="user")
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index e594c428055..16d578341a7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1288,7 +1288,8 @@ instance.web.Sidebar = instance.web.Widget.extend({
 
                 self.rpc("/web/action/load", {
                     action_id: item.action.id,
-                    context: c
+                    context: new instance.web.CompoundContext(
+                    self.dataset.get_context(), active_ids_context).eval()
                 }).done(function(result) {
                     result.context = new instance.web.CompoundContext(
                         result.context || {}, active_ids_context)