diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
index f17329e419e0c4a22b8a4041e70943d06fde00f4..975cce4055be9287eb8953599b2c45c49a7d8167 100644
--- a/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
@@ -266,7 +266,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
$orderBy = ' ORDER BY batch.id desc';
if (!empty($params['sort'])) {
- $orderBy = ' ORDER BY ' . $params['sort'];
+ $orderBy = ' ORDER BY ' . CRM_Utils_Type::escape($params['sort'], 'String');
}
$query = "
@@ -285,8 +285,8 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
$links = self::links();
}
- $batchTypes = CRM_Core_PseudoConstant::getBatchType();
- $batchStatus = CRM_Core_PseudoConstant::getBatchStatus();
+ $batchTypes = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'type_id');
+ $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id');
$paymentInstrument = CRM_Contribute_PseudoConstant::paymentInstrument();
$results = array();
@@ -353,7 +353,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
* @param array $params associated array for params
* @access public
*/
- static function getBatchCount(&$params) {
+ public static function getBatchCount(&$params) {
$args = array();
$whereClause = self::whereClause($params, $args);
$query = " SELECT COUNT(*) FROM civicrm_batch batch
@@ -368,7 +368,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
* @param array $params associated array for params
* @access public
*/
- function whereClause($params) {
+ public static function whereClause($params) {
$clauses = array();
// Exclude data-entry batches
if (empty($params['status_id'])) {
@@ -483,14 +483,16 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
/**
* function to get batch list
*
- * @return array array of batches
+ * @return array array of all batches
+ * excluding batches with data entry in progress
*/
static function getBatches() {
- $query = 'SELECT id, title
+ $dataEntryStatusId = CRM_Core_OptionGroup::getValue('batch_status','Data Entry');
+ $query = "SELECT id, title
FROM civicrm_batch
- WHERE type_id IN (1,2)
- AND status_id = 2
- ORDER BY id DESC';
+ WHERE item_count >= 1
+ AND status_id != {$dataEntryStatusId}
+ ORDER BY id DESC";
$batches = array();
$dao = CRM_Core_DAO::executeQuery($query);
@@ -596,7 +598,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
}
static function closeReOpen($batchIds = array(), $status) {
- $batchStatus = CRM_Core_PseudoConstant::accountOptionValues( 'batch_status' );
+ $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id');
$params['status_id'] = CRM_Utils_Array::key( $status, $batchStatus );
$session = CRM_Core_Session::singleton( );
$params['modified_date'] = date('YmdHis');
@@ -633,8 +635,8 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
}
$orderBy = " ORDER BY civicrm_financial_trxn.id";
- if (CRM_Utils_Array::value('sort', $params)) {
- $orderBy = ' ORDER BY ' . CRM_Utils_Array::value('sort', $params);
+ if (!empty($params['sort'])) {
+ $orderBy = ' ORDER BY ' . CRM_Utils_Type::escape($params['sort'], 'String');
}
$from = "civicrm_financial_trxn
diff --git a/CRM/Core/Action.php b/CRM/Core/Action.php
index aca48e30f4c6b1f1b72f46a12bed063798a767b1..4cb3a3e2a994c30d446e32b8f072bcb101bfb59e 100644
--- a/CRM/Core/Action.php
+++ b/CRM/Core/Action.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
diff --git a/CRM/Financial/BAO/ExportFormat/CSV.php b/CRM/Financial/BAO/ExportFormat/CSV.php
index 11c7e861a99c82350c8ccda6190eab5e8e6c4a8e..8c7cfb22772e269122146e7c95a4f003376b572c 100644
--- a/CRM/Financial/BAO/ExportFormat/CSV.php
+++ b/CRM/Financial/BAO/ExportFormat/CSV.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index 773cd62a575c3be7bfe92ae14452e4b2331aaaac..9f4d5bb56e42f269f825597555cc6dae0f81715f 100644
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
@@ -48,7 +48,7 @@ class CRM_Financial_Page_AJAX {
empty($_GET['_value'])) {
CRM_Utils_System::civiExit();
}
-
+ $defaultId = NULL;
if ($_GET['_value'] == 'select') {
$result = CRM_Contribute_PseudoConstant::financialAccount();
}
@@ -62,9 +62,11 @@ class CRM_Financial_Page_AJAX {
'8' => 1, //premium inventory
'9' => 3, //discount account is
);
-
- $financialAccountType = "{$financialAccountType[$_GET['_value']]}";
+ $financialAccountType = CRM_Utils_Array::value($_GET['_value'], $financialAccountType);
$result = CRM_Contribute_PseudoConstant::financialAccount(NULL, $financialAccountType);
+ if ($financialAccountType) {
+ $defaultId = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_financial_account WHERE is_default = 1 AND financial_account_type_id = $financialAccountType");
+ }
}
$elements = array(
array(
@@ -75,10 +77,14 @@ class CRM_Financial_Page_AJAX {
if (!empty($result)){
foreach ($result as $id => $name) {
+ $selectedArray = array();
+ if ($id == $defaultId) {
+ $selectedArray['selected'] = 'Selected';
+ }
$elements[] = array(
'name' => $name,
'value' => $id,
- );
+ ) + $selectedArray;
}
}
echo json_encode($elements);
@@ -92,7 +98,7 @@ class CRM_Financial_Page_AJAX {
}
if ($_GET['_value'] == 'select') {
- $result = CRM_Core_PseudoConstant::accountOptionValues('account_relationship');
+ $result = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_EntityFinancialAccount', 'account_relationship');
}
else {
$financialAccountType = array(
@@ -102,7 +108,7 @@ class CRM_Financial_Page_AJAX {
'4' => array(7), //cost of sales
);
$financialAccountTypeId = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialAccount', $_GET['_value'], 'financial_account_type_id');
- $result = CRM_Core_PseudoConstant::accountOptionValues('account_relationship');
+ $result = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_EntityFinancialAccount', 'account_relationship');
}
$elements = array(
@@ -210,7 +216,7 @@ class CRM_Financial_Page_AJAX {
case 'reopen':
$status = $op == 'close' ? 'Closed' : 'Open';
$ids['batchID'] = $recordID;
- $batchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status');
+ $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id');
$params['status_id'] = CRM_Utils_Array::key($status, $batchStatus);
$session = CRM_Core_Session::singleton();
$params['modified_date'] = date('YmdHis');
diff --git a/CRM/Grant/BAO/EntityPayment.php b/CRM/Grant/BAO/EntityPayment.php
index 0e38c921296ab380e4d2c2c41df307b7d462ac92..af8c6e6dba6f2f0fb04b413f2bc535f260c7f35f 100755
--- a/CRM/Grant/BAO/EntityPayment.php
+++ b/CRM/Grant/BAO/EntityPayment.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/BAO/Grant.php b/CRM/Grant/BAO/Grant.php
index fa4576f505c4d4aa1973011048310a9e689d160a..517953feeb1fdd24f2df697a7ccd45abd84aa716 100644
--- a/CRM/Grant/BAO/Grant.php
+++ b/CRM/Grant/BAO/Grant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
@@ -153,13 +153,17 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant {
* @return array Array of event summary values
*/
static function getGrantStatusOptGroup() {
+
$params = array();
$params['name'] = CRM_Grant_BAO_Grant::$statusGroupName;
+
$defaults = array();
+
$og = CRM_Core_BAO_OptionGroup::retrieve($params, $defaults);
if (!$og) {
CRM_Core_Error::fatal('No option group for grant statuses - database discrepancy! Make sure you loaded civicrm_data.mysql');
}
+
return $og;
}
@@ -259,7 +263,7 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant {
"action=view&reset=1&id={$grant->id}&cid={$grant->contact_id}&context=home"
);
- $grantTypes = CRM_Core_OptionGroup::values('grant_type');
+ $grantTypes = CRM_Core_PseudoConstant::get('CRM_Grant_DAO_Grant', 'grant_type_id');
if (!CRM_Utils_Array::value('skipRecentView', $params)) {
if(!isset($grant->contact_id) || !isset($grant->grant_type_id)){
$grant->find(TRUE);
diff --git a/CRM/Grant/BAO/GrantPayment.php b/CRM/Grant/BAO/GrantPayment.php
index 5001997318278c840119fb27c42afe2f95353743..0659dd2177a1c611592fef080474bda2351f35f4 100755
--- a/CRM/Grant/BAO/GrantPayment.php
+++ b/CRM/Grant/BAO/GrantPayment.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/BAO/GrantProgram.php b/CRM/Grant/BAO/GrantProgram.php
index 300bfaf9b4d11f81a1e1ec0ecb8cb4be7b03b909..8cdd8f959f0a2834fc639c28c7f10efb9a6e2666 100755
--- a/CRM/Grant/BAO/GrantProgram.php
+++ b/CRM/Grant/BAO/GrantProgram.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/BAO/PaymentSearch.php b/CRM/Grant/BAO/PaymentSearch.php
index 495fb6c336fc85c0e028624da40702a6e3241809..edbb3454c7a90729ccf6ffef13ea71663ba952e2 100755
--- a/CRM/Grant/BAO/PaymentSearch.php
+++ b/CRM/Grant/BAO/PaymentSearch.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php
index 8f6e069785a68de2f4cf8d7436efb06384f8f4ce..59edb06505dddd439d25ffeb756243c4246da400 100644
--- a/CRM/Grant/BAO/Query.php
+++ b/CRM/Grant/BAO/Query.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Controller/PaymentSearch.php b/CRM/Grant/Controller/PaymentSearch.php
index 5d5b8fe1a053363c034f396a3636fbebbee76970..939e9a8d195c291495c3ca100e5e5d68363f0dc2 100755
--- a/CRM/Grant/Controller/PaymentSearch.php
+++ b/CRM/Grant/Controller/PaymentSearch.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.1 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/GrantProgram.php b/CRM/Grant/Form/GrantProgram.php
index 69e31497c8e2eff393c5dee9a2ec9e38e2612064..46229a6758eab4637d2780b0a4fa37d5889600fb 100755
--- a/CRM/Grant/Form/GrantProgram.php
+++ b/CRM/Grant/Form/GrantProgram.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/GrantProgramView.php b/CRM/Grant/Form/GrantProgramView.php
index 7ca11af1f72c60b62dd34ba171db8d1114dd6011..d1a4670f5887e72cc0bac7c6570dc772615aef67 100755
--- a/CRM/Grant/Form/GrantProgramView.php
+++ b/CRM/Grant/Form/GrantProgramView.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/Payment/View.php b/CRM/Grant/Form/Payment/View.php
index dae08e23a6a45eaef18d3c0ec00e10e8811b0de9..99aabb0328ab4e34fe6fe48f40c993405ae69e37 100755
--- a/CRM/Grant/Form/Payment/View.php
+++ b/CRM/Grant/Form/Payment/View.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/PaymentSearch.php b/CRM/Grant/Form/PaymentSearch.php
index 4675cea64f375614496e516011a6f3b20b9c4557..79fc69038b431bf7bacd4d45aa904d0fcac01678 100755
--- a/CRM/Grant/Form/PaymentSearch.php
+++ b/CRM/Grant/Form/PaymentSearch.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/PaymentTask.php b/CRM/Grant/Form/PaymentTask.php
index 92b52c12282247899fb3d6a4949af94104c70913..905344d8e27912dc19f93b94f9f57def88e0f780 100755
--- a/CRM/Grant/Form/PaymentTask.php
+++ b/CRM/Grant/Form/PaymentTask.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.1 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/Search.php b/CRM/Grant/Form/Search.php
index 1af047df83ddc7b2c6460a029ba97c0d9cc629f5..d135f32977906490ad3d0099f290a1f9030b4b71 100644
--- a/CRM/Grant/Form/Search.php
+++ b/CRM/Grant/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
@@ -21,7 +21,7 @@
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing
+--------------------------------------------------------------------+
*/
@@ -148,9 +148,9 @@ class CRM_Grant_Form_Search extends CRM_Core_Form {
$this->_done = FALSE;
$this->defaults = array();
- /*
- * we allow the controller to set force/reset externally, useful when we are being
- * driven by the wizard framework
+ /*
+ * we allow the controller to set force/reset externally, useful when we are being
+ * driven by the wizard framework
*/
$this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject);
@@ -229,9 +229,9 @@ class CRM_Grant_Form_Search extends CRM_Core_Form {
CRM_Grant_BAO_Query::buildSearchForm($this);
- /*
- * add form checkboxes for each row. This is needed out here to conform to QF protocol
- * of all elements being declared in builQuickForm
+ /*
+ * add form checkboxes for each row. This is needed out here to conform to QF protocol
+ * of all elements being declared in builQuickForm
*/
@@ -330,7 +330,7 @@ class CRM_Grant_Form_Search extends CRM_Core_Form {
// check actionName and if next, then do not repeat a search, since we are going to the next page
// hack, make sure we reset the task values
- $stateMachine = &$this->controller->getStateMachine();
+ $stateMachine = $this->controller->getStateMachine();
$formName = $stateMachine->getTaskFormName();
$this->controller->resetPage($formName);
return;
diff --git a/CRM/Grant/Form/Task/Cancel.php b/CRM/Grant/Form/Task/Cancel.php
index cc7e00a289217761e6304c0223b2270fb18c6acb..04b87c43e4ea4dd74cc42967b867705d777d8cf6 100755
--- a/CRM/Grant/Form/Task/Cancel.php
+++ b/CRM/Grant/Form/Task/Cancel.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/Task/GrantPayment.php b/CRM/Grant/Form/Task/GrantPayment.php
index 2ce10c5d8333c92cffc4b66c8be65d228497a782..ba8fdf544f8112b1f36b07586e6c64df076f70bb 100755
--- a/CRM/Grant/Form/Task/GrantPayment.php
+++ b/CRM/Grant/Form/Task/GrantPayment.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.0 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/Task/Pay.php b/CRM/Grant/Form/Task/Pay.php
index 40a307e8d2a42ab422d8eea60eadcafa688d4b20..a1676433aa89e3b267ad661d0013ab59188b3a14 100755
--- a/CRM/Grant/Form/Task/Pay.php
+++ b/CRM/Grant/Form/Task/Pay.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.1 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
@@ -65,8 +65,6 @@ class CRM_Grant_Form_Task_Pay extends CRM_Grant_Form_Task
if ( !CRM_Core_Permission::checkActionPermission( 'CiviGrant', CRM_Core_Action::PAY ) ) {
CRM_Core_Error::fatal( ts( 'You do not have permission to access this page' ) );
}
- require_once "CRM/Core/PseudoConstant.php";
- require_once 'CRM/Core/OptionGroup.php';
$grantStatus = CRM_Core_OptionGroup::values( 'grant_status', TRUE );
$paidGrants = $approvedGrants = array();
diff --git a/CRM/Grant/Form/Task/Reprint.php b/CRM/Grant/Form/Task/Reprint.php
index f349ac8d775de6366c72705d543b3b0601017d39..0a6819e4f412ed967ab3ca64b88df75fb963e079 100755
--- a/CRM/Grant/Form/Task/Reprint.php
+++ b/CRM/Grant/Form/Task/Reprint.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.1 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Form/Task/Update.php b/CRM/Grant/Form/Task/Update.php
index 7533e6d523039faf648edc933100898e6e15801d..cc518e01c2742400c201ecb995eb1e297785d3fa 100644
--- a/CRM/Grant/Form/Task/Update.php
+++ b/CRM/Grant/Form/Task/Update.php
@@ -1,9 +1,9 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.2 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2012 |
+ | Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2012
+ * @copyright CiviCRM LLC (c) 2004-2013
* $Id$
*
*/
@@ -63,7 +63,7 @@ class CRM_Grant_Form_Task_Update extends CRM_Grant_Form_Task {
* @return void
*/
function buildQuickForm() {
- $grantStatus = CRM_Core_OptionGroup::values('grant_status');
+ $grantStatus = CRM_Core_PseudoConstant::get('CRM_Grant_DAO_Grant', 'status_id');
CRM_Utils_System::setTitle(ts('Update Grants'));
$this->addElement('select', 'status_id', ts('Grant Status'), array('' => '') + $grantStatus);
$this->addElement('radio', 'radio_ts', NULL, ts(' Do not update'), 'no_update' );
@@ -148,7 +148,6 @@ class CRM_Grant_Form_Task_Update extends CRM_Grant_Form_Task {
}
}
- //CRM_Core_Error::debug( '$this', $this->sorted );
foreach ($this->sorted as $grantId) {
$ids['grant_id'] = $grantId;
$grantParams = array('id' => $grantId);
diff --git a/CRM/Grant/Page/GrantProgram.php b/CRM/Grant/Page/GrantProgram.php
index 11f3c323899890b88535684c6ffbe0ba6b3f05c1..0a47683c29c951c4dac592a27882a32e7c534f98 100755
--- a/CRM/Grant/Page/GrantProgram.php
+++ b/CRM/Grant/Page/GrantProgram.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Page/Payment.php b/CRM/Grant/Page/Payment.php
index 1102c3ad38723b541cb671abbdbe550a587dc11d..186e46f8d9e3c70c4935461166948fb87739ee7b 100755
--- a/CRM/Grant/Page/Payment.php
+++ b/CRM/Grant/Page/Payment.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/PaymentTask.php b/CRM/Grant/PaymentTask.php
index 3ae77f1a015327402e7a1d721af239f9fe0dcaeb..ed5782d57f724d91fd92ae19f49e339b4711c3dc 100755
--- a/CRM/Grant/PaymentTask.php
+++ b/CRM/Grant/PaymentTask.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Selector/PaymentSearch.php b/CRM/Grant/Selector/PaymentSearch.php
index 736825afa1dbdc5cde660c473a74641ddc24eb0d..98f260a6c0bb6fd6394b3ab6f5a57df862b4c58d 100755
--- a/CRM/Grant/Selector/PaymentSearch.php
+++ b/CRM/Grant/Selector/PaymentSearch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.1 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Selector/Search.php b/CRM/Grant/Selector/Search.php
index d813a26c9991372a83335632f8f60bb3e1cc2253..f5ca93acef17f417fb95f890b84f6f117a58617a 100644
--- a/CRM/Grant/Selector/Search.php
+++ b/CRM/Grant/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/StateMachine/PaymentSearch.php b/CRM/Grant/StateMachine/PaymentSearch.php
index 4e7c96bcfd85fac1bd017b815e4a023c808def86..aec17f672430ff2b000b7df068f59edc298dd06c 100755
--- a/CRM/Grant/StateMachine/PaymentSearch.php
+++ b/CRM/Grant/StateMachine/PaymentSearch.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.1 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
diff --git a/CRM/Grant/Words.php b/CRM/Grant/Words.php
index e3e2038848cf75fa3debaeb0fdebc331bed6487b..e695533f6aa474f042b48f86cc59e7ce61c5aad3 100755
--- a/CRM/Grant/Words.php
+++ b/CRM/Grant/Words.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+