Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cc.tadpole.additionalreports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
extensions
cc.tadpole.additionalreports
Commits
b0bce9bd
Commit
b0bce9bd
authored
8 years ago
by
Kevin Cristiano
Browse files
Options
Downloads
Patches
Plain Diff
add changes to Bookkeeping Report to add addresses
parent
e2f6c108
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CRM/Additionalreports/Form/Report/BookkeepingExtra.php
+17
-1
17 additions, 1 deletion
CRM/Additionalreports/Form/Report/BookkeepingExtra.php
info.xml
+8
-8
8 additions, 8 deletions
info.xml
with
25 additions
and
9 deletions
CRM/Additionalreports/Form/Report/BookkeepingExtra.php
+
17
−
1
View file @
b0bce9bd
...
...
@@ -353,7 +353,8 @@ class CRM_Additionalreports_Form_Report_BookkeepingExtra extends CRM_Report_Form
'amount'
=>
array
(
'title'
=>
ts
(
'Amount'
)),
),
),
);
)
+
$this
->
addAddressFields
(
FALSE
);
$this
->
_groupFilter
=
TRUE
;
$this
->
_tagFilter
=
TRUE
;
...
...
@@ -441,6 +442,8 @@ class CRM_Additionalreports_Form_Report_BookkeepingExtra extends CRM_Report_Form
ON fitem.id =
{
$this
->
_aliases
[
'civicrm_entity_financial_trxn'
]
}
_item.entity_id
LEFT JOIN civicrm_financial_account
{
$this
->
_aliases
[
'civicrm_financial_account'
]
}
_credit_2
ON fitem.financial_account_id =
{
$this
->
_aliases
[
'civicrm_financial_account'
]
}
_credit_2.id
LEFT JOIN civicrm_address
{
$this
->
_aliases
[
'civicrm_address'
]
}
ON
{
$this
->
_aliases
[
'civicrm_address'
]
}
.contact_id =
{
$this
->
_aliases
[
'civicrm_contact'
]
}
.id AND
{
$this
->
_aliases
[
'civicrm_address'
]
}
.is_primary = 1
LEFT JOIN civicrm_line_item
{
$this
->
_aliases
[
'civicrm_line_item'
]
}
ON fitem.entity_id =
{
$this
->
_aliases
[
'civicrm_line_item'
]
}
.id AND fitem.entity_table = 'civicrm_line_item' "
;
if
(
$this
->
isTableSelected
(
'civicrm_batch'
))
{
...
...
@@ -637,6 +640,19 @@ class CRM_Additionalreports_Form_Report_BookkeepingExtra extends CRM_Report_Form
$entryFound
=
TRUE
;
}
if
(
array_key_exists
(
'civicrm_address_state_province_id'
,
$row
))
{
if
(
$value
=
$row
[
'civicrm_address_state_province_id'
])
{
$rows
[
$rowNum
][
'civicrm_address_state_province_id'
]
=
CRM_Core_PseudoConstant
::
stateProvince
(
$value
,
FALSE
);
}
$entryFound
=
TRUE
;
}
if
(
array_key_exists
(
'civicrm_address_country_id'
,
$row
))
{
if
(
$value
=
$row
[
'civicrm_address_country_id'
])
{
$rows
[
$rowNum
][
'civicrm_address_country_id'
]
=
CRM_Core_PseudoConstant
::
country
(
$value
,
FALSE
);
}
$entryFound
=
TRUE
;
}
// display birthday in the configured custom format
if
(
array_key_exists
(
'civicrm_contact_birth_date'
,
$row
))
{
$birthDate
=
$row
[
'civicrm_contact_birth_date'
];
...
...
This diff is collapsed.
Click to expand it.
info.xml
+
8
−
8
View file @
b0bce9bd
<?xml version="1.0"?>
<extension
key=
"cc.tadpole.additionalreports"
type=
"module"
>
<file>
additionalreports
</file>
<name>
FIXME
</name>
<description>
FIXME
</description>
<name>
Additional Reports for CiviCRM
</name>
<description>
Additional reports for CiviCRM
</description>
<license>
AGPL-3.0
</license>
<maintainer>
<author>
Kevin Cristiano
</author>
<email>
kcristiano@tadpole.cc
</email>
</maintainer>
<urls>
<url
desc=
"Main Extension Page"
>
http://
FIXME
</url>
<url
desc=
"Documentation"
>
http://
FIXME
</url>
<url
desc=
"Support"
>
http://
FIXME
</url>
<url
desc=
"Main Extension Page"
>
http
s
://
develop.tadpole.cc/extensions/cc.tadpole.additionalreports.git
</url>
<url
desc=
"Documentation"
>
http
s
://
develop.tadpole.cc/extensions/cc.tadpole.additionalreports.git
</url>
<url
desc=
"Support"
>
http
s
://
develop.tadpole.cc/extensions/cc.tadpole.additionalreports.git
</url>
<url
desc=
"Licensing"
>
http://www.gnu.org/licenses/agpl-3.0.html
</url>
</urls>
<releaseDate>
2016-11-02
</releaseDate>
<version>
1.0
</version>
<develStage>
alph
a
</develStage>
<develStage>
bet
a
</develStage>
<compatibility>
<ver>
4.
2
</ver>
<ver>
4.
7
</ver>
</compatibility>
<comments>
This is a new
, undeveloped
module
</comments>
<comments>
This is a new module
</comments>
<civix>
<namespace>
CRM/Additionalreports
</namespace>
</civix>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment