Merge pull request #11360 from seanmadsen/CRM-21507

[civicrm-core.git] / CRM / Core / Permission.php

diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php
index 1e28ab6fdb0ae0bcc6e034592ee4dd1ec765ad50..e7be11b4a6d5415a24abc5de8d1e02ebde5b7fc8 100644 (file)
--- a/CRM/Core/Permission.php
+++ b/CRM/Core/Permission.php
@@ -806,6 +806,10 @@ class CRM_Core_Permission {
         $prefix . ts('view all notes'),
         ts("View notes (for visible contacts) even if they're marked admin only"),
       ),
+      'add contact notes' => array(
+        $prefix . ts('add contact notes'),
+        ts("Create notes for contacts"),
+      ),
       'access AJAX API' => array(
         $prefix . ts('access AJAX API'),
         ts('Allow API access even if Access CiviCRM is not granted'),
@@ -826,6 +830,22 @@ class CRM_Core_Permission {
         $prefix . ts('edit all manual batches'),
         ts('Edit all accounting batches'),
       ),
+      'close own manual batches' => array(
+        $prefix . ts('close own manual batches'),
+        ts('Close accounting batches created by user (with Access to CiviContribute)'),
+      ),
+      'close all manual batches' => array(
+        $prefix . ts('close all manual batches'),
+        ts('Close all accounting batches (with Access to CiviContribute)'),
+      ),
+      'reopen own manual batches' => array(
+        $prefix . ts('reopen own manual batches'),
+        ts('Reopen accounting batches created by user (with Access to CiviContribute)'),
+      ),
+      'reopen all manual batches' => array(
+        $prefix . ts('reopen all manual batches'),
+        ts('Reopen all accounting batches (with Access to CiviContribute)'),
+      ),
       'view own manual batches' => array(
         $prefix . ts('view own manual batches'),
         ts('View accounting batches created by user (with Access to CiviContribute)'),
@@ -1587,8 +1607,7 @@ class CRM_Core_Permission {
    *   invoices permission and the invoice author is the current user.
    */
   public static function checkDownloadInvoice() {
-    global $user;
-    $cid = CRM_Core_BAO_UFMatch::getContactId($user->uid);
+    $cid = CRM_Core_Session::getLoggedInContactID();
     if (CRM_Core_Permission::check('access CiviContribute') ||
       (CRM_Core_Permission::check('view my invoices') && $_GET['cid'] == $cid)
     ) {