francescbassas [Wed, 27 Jul 2016 14:55:57 +0000 (16:55 +0200)]
Fixes Jenkins warnings
francescbassas [Wed, 27 Jul 2016 14:30:34 +0000 (16:30 +0200)]
CRM-19133 Unassigning contact subtype for a custom group causes data loss
francescbassas [Wed, 27 Jul 2016 11:15:34 +0000 (13:15 +0200)]
Fixes Jenkins warnings
francescbassas [Wed, 27 Jul 2016 10:20:10 +0000 (12:20 +0200)]
CRM-19133 Unassigning contact subtype for a custom group causes data loss
francescbassas [Tue, 26 Jul 2016 22:28:43 +0000 (00:28 +0200)]
CRM-19133 Unassigning contact subtype for a custom group causes data loss
francescbassas [Tue, 26 Jul 2016 22:24:28 +0000 (00:24 +0200)]
CRM-19133 Unassigning contact subtype for a custom group causes data loss
Eileen McNaughton [Mon, 25 Jul 2016 23:52:33 +0000 (11:52 +1200)]
Merge pull request #8219 from colemanw/CRM-18004
CRM-18004 - IDS: Fix undefined index & code cleanup
colemanw [Mon, 25 Jul 2016 19:54:14 +0000 (15:54 -0400)]
Merge pull request #8745 from twomice/CRM-19120
CRM-19120: Fix display of chain-select fields in event cart.
Eileen McNaughton [Mon, 25 Jul 2016 06:26:30 +0000 (18:26 +1200)]
Merge pull request #8749 from seamuslee001/CRM-18267
CRM-18267 Upgrade dom pdf to update php-font-lib
Monish Deb [Sun, 24 Jul 2016 17:50:51 +0000 (23:20 +0530)]
Merge pull request #8729 from jitendrapurohit/CRM-18528-tests
CRM-18528 - unit test to check group filter
Seamus Lee [Sun, 24 Jul 2016 02:14:21 +0000 (12:14 +1000)]
Fix setting of is remote enabled to work with DomPDF 0.7.0
Seamus Lee [Sat, 23 Jul 2016 05:20:54 +0000 (15:20 +1000)]
Update dompdf code in PDF/Utils to match upgraded dompdf code
Seamus Lee [Sat, 23 Jul 2016 05:02:50 +0000 (15:02 +1000)]
Upgrade dom pdf to update php-font-lib
Tim Otten [Sat, 23 Jul 2016 00:34:56 +0000 (17:34 -0700)]
Merge pull request #8739 from totten/master-no-pear-2
(NFC) CRM_Core_CodeGen_Util_Template - Remove PEAR formatting filter
Tim Otten [Sat, 23 Jul 2016 00:21:31 +0000 (17:21 -0700)]
Merge pull request #8746 from seamuslee001/CRM-19118
CRM-19118 Fix Syntax Confromance test by specifiy data for children a…
Seamus Lee [Fri, 22 Jul 2016 22:51:45 +0000 (08:51 +1000)]
Remove silly character
Seamus Lee [Fri, 22 Jul 2016 22:23:11 +0000 (08:23 +1000)]
CRM-19118 Fix Syntax Confromance test by specifiy data for children and parent fields when generating test data
Allen Shaw [Fri, 22 Jul 2016 20:50:28 +0000 (15:50 -0500)]
CRM-19120: Fix display of chain-select fields in event cart.
Monish Deb [Fri, 22 Jul 2016 18:32:53 +0000 (00:02 +0530)]
Merge pull request #8740 from jitendrapurohit/CRM-19110
CRM-19110: Fix delete pledge payments
jitendrapurohit [Fri, 22 Jul 2016 11:33:40 +0000 (17:03 +0530)]
set permission to pass group filter test
Monish Deb [Fri, 22 Jul 2016 10:22:58 +0000 (15:52 +0530)]
Merge pull request #8728 from yashodha/CRM-18591
CRM-18591: group_type parameter ignored when using API to create group
yashodha [Fri, 22 Jul 2016 07:24:11 +0000 (12:54 +0530)]
CRM-18591: add test
----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
https://issues.civicrm.org/jira/browse/CRM-18591
yashodha [Wed, 20 Jul 2016 12:16:50 +0000 (17:46 +0530)]
CRM-18591: support for single value passed through api
----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
https://issues.civicrm.org/jira/browse/CRM-18591
yashodha [Wed, 20 Jul 2016 09:04:47 +0000 (14:34 +0530)]
CRM-18591: group_type parameter ignored when using API to create group
----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
https://issues.civicrm.org/jira/browse/CRM-18591
jitendrapurohit [Fri, 22 Jul 2016 07:03:02 +0000 (12:33 +0530)]
CRM-19110: Fix delete pledge payments
Yashodha Chaku [Fri, 22 Jul 2016 04:19:18 +0000 (09:49 +0530)]
Merge pull request #8736 from yashodha/fix-version
Set version to 4.7.11
Tim Otten [Thu, 21 Jul 2016 18:51:27 +0000 (11:51 -0700)]
(NFC) CRM_Core_CodeGen_Util_Template - Remove PEAR formatting filter
This filter has several issues:
* Fundamentally, we don't use PEAR style guide - we're closer to Drupal style guide.
* Its only practical effect is to move squiggly braces... to the wrong place.
* It tangentially pulls in PEAR dependencies.
* It adds a ~4 seconds to GenCode (as measured on my laptop).
Joe Murray [Thu, 21 Jul 2016 18:49:36 +0000 (14:49 -0400)]
Merge pull request #8737 from JMAConsulting/CRM-16189-43
[ready-for-core-team-review]CRM-16189, changed url for Deferred Revenue report
Pradeep Nayak [Thu, 21 Jul 2016 10:37:09 +0000 (16:07 +0530)]
CRM-16189, changed url for Deferred Revenue report
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
yashodha [Thu, 21 Jul 2016 10:29:27 +0000 (15:59 +0530)]
Set version to 4.7.11
Monish Deb [Wed, 20 Jul 2016 20:47:54 +0000 (02:17 +0530)]
Merge pull request #8717 from monishdeb/CRM-19094
CRM-19094: cid=0 membership contribution form can overwrite data of an existing membership
Eileen McNaughton [Wed, 20 Jul 2016 20:36:18 +0000 (08:36 +1200)]
Merge pull request #8731 from JKingsnorth/CRM-19108
[NFC] CRM-19108: Fix incorrect case on CRM_Utils_array
Joe Murray [Wed, 20 Jul 2016 20:29:39 +0000 (16:29 -0400)]
Merge pull request #8727 from jitendrapurohit/CRM-19100
CRM-19100: 4.7.8 SQL Incremental Update May Fail for UTF8
JKingsnorth [Wed, 20 Jul 2016 12:33:37 +0000 (13:33 +0100)]
CRM-19108: Fix incorrect case on CRM_Utils_array
Yashodha Chaku [Wed, 20 Jul 2016 12:01:47 +0000 (17:31 +0530)]
Merge pull request #8711 from JMAConsulting/CRM-16189-37
[ready-for-core-team-review] CRM-16189, fixed code to add entries in civicrm_entity_financial_tr…
Eileen McNaughton [Wed, 20 Jul 2016 11:40:21 +0000 (23:40 +1200)]
Merge pull request #8695 from eileenmcnaughton/address_tests
CRM-19076 Multiple Merge tests + fix for lost address
Monish Deb [Wed, 20 Jul 2016 11:09:52 +0000 (16:39 +0530)]
Merge pull request #8706 from jitendrapurohit/CRM-19053
CRM-19053 - Fix Source Message for Pending Contribution
eileen [Wed, 20 Jul 2016 03:10:25 +0000 (15:10 +1200)]
CRM-19076 add tests for emails on merge
jitendrapurohit [Wed, 20 Jul 2016 10:12:12 +0000 (15:42 +0530)]
use defined functions
Edsel [Wed, 20 Jul 2016 07:56:10 +0000 (13:26 +0530)]
CRM-16189 Renamed param
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
jitendrapurohit [Wed, 20 Jul 2016 07:33:09 +0000 (13:03 +0530)]
CRM-19100: 4.7.8 SQL Incremental Update May Fail for UTF8
Eileen McNaughton [Wed, 20 Jul 2016 03:12:44 +0000 (15:12 +1200)]
Merge pull request #8726 from colemanw/CRM-17606
CRM-17606 - Create documents from Find Cases search result
Coleman Watts [Wed, 20 Jul 2016 00:22:10 +0000 (20:22 -0400)]
CRM-17606 - Fix js bug due to nonstandard form class name
jitendrapurohit [Fri, 24 Jun 2016 06:07:41 +0000 (11:37 +0530)]
label fix
jitendrapurohit [Wed, 25 May 2016 04:44:45 +0000 (10:14 +0530)]
indent and title fix
jitendrapurohit [Mon, 23 May 2016 11:22:54 +0000 (16:52 +0530)]
CRM-17606 - Create multiple documents from Find Cases search result
colemanw [Tue, 19 Jul 2016 23:30:49 +0000 (19:30 -0400)]
Merge pull request #8725 from colemanw/CRM-17608
CRM-17608 - Merge document form tweaks
Coleman Watts [Tue, 19 Jul 2016 22:04:06 +0000 (18:04 -0400)]
CRM-17608 - Merge document form tweaks
colemanw [Tue, 19 Jul 2016 18:49:01 +0000 (14:49 -0400)]
Merge pull request #8474 from monishdeb/CRM-17608
CRM-17608: Merge to DOCx or ODT template
Coleman Watts [Tue, 19 Jul 2016 17:00:30 +0000 (13:00 -0400)]
Fix capitalization
Monish Deb [Tue, 19 Jul 2016 10:41:42 +0000 (16:11 +0530)]
Merge pull request #8720 from yashodha/CRM-18472
CRM-18472: fix notice
eileen [Tue, 19 Jul 2016 00:27:01 +0000 (12:27 +1200)]
CRM-19076 Add tests for phones on merge
It turned out these were losing data too.....
yashodha [Tue, 19 Jul 2016 05:49:58 +0000 (11:19 +0530)]
CRM-18472: fix notice
----------------------------------------
* CRM-18472: Notice fixes
https://issues.civicrm.org/jira/browse/CRM-18472
deb.monish [Tue, 19 Jul 2016 05:48:09 +0000 (11:18 +0530)]
minor fix
Yashodha Chaku [Tue, 19 Jul 2016 05:35:22 +0000 (11:05 +0530)]
Merge pull request #8715 from seamuslee001/CRM-19098
CRM-19098 Add in Group Settings to add new group on Import
Yashodha Chaku [Tue, 19 Jul 2016 05:26:41 +0000 (10:56 +0530)]
Merge pull request #8716 from monishdeb/CRM-19096
CRM-19096: Parent group arrow mis-aligned
Yashodha Chaku [Tue, 19 Jul 2016 03:24:19 +0000 (08:54 +0530)]
Merge pull request #8703 from yashodha/CRM-19078
CRM-19078: Cannot search memberships by auto-renew OR not-auto-renew
deb.monish [Mon, 18 Jul 2016 13:19:10 +0000 (18:49 +0530)]
CRM-19094: cid=0 membership contribution form can overwrite data of an existing membership
deb.monish [Mon, 18 Jul 2016 09:53:19 +0000 (15:23 +0530)]
CRM-19096: Parent group arrow mis-aligned
Seamus Lee [Mon, 18 Jul 2016 09:30:44 +0000 (09:30 +0000)]
Add in checking on if groupType is set
Seamus Lee [Mon, 18 Jul 2016 09:29:42 +0000 (09:29 +0000)]
Update template
Seamus Lee [Mon, 18 Jul 2016 09:27:05 +0000 (09:27 +0000)]
CRM-19098 Add in Group Settings to add new group on import
Yashodha Chaku [Mon, 18 Jul 2016 07:47:58 +0000 (13:17 +0530)]
Merge pull request #8705 from francescbassas/refs/remotes/origin/patch-3
CRM-19088 : Always build contact subtype field
eileen [Mon, 18 Jul 2016 04:32:23 +0000 (16:32 +1200)]
CRM-19076 add test for hooks.
In resolving how to deal with addresses for this ticket we decided to err on the side of 'never lose data' ie. doing things like keeping 2 identical addresses if they have different location types. THe justification was that less conservative logic could be implemented using tests. This test adds the logic for use case where address data is more aggressively updated.
In doing so I felt the existing hook was almost unworkable & opted
to add a different hook, specific to addesses.
eileen [Mon, 18 Jul 2016 00:05:03 +0000 (12:05 +1200)]
Minor code simplification on merge code.
Extract & combine the code for getting the merge contacts.
Get rid of odd 22391moniker use
eileen [Sun, 17 Jul 2016 23:33:29 +0000 (11:33 +1200)]
Minor code simplification.
Remove double looping on contacts & put retrieval of special values
into separate function. Also remove return false when there is no contact_type as
1) contact_type is a required field &
2) the calling functions don't handle the (impossible) false anyway
eileen [Sun, 17 Jul 2016 22:58:33 +0000 (10:58 +1200)]
CRM-19097 Cache cidRefs during merge
eileen [Wed, 13 Jul 2016 09:44:50 +0000 (21:44 +1200)]
CRM-19076 Test to check for data loss on address
JKingsnorth [Thu, 14 Jul 2016 08:59:56 +0000 (09:59 +0100)]
CRM-19076: Fix address match/conflict detection
eileen [Wed, 29 Jun 2016 08:19:41 +0000 (20:19 +1200)]
CRM-19029 Additional tests for merge function
eileen [Sun, 17 Jul 2016 21:49:54 +0000 (09:49 +1200)]
Test fix for intermittant fail.
The scheduled reminder test fails 'quite a bit', intermittently.
The set up is designed to run '1 hour before' the start_date but since the start date is measured in days not hours this is mostly
about trying to cope with timezones & stuff.
Trying to adjust the test to be based on day rather than an hour to
try to make the test more consistent. This does not affect the
thing the test is intended to test
eileen [Tue, 28 Jun 2016 02:59:57 +0000 (14:59 +1200)]
CRM-19015 Merge data loss on zero fields (batch mode)
deb.monish [Sat, 16 Jul 2016 22:04:23 +0000 (03:34 +0530)]
modified docx pagebreak, optimisation and added unit test
deb.monish [Fri, 15 Jul 2016 15:50:49 +0000 (21:20 +0530)]
wrong formatted filetype fix
Pradeep Nayak [Fri, 15 Jul 2016 17:39:53 +0000 (23:09 +0530)]
[ready-for-core-team-review]CRM-16189, added code to create entries in accounting tables for defe… (#8576)
* CRM-16189, added code to create entries in accounting tables for deferred revenue
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* CRM-16189, added code to set recognition date for membership
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* CRM-16189, added code to create entries for revenue recognition
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* --CRM-16189, removed function calling
* CRM-16189, updated function to ignore deferred trxns entries
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* CRM-16189, added code to create entries for deferred revenue for event registration
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* CRM-16189, store financial item DAO values in variable and return variable
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* CRM-16189, added code to create financial trxn entries
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* CRM-16189, removed white space
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* CRM-16189, fixed notice error
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* CRM-16189, changed class name
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
* --CRM-16189, fixed code for updating of line item
deb.monish [Fri, 15 Jul 2016 14:17:56 +0000 (19:47 +0530)]
fetch content of HTML rather then creating and using the generated HTML file
Pradeep Nayak [Fri, 15 Jul 2016 14:08:02 +0000 (19:38 +0530)]
--CRM-16189, fixed code to add entries in civicrm_entity_financial_trxn table when status is changed from partially paid to completed for partially paid contribution associated with Participant
jitendrapurohit [Fri, 15 Jul 2016 13:23:55 +0000 (18:53 +0530)]
Add unit test
deb.monish [Fri, 15 Jul 2016 10:52:10 +0000 (16:22 +0530)]
style change
Monish Deb [Fri, 15 Jul 2016 12:19:41 +0000 (17:49 +0530)]
Merge pull request #8704 from psampont/CRM-19072
CRM-19072 - Batch update custom fields for a contacts with 2 subtypes
Monish Deb [Fri, 15 Jul 2016 12:14:58 +0000 (17:44 +0530)]
Merge pull request #8709 from jitendrapurohit/CRM-19085
CRM-19085 - Fix "Add to Group" in Reports
jitendrapurohit [Fri, 15 Jul 2016 11:06:07 +0000 (16:36 +0530)]
Add test and minor fixes
Yashodha Chaku [Fri, 15 Jul 2016 07:00:13 +0000 (12:30 +0530)]
Merge pull request #8708 from JMAConsulting/CRM-16189-36
[ready-for-core-team-review]CRM-16189, fixed batch name display for Contribution and Membership r…
Coleman Watts [Thu, 14 Jul 2016 17:24:50 +0000 (13:24 -0400)]
CRM-17608 - Fix missing tokens in docx
Coleman Watts [Thu, 14 Jul 2016 16:54:55 +0000 (12:54 -0400)]
CRM-17608 - Only unzip file once
Coleman Watts [Thu, 14 Jul 2016 16:34:43 +0000 (12:34 -0400)]
CRM-17608 - Preserve formatting of output document
Output document directly instead of going through phpWord
Coleman Watts [Tue, 12 Jul 2016 18:29:45 +0000 (14:29 -0400)]
CRM-17608 - Improve help text
deb.monish [Wed, 13 Jul 2016 08:23:10 +0000 (13:53 +0530)]
additional fixes
deb.monish [Mon, 27 Jun 2016 13:24:58 +0000 (18:54 +0530)]
change document type select field to radio button
deb.monish [Tue, 14 Jun 2016 11:48:06 +0000 (17:18 +0530)]
implement document merge using TbsZip
deb.monish [Thu, 9 Jun 2016 15:23:43 +0000 (20:53 +0530)]
hide document type on upload and improve template processing
deb.monish [Mon, 6 Jun 2016 10:42:14 +0000 (16:12 +0530)]
improvement in docReader fn
deb.monish [Fri, 3 Jun 2016 14:59:44 +0000 (20:29 +0530)]
added document upload element
deb.monish [Wed, 1 Jun 2016 06:21:29 +0000 (11:51 +0530)]
additional fixes
deb.monish [Tue, 31 May 2016 07:19:34 +0000 (12:49 +0530)]
Merge to DOCx or ODT template
jitendrapurohit [Thu, 14 Jul 2016 13:18:00 +0000 (18:48 +0530)]
CRM-19085 - Fix Add to Group Functionality in Reports
Pradeep Nayak [Thu, 14 Jul 2016 13:06:25 +0000 (18:36 +0530)]
CRM-16189, fixed batch name display for Contribution and Membership report
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
jitendrapurohit [Thu, 14 Jul 2016 12:40:47 +0000 (18:10 +0530)]
CRM-19053 - Fix Source Message for recurring Contribution
Francesc Bassas i Bullich [Thu, 14 Jul 2016 11:19:04 +0000 (13:19 +0200)]
Merge refs/remotes/origin/patch-2 into refs/remotes/origin/patch-3
francescbassas [Thu, 14 Jul 2016 11:12:36 +0000 (13:12 +0200)]
Always build contact subtype field
If a contact subtype can be of more contact subtypes then make sense to always show contact subtype on form contact.
projects / civicrm-core.git / log