Pradeep Nayak [Fri, 21 Apr 2017 19:58:49 +0000 (01:28 +0530)]
CRM-20464, fixed smarty error
----------------------------------------
* CRM-20464: Smarty error when receipt is send for recording payment
https://issues.civicrm.org/jira/browse/CRM-20464
Eileen McNaughton [Fri, 21 Apr 2017 03:16:05 +0000 (15:16 +1200)]
Merge pull request #10198 from eileenmcnaughton/iida3
[NFC] Further test improvement
eileen [Thu, 20 Apr 2017 22:04:03 +0000 (10:04 +1200)]
Further test improvement
Eileen McNaughton [Thu, 20 Apr 2017 22:57:39 +0000 (10:57 +1200)]
Merge pull request #10157 from eileenmcnaughton/iida3
CRM-20264, Added Card type and Pan Truncation form fields on Payment …
Eileen McNaughton [Thu, 20 Apr 2017 22:25:09 +0000 (10:25 +1200)]
Merge pull request #10099 from eileenmcnaughton/anet
CRM-19597 allow receive_date to be passed in for A.net, plus some code simplification
Eileen McNaughton [Thu, 20 Apr 2017 22:23:36 +0000 (10:23 +1200)]
Merge pull request #10030 from eileenmcnaughton/test
CRM-20008 fix pending flow.
Eileen McNaughton [Thu, 20 Apr 2017 22:23:03 +0000 (10:23 +1200)]
Merge pull request #10161 from totten/master-hook-inspector
CiviEventInspector - Add util for displaying hook metadata
eileen [Wed, 12 Apr 2017 02:11:18 +0000 (14:11 +1200)]
CRM-19597 move function only used by Authorize.net to a.net for clarity.
We could do with a better solution around this, but it needs to be around the completetransaction api
eileen [Wed, 12 Apr 2017 02:05:05 +0000 (14:05 +1200)]
CRM-19597 allow receive_date to be passed in for A.net
Eileen McNaughton [Thu, 20 Apr 2017 21:56:38 +0000 (09:56 +1200)]
Merge pull request #10125 from jitendrapurohit/eventtest
CRM-19773: unit test to check getLocationEvent invokes selectWhereClause() hook
Eileen McNaughton [Thu, 20 Apr 2017 21:55:58 +0000 (09:55 +1200)]
Merge pull request #10158 from JMAConsulting/CRM-20308
CRM-20308: Activity copy is always sent FROM logged in user's email ID
Eileen McNaughton [Thu, 20 Apr 2017 21:55:42 +0000 (09:55 +1200)]
Merge pull request #10176 from JMAConsulting/codeCleanup
Code cleanup
deb.monish [Wed, 19 Apr 2017 12:25:47 +0000 (17:55 +0530)]
CRM-20264 support card_type_id and pan_truncation in all backoffice form
Monish Deb [Thu, 20 Apr 2017 05:31:53 +0000 (11:01 +0530)]
Merge pull request #10193 from eileenmcnaughton/pan_tunc
CRM-20264 handling for storing card_type_id
Eileen McNaughton [Thu, 20 Apr 2017 05:10:16 +0000 (17:10 +1200)]
Merge pull request #10194 from eileenmcnaughton/master
CRM-20264 add test for submitting pan_truncation & card_type_id via t…
deb.monish [Thu, 20 Apr 2017 04:50:55 +0000 (16:50 +1200)]
CRM-20264 add test for submitting pan_truncation & card_type_id via the api
eileen [Thu, 20 Apr 2017 04:03:38 +0000 (16:03 +1200)]
CRM-20264 handling for storing card_type_id
Eileen McNaughton [Thu, 20 Apr 2017 04:03:18 +0000 (16:03 +1200)]
Merge pull request #10189 from eileenmcnaughton/pan_tunc
CRM-20264 make pan_truncation save on contribution form, additional payment, event
Eileen McNaughton [Thu, 20 Apr 2017 03:36:15 +0000 (15:36 +1200)]
Merge pull request #10191 from eileenmcnaughton/report
CRM-20451 Do not assume all BAOs have exportableFields method in Core_…
eileen [Thu, 20 Apr 2017 02:42:44 +0000 (14:42 +1200)]
CRM-20451 Do no assume all BAOs have exportableFields method in Core_report
eileen [Wed, 19 Apr 2017 21:46:08 +0000 (09:46 +1200)]
CRM-20264 make pan_truncation save on event form.
note that this PR should be testable & mergeable as making 'no change' without the changes to Core_Payment_Manual as it is primarily code consolidation
colemanw [Wed, 19 Apr 2017 22:23:05 +0000 (18:23 -0400)]
Merge pull request #10182 from totten/master-listall-checksum
GenCode - Reduce merge-conflicts on AllCoreTables
colemanw [Wed, 19 Apr 2017 19:25:15 +0000 (15:25 -0400)]
Merge pull request #10188 from colemanw/CRM-20105
CRM-20105 - Add case restore and merge api actions
colemanw [Wed, 19 Apr 2017 17:48:08 +0000 (13:48 -0400)]
Merge pull request #9544 from colemanw/CRM-19773
CRM-19773 - Call hook_civicrm_selectWhereClause when checking event permissions
Coleman Watts [Wed, 19 Apr 2017 16:15:27 +0000 (12:15 -0400)]
CRM-20105 - Add merge function to case api
colemanw [Wed, 19 Apr 2017 16:05:28 +0000 (12:05 -0400)]
Merge pull request #10087 from lcdservices/CRM-20368
CRM-20368
Coleman Watts [Thu, 15 Dec 2016 03:33:34 +0000 (22:33 -0500)]
CRM-19773 - Call hook_civicrm_selectWhereClause when checking event permissions
eileen [Wed, 19 Apr 2017 07:41:22 +0000 (19:41 +1200)]
Fully remove deprecated Constants
Pradeep Nayak [Wed, 19 Apr 2017 07:03:30 +0000 (19:03 +1200)]
CRM-20392 enable remaining unit tests added by Pradeep
I did alter the fix side on this a little more - notably to use the shared
functions beginPostProcess and assignPaymentRelatedVariables so this will require
independent review
eileen [Thu, 13 Apr 2017 09:43:03 +0000 (21:43 +1200)]
CRM-20264, Added Card type and Pan Truncation form fields on Payment form
I deliberately excluded card_type because I think we need to review the appropriateness of
the field first. My issue is that the wrangling wound up really wierd & it was apparent the issue
is that card_type is 'Visa' whereas card_type_id is 1 - we should either rename the field
or store the word.
Eileen McNaughton [Wed, 19 Apr 2017 06:29:45 +0000 (18:29 +1200)]
Merge pull request #10187 from eileenmcnaughton/prad
CRM-20392 add unit test and fix for incorrect total used in line item…
Eileen McNaughton [Wed, 19 Apr 2017 05:04:02 +0000 (17:04 +1200)]
Merge pull request #10186 from eileenmcnaughton/mandatory_created_id
CRM-20316 the mailing should still create without created_id (not man…
Pradeep Nayak [Wed, 12 Apr 2017 11:32:42 +0000 (23:32 +1200)]
CRM-20392 add unit test and fix for incorrect total used in line item creation code.
Eileen's note - this is code done by Pradeep that I am reviewing - I am committing
and merging the portion I have reviewed so far. This fixes a bug replicable in
the test Pradeep wrote, and some minor obvious cleanups such as removing unused parameters.
I've commented out some tests to complete this portion & there is still code of Pradeeps
not yet reviewed.
Coleman Watts [Wed, 19 Apr 2017 04:31:52 +0000 (00:31 -0400)]
CRM-20105 - Add restore function to case api
eileen [Tue, 18 Apr 2017 23:00:06 +0000 (11:00 +1200)]
CRM-20316 the mailing should still create without created_id (not mandatory).
eileen [Tue, 18 Apr 2017 23:00:06 +0000 (11:00 +1200)]
CRM-20316 the mailing should still create without created_id (not mandatory).
Eileen McNaughton [Tue, 18 Apr 2017 23:24:04 +0000 (11:24 +1200)]
Merge pull request #10185 from eileenmcnaughton/master
[NFC] Fix invalid php in test-generated example
eileen [Tue, 18 Apr 2017 22:32:22 +0000 (10:32 +1200)]
Fix invalid php in test-generated example
Eileen McNaughton [Tue, 18 Apr 2017 22:08:48 +0000 (10:08 +1200)]
Merge pull request #10171 from seamuslee001/CRM-20427
CRM-20427 Fix issue with the regex in I18n query rewriting and add tests
Seamus Lee [Tue, 18 Apr 2017 21:21:16 +0000 (07:21 +1000)]
CRM-20427 Skip tests that are currently failing as edge cases and not blockers to current issue
Eileen McNaughton [Tue, 18 Apr 2017 21:19:19 +0000 (09:19 +1200)]
Merge pull request #10184 from colemanw/CRM-17711
CRM-17711 - Remove "-unstable" from backdrop filename
Coleman Watts [Tue, 18 Apr 2017 20:20:57 +0000 (16:20 -0400)]
CRM-17711 - Remove "-unstable" from backdrop filename
Tim Otten [Tue, 18 Apr 2017 17:00:04 +0000 (10:00 -0700)]
GenCode - Reduce merge-conflicts on AllCoreTables
The previous checksum was based on the full schema spec. This is
technically safe, but many irrelevant schema changes (such as editing field
comments) will ding the checksum.
The main goal here is to avoid `$template->run()` (line ~44) and its
code-beautifier (which is expensive/slow). This revised algorithm for
`needsUpdate()` should:
* Still be "fast enough" (given that it's a singular file built from a simple template)
* Still be "accurate enough" (given that `getRaw()` is a fair predictor of `run()`)
* Be less prone to merge-conflics (given that it doesn't use the checksum)
colemanw [Tue, 18 Apr 2017 14:55:19 +0000 (10:55 -0400)]
Merge pull request #10175 from TobiasLounsbury/CRM-20438-fix-panels
Added object type selector to panel rule to prevent broad disabling o…
Eileen McNaughton [Tue, 18 Apr 2017 10:12:04 +0000 (22:12 +1200)]
Merge pull request #10179 from yashodha/CRM-20417
CRM-20417 - translate strings
Eileen McNaughton [Tue, 18 Apr 2017 09:29:16 +0000 (21:29 +1200)]
Merge pull request #10178 from JMAConsulting/CRM-20439
CRM-20439: Rename card_type to card_type_id of civicrm_financial_trxn table (IIDA-126)
Eileen McNaughton [Tue, 18 Apr 2017 09:28:39 +0000 (21:28 +1200)]
Merge pull request #10155 from totten/master-pdf-save2
CRM-20420 - Add option to save generated PDF/doc files
yashodha [Tue, 18 Apr 2017 08:06:00 +0000 (13:36 +0530)]
CRM-20417 - translate strings
deb.monish [Tue, 18 Apr 2017 07:28:33 +0000 (12:58 +0530)]
Additional fixes in report and Search form
deb.monish [Tue, 18 Apr 2017 06:39:46 +0000 (12:09 +0530)]
Rename card_type to card_type_id of civicrm_financial_trxn table (IIDA-126)
Eileen McNaughton [Tue, 18 Apr 2017 01:37:40 +0000 (13:37 +1200)]
Merge pull request #10177 from eileenmcnaughton/master
Fix visibility typo
eileen [Tue, 18 Apr 2017 01:34:20 +0000 (13:34 +1200)]
Fix visibility typo
Pradeep Nayak [Fri, 7 Apr 2017 22:34:27 +0000 (04:04 +0530)]
Used generalized function, removed unused function
Pradeep Nayak [Fri, 7 Apr 2017 21:29:37 +0000 (02:59 +0530)]
removed cruft code
Pradeep Nayak [Fri, 7 Apr 2017 21:25:26 +0000 (02:55 +0530)]
Used Api to get financial account for an entity defined in civicrm_entity_financial_account table
Eileen McNaughton [Mon, 17 Apr 2017 21:43:52 +0000 (09:43 +1200)]
Merge pull request #10174 from civicrm/colemanw-contributing
Document PR scope & size
Seamus Lee [Mon, 17 Apr 2017 21:42:32 +0000 (07:42 +1000)]
Minor alter to regex
Seamus Lee [Mon, 17 Apr 2017 21:28:43 +0000 (07:28 +1000)]
CRM-20427 add more tests in
Tobias Lounsbury [Mon, 17 Apr 2017 20:16:12 +0000 (13:16 -0700)]
Added object type selector to panel rule to prevent broad disabling of all objects with class panel on civicrm pages.
colemanw [Mon, 17 Apr 2017 18:50:01 +0000 (14:50 -0400)]
Update CONTRIBUTING.md
Seamus Lee [Sun, 16 Apr 2017 23:52:39 +0000 (09:52 +1000)]
CRM-20427 Fix regex issue with I18n query rewrite
Seamus Lee [Sun, 16 Apr 2017 23:29:59 +0000 (09:29 +1000)]
Add tests of I18n rewiteQuery to test regex
Eileen McNaughton [Sun, 16 Apr 2017 23:18:13 +0000 (11:18 +1200)]
Merge pull request #10109 from eileenmcnaughton/ayd
CRM-20312 index reconciliation
Coleman Watts [Sun, 16 Apr 2017 19:44:07 +0000 (15:44 -0400)]
CRM-20312 - Add a few more action buttons to system status screen
Coleman Watts [Sun, 16 Apr 2017 16:41:33 +0000 (12:41 -0400)]
CRM-20312 - Perform actions from within system status screen
eileen [Sun, 16 Apr 2017 04:55:06 +0000 (16:55 +1200)]
CRM-20312 add a little more detail as to how to update indexes
Aidan Saunders [Fri, 14 Oct 2016 21:20:14 +0000 (22:20 +0100)]
CRM-20312 add api wrapper for updating indexes
Monish Deb [Sun, 16 Apr 2017 17:22:37 +0000 (22:52 +0530)]
Merge pull request #10170 from seamuslee001/CRM-20436
CRM-20436 Make method updateKenyanProvinces Static
deb.monish [Thu, 13 Apr 2017 12:18:10 +0000 (17:48 +0530)]
additional changes and added unit test
Seamus Lee [Sun, 16 Apr 2017 09:49:41 +0000 (19:49 +1000)]
CRM-20436 Make method updateKenyanProvinces Static
Erik Hommel [Tue, 4 Apr 2017 07:17:43 +0000 (09:17 +0200)]
CRM-20308 added method getReceiptFrom to set FROM in sendActivityCopy - send email to assignee
Eileen McNaughton [Sun, 16 Apr 2017 05:32:02 +0000 (17:32 +1200)]
Merge pull request #10169 from seamuslee001/new_indexes
CRM-20313,CRM-19357,CRM-20204,CRM-19383
Joe Murray [Tue, 21 Mar 2017 20:38:00 +0000 (16:38 -0400)]
CRM-20313,CRM-19357: Add index to civicrm_activity.status_id and unique index to civicrm_entity_financial_account table
Seamus Lee [Sun, 16 Apr 2017 04:10:07 +0000 (14:10 +1000)]
CRM-20204,CRM-19383 Add in Indexes to civicrm_activity.activity_date_time and civicrm_event_queue.hash
Eileen McNaughton [Sun, 16 Apr 2017 00:36:17 +0000 (12:36 +1200)]
Merge pull request #10166 from aydun/CRM-19464-upgrade
CRM-19464 sql upgrade
Eileen McNaughton [Sun, 16 Apr 2017 00:35:54 +0000 (12:35 +1200)]
Merge pull request #10163 from JohnFF/bugfix/fix_static_warning
Fixed static call of non static method.
Eileen McNaughton [Sat, 15 Apr 2017 23:59:23 +0000 (11:59 +1200)]
Merge pull request #10150 from eileenmcnaughton/friend
CRM-20328 remove call to duplicated code sequence.
Eileen McNaughton [Sat, 15 Apr 2017 21:46:03 +0000 (09:46 +1200)]
Merge pull request #9857 from aydun/CRM-19464
CRM-19464 Make 'Supplemental Address 3' usable
Aidan Saunders [Sat, 15 Apr 2017 11:42:59 +0000 (12:42 +0100)]
Localize description
Tim Otten [Fri, 14 Apr 2017 21:30:24 +0000 (14:30 -0700)]
Merge pull request #10160 from JohnFF/bugfix/silent_sql_file_error
Make sourceSQLFile throw an error when it can't find a file.
colemanw [Fri, 14 Apr 2017 21:04:08 +0000 (17:04 -0400)]
Merge pull request #10162 from yashodha/CRM-20429
CRM-20429 - Deleting an activity with target contacts > 50 results in…
Aidan Saunders [Fri, 14 Apr 2017 20:49:32 +0000 (21:49 +0100)]
CRM-19464 sql upgrade
Aidan Saunders [Fri, 17 Feb 2017 23:27:32 +0000 (23:27 +0000)]
CRM-19464 Enable use of 'Supplemental Address 3'
In some situations, the address format is too limited. The 'Supplemental Address 3'
already exists in the schema but was not exposed to the GUI.
This touches many files but the changes are fairly simple. Wherever 'Supplemental Address 2'
existed, there is now a 'Supplemental Address 3' as well.
John Kirk [Fri, 14 Apr 2017 06:27:29 +0000 (06:27 +0000)]
Fixed static call of non static method. Assume the method was meant to be static as there's nothing in there requiring it to be dynamic.
yashodha [Fri, 14 Apr 2017 06:17:59 +0000 (11:47 +0530)]
CRM-20429 - Deleting an activity with target contacts > 50 results in error
Eileen McNaughton [Fri, 14 Apr 2017 04:55:26 +0000 (16:55 +1200)]
Merge pull request #10148 from yashodha/CRM-20417
CRM-20417 - translate strings
John Kirk [Thu, 13 Apr 2017 22:11:11 +0000 (22:11 +0000)]
Make sourceSQLFile throw an error when it can't find a file - previously it just failed silently.
Tim Otten [Fri, 14 Apr 2017 03:57:02 +0000 (20:57 -0700)]
CiviEventInspector - Document fields in an event-definition.
Tim Otten [Fri, 14 Apr 2017 03:55:51 +0000 (20:55 -0700)]
CiviEventInspector - Include stub for hooks (when available)
Tim Otten [Fri, 14 Apr 2017 02:28:14 +0000 (19:28 -0700)]
Rename hook_civicrm_hooks to hook_civicrm_eventDefs
Tim Otten [Fri, 14 Apr 2017 02:25:44 +0000 (19:25 -0700)]
CiviEventInspector - Include metadata about some non-hook events
Tim Otten [Fri, 14 Apr 2017 02:05:57 +0000 (19:05 -0700)]
CiviEventInspector - Prefer "event" nomenclature instead of "hook"
Events are a superset of hooks.
Tim Otten [Fri, 14 Apr 2017 01:51:02 +0000 (18:51 -0700)]
Rename CRM_Utils_Hook_Inspector to Civi\Core\CiviEventInspector
Tim Otten [Fri, 14 Apr 2017 01:46:00 +0000 (18:46 -0700)]
CRM_Utils_Hook::hooks - Prettify
Tim Otten [Thu, 13 Apr 2017 23:51:37 +0000 (16:51 -0700)]
CRM_Utils_Hook_Inspector - Add util for displaying hook metadata
This is meant to facilitate better code-generators and
documentation-generators. Key features:
* Adds a new class, `CRM_Utils_Hook_Inspector`.
* Adds a new hook, `hook_civicrm_hooks`. Extensions may use this to document their hooks.
* Implements the hook in core (to report on `civicrm-core` hooks)
* If you follow the practice of declaring static hook stubs (like
`civicrm-core` does), then use `addStaticStubs()` to assimilate of them.
Tim Otten [Thu, 13 Apr 2017 23:48:32 +0000 (16:48 -0700)]
APIExplorer::formatDocBlock() - Make public. Normalize whitespace.
This will make the function more useful for the hook inspector.
colemanw [Fri, 14 Apr 2017 01:23:19 +0000 (21:23 -0400)]
Merge pull request #10112 from JMAConsulting/CRM-20384
CRM-20384, Added Contribution ID column and Filter to Book Keeping report
Tim Otten [Thu, 13 Apr 2017 21:07:00 +0000 (14:07 -0700)]
CRM-20420 - PDFLetterCommon::createActivities() - Combine calls
Combine the calls to CRM_Activity_BAO_Activity::create() and
CRM_Activity_BAO_ActivityContact::create() into one call.
Remove unnecessary `$activityContacts`.
Pradeep Nayak [Wed, 12 Apr 2017 20:38:59 +0000 (02:08 +0530)]
CRM-20384, added function to get Organization Name associated with Financial Account.
----------------------------------------
* CRM-20384: Bookkeeping report add contrib ID, filter by financial account owner (IIDA-85)
https://issues.civicrm.org/jira/browse/CRM-20384
Pradeep Nayak [Wed, 5 Apr 2017 11:12:30 +0000 (16:42 +0530)]
CRM-20384, Added Contribution ID column and Filter
Added option to display and Filter by Financial Account Owner
----------------------------------------
* CRM-20384: bookkeeping transaction report
https://issues.civicrm.org/jira/browse/CRM-20384