projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ian province abbreviation patch - issue 724
[civicrm-core.git]
/
CRM
/
Report
/
Form
/
Extended.php
diff --git
a/CRM/Report/Form/Extended.php
b/CRM/Report/Form/Extended.php
index 7effc2e17249e7223c8bd61797c7a2cb160625aa..1f60de6f9542a5ebf5065bc599e7a150c088e584 100644
(file)
--- a/
CRM/Report/Form/Extended.php
+++ b/
CRM/Report/Form/Extended.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
6
|
+ | CiviCRM version 4.
7
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
4
+ * @copyright CiviCRM LLC (c) 2004-201
5
* $Id$
*
*/
* $Id$
*
*/
@@
-517,7
+517,7
@@
class CRM_Report_Form_Extended extends CRM_Report_Form {
'alter_display' => 'alterContributionType',
),
'payment_instrument_id' => array(
'alter_display' => 'alterContributionType',
),
'payment_instrument_id' => array(
- 'title' => ts('Payment
Instrument
'),
+ 'title' => ts('Payment
Method
'),
'alter_display' => 'alterPaymentType',
),
'source' => array('title' => 'Contribution Source'),
'alter_display' => 'alterPaymentType',
),
'source' => array('title' => 'Contribution Source'),
@@
-553,7
+553,7
@@
class CRM_Report_Form_Extended extends CRM_Report_Form {
),
'order_bys' => array(
'payment_instrument_id' => array(
),
'order_bys' => array(
'payment_instrument_id' => array(
- 'title' => ts('Payment
Instrument
'),
+ 'title' => ts('Payment
Method
'),
),
'financial_type_id' => array(
'title' => ts('Financial Type'),
),
'financial_type_id' => array(
'title' => ts('Financial Type'),
@@
-561,7
+561,7
@@
class CRM_Report_Form_Extended extends CRM_Report_Form {
),
'group_bys' => array(
'financial_type_id' => array('title' => ts('Financial Type')),
),
'group_bys' => array(
'financial_type_id' => array('title' => ts('Financial Type')),
- 'payment_instrument_id' => array('title' => ts('Payment
Instrument
')),
+ 'payment_instrument_id' => array('title' => ts('Payment
Method
')),
'contribution_id' => array(
'title' => ts('Individual Contribution'),
'name' => 'id',
'contribution_id' => array(
'title' => ts('Individual Contribution'),
'name' => 'id',
@@
-1231,7
+1231,7
@@
WHERE line_item_civireport.id IS NOT NULL
}
$contactID = $row['civicrm_contact_id'];
return "<div id=contact-{$contactID} class='crm-entity'>
}
$contactID = $row['civicrm_contact_id'];
return "<div id=contact-{$contactID} class='crm-entity'>
- <span class='crm-editable crmf-nick_name crm-editable-enabled'
data-action='create'
>
+ <span class='crm-editable crmf-nick_name crm-editable-enabled'>
" . $value . "</span></div>";
}
" . $value . "</span></div>";
}