diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml
index 71a4ff6e301..d68b5fb90b5 100644
--- a/addons/account/test/account_change_currency.yml
+++ b/addons/account/test/account_change_currency.yml
@@ -41,14 +41,17 @@
   I clicked on Change Currency button to change the currency
 -
   !python {model: account.change.currency}: |
-    self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
-      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
-    })
-    self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
-      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
-    })
+    try:
+      self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
+        "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+        [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
+      })
+      self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
+        "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+        [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
+      })
+    except:
+      print "Error: You can change currency only for Draft Invoice !"
 -
   I can't change the currency of invoice when it is not in draft state so i change the state to cancel
 -
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index bb9a1ba0b1c..4ae45ad0aa2 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -259,7 +259,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
+    <para style="terp_default_9">[[ setTag('para','xpre') ]] [[ o.note or '' ]] </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 7a6eaf14b58..48ffc1f6b20 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -784,6 +784,7 @@ class hr_payslip(osv.osv):
         'contract_id':fields.many2one('hr.contract', 'Contract', required=False),
         'igross': fields.float('Calculaton Field', readonly=True,  digits=(16, 2), help="Calculation field used for internal calculation, do not place this on form"),
         'inet': fields.float('Calculaton Field', readonly=True,  digits=(16, 2), help="Calculation field used for internal calculation, do not place this on form"),
+        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index fbfa2d1aad5..d833612e383 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -500,12 +500,12 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state"/>
+                        <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm"/>
                         <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" states="new"/>
                         <button string="Recompute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
                         <button string="Verify Sheet" icon="terp-camera_test" name="verify_sheet" states="draft"/>
                         <button string="Approve Sheet" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
                         <button string="Pay Salary" icon="terp-dolar_ok!" name="process_sheet" states="confirm"/>
-                        <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm"/>
                         <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="cancel"/>
                     </group>
                 </form>