civicrm-core.git
7 years agoFix Jenkins Failure
Seamus Lee [Sat, 15 Oct 2016 00:54:43 +0000 (11:54 +1100)]
Fix Jenkins Failure

7 years agoCRM-19303: Small changes to remove inline control structures.
Milton Zurita [Tue, 27 Sep 2016 03:39:06 +0000 (22:39 -0500)]
CRM-19303: Small changes to remove inline control structures.

7 years agoCRM-19303:
Milton Zurita [Tue, 27 Sep 2016 03:36:29 +0000 (22:36 -0500)]
CRM-19303:

Final Style Changes.  Other warnings not in my modifications. Line# 40-51

7 years agoCRM-19303 - Style Fixes
Milton Zurita [Tue, 27 Sep 2016 03:29:39 +0000 (22:29 -0500)]
CRM-19303 - Style Fixes

7 years agoFixed: CRM-19303
Milton Zurita [Fri, 16 Sep 2016 08:38:50 +0000 (03:38 -0500)]
Fixed: CRM-19303

Instead of assuming the default folder exists, it checks, if not it will search nearby directories for the files.

7 years agoMerge pull request #9407 from monishdeb/CRM-19302
Monish Deb [Thu, 17 Nov 2016 12:48:47 +0000 (18:18 +0530)]
Merge pull request #9407 from monishdeb/CRM-19302

CRM-19302: Fix Copying of File Custom Fields on Event Copy

7 years agominor change
deb.monish [Thu, 17 Nov 2016 11:55:09 +0000 (17:25 +0530)]
minor change

7 years agoUpdate Event.php
MiyaNoctem [Wed, 5 Oct 2016 19:35:46 +0000 (14:35 -0500)]
Update Event.php

7 years agoUpdate Event.php
MiyaNoctem [Wed, 5 Oct 2016 19:22:33 +0000 (14:22 -0500)]
Update Event.php

7 years agoCRM-19302
Camilo Rodriguez [Tue, 6 Sep 2016 05:56:32 +0000 (00:56 -0500)]
CRM-19302

Fixed bug! Created new static method that copies all custom fields from old event to new event.  Files are handled by copying them and having separate records in civicrm_file table, not just custom fields table.

7 years agoMerge pull request #9375 from JMAConsulting/CRM-19636
Monish Deb [Thu, 17 Nov 2016 10:38:33 +0000 (16:08 +0530)]
Merge pull request #9375 from JMAConsulting/CRM-19636

CRM-19636, fixed db error for Top Donor report when filtered using Co…

7 years agoMerge pull request #9404 from agileware/CRM-19659
Yashodha Chaku [Thu, 17 Nov 2016 08:31:24 +0000 (14:01 +0530)]
Merge pull request #9404 from agileware/CRM-19659

CRM-19659 - Fix undefined array index in CiviCRM mailings caused by NULL language.

7 years agoCRM-19636, used getBasicContactFilters() to get contact filters
Pradeep Nayak [Thu, 17 Nov 2016 06:34:09 +0000 (12:04 +0530)]
CRM-19636, used getBasicContactFilters() to get contact filters

----------------------------------------
* CRM-19636: DB error on Top Donor Report
  https://issues.civicrm.org/jira/browse/CRM-19636

7 years agoCRM-19636, fixed db error for Top Donor report when filtered using Contact Name,...
Pradeep Nayak [Fri, 11 Nov 2016 13:04:34 +0000 (18:34 +0530)]
CRM-19636, fixed db error for Top Donor report when filtered using Contact Name, Contact sub type, Contact type etc

----------------------------------------
* CRM-19636: DB error on Top Donor Report
  https://issues.civicrm.org/jira/browse/CRM-19636

7 years agoMerge pull request #9400 from francescbassas/patch-7
Yashodha Chaku [Thu, 17 Nov 2016 06:03:46 +0000 (11:33 +0530)]
Merge pull request #9400 from francescbassas/patch-7

CRM-19654 Missing cancel date and row style for canceled contributions

7 years agoFix undefined array index in CiviCRM mailings caused by NULL language.
Agileware Support [Thu, 17 Nov 2016 01:51:08 +0000 (12:51 +1100)]
Fix undefined array index in CiviCRM mailings caused by NULL language.

7 years agoMerge pull request #9397 from eileenmcnaughton/api
colemanw [Wed, 16 Nov 2016 16:35:37 +0000 (11:35 -0500)]
Merge pull request #9397 from eileenmcnaughton/api

CRM-19650 - API Remove now-unused api functions

7 years agoCRM-19654 Missing cancel date and row style for canceled contributions
francescbassas [Wed, 16 Nov 2016 15:58:42 +0000 (16:58 +0100)]
CRM-19654 Missing cancel date and row style for canceled contributions

7 years agoMerge pull request #9399 from jitendrapurohit/CRM-19621
Monish Deb [Wed, 16 Nov 2016 13:22:11 +0000 (18:52 +0530)]
Merge pull request #9399 from jitendrapurohit/CRM-19621

CRM-19621: Contribution confirm page does not display state/country

7 years agoCRM-19621: Contribution confirm page does not display state/country
jitendrapurohit [Wed, 16 Nov 2016 09:21:49 +0000 (14:51 +0530)]
CRM-19621: Contribution confirm page does not display state/country

7 years agoMerge pull request #9388 from jitendrapurohit/CRM-19626
Yashodha Chaku [Wed, 16 Nov 2016 04:36:34 +0000 (10:06 +0530)]
Merge pull request #9388 from jitendrapurohit/CRM-19626

CRM-19626: Event Registration page allows registration even if no nu…

7 years agoCRM-19650 - API Remove now-unused api functions
eileen [Wed, 16 Nov 2016 01:37:24 +0000 (14:37 +1300)]
CRM-19650 - API Remove now-unused api functions

7 years agoMerge pull request #9395 from seamuslee001/CRM-19641
Eileen McNaughton [Tue, 15 Nov 2016 21:06:41 +0000 (10:06 +1300)]
Merge pull request #9395 from seamuslee001/CRM-19641

CRM-19641

7 years agoCRM-19641
Seamus Lee [Tue, 15 Nov 2016 19:37:04 +0000 (06:37 +1100)]
CRM-19641

7 years agoMerge pull request #9365 from alifrumin/labelsjoomla
colemanw [Tue, 15 Nov 2016 19:20:03 +0000 (14:20 -0500)]
Merge pull request #9365 from alifrumin/labelsjoomla

CRM-19629 Labels display as pills on joomla backend civicrm pages

7 years agochanging the class selectors so that popups are included
Alice Frumin [Tue, 15 Nov 2016 18:43:43 +0000 (13:43 -0500)]
changing the class selectors so that popups are included

7 years agoMerge pull request #9367 from mlutfy/master-crm17879
Monish Deb [Tue, 15 Nov 2016 12:34:42 +0000 (18:04 +0530)]
Merge pull request #9367 from mlutfy/master-crm17879

CRM-17879 PDF formats in Message Templates not loading

7 years agoMerge pull request #9343 from seamuslee001/CRM-18493
Monish Deb [Tue, 15 Nov 2016 10:56:18 +0000 (16:26 +0530)]
Merge pull request #9343 from seamuslee001/CRM-18493

CRM-18493 Ensure that sort param is valid for use in mysql

7 years agominor optimization
deb.monish [Tue, 15 Nov 2016 10:02:29 +0000 (15:32 +0530)]
minor optimization

7 years agoFix Variable
Seamus Lee [Mon, 31 Oct 2016 21:06:33 +0000 (08:06 +1100)]
Fix Variable

7 years agoFix Test skipping message
Seamus Lee [Mon, 31 Oct 2016 21:05:44 +0000 (08:05 +1100)]
Fix Test skipping message

7 years agoCRM-18493 Ensure that sort param is valid for use in mysql
Seamus Lee [Tue, 25 Oct 2016 23:37:06 +0000 (10:37 +1100)]
CRM-18493 Ensure that sort param is valid for use in mysql

7 years agoCRM-19626 - Event Registration page allows registration even if no number (or the...
jitendrapurohit [Tue, 15 Nov 2016 09:15:42 +0000 (14:45 +0530)]
CRM-19626 - Event Registration page allows registration even if no number (or the number 0) has been entered in any ticket quantity boxes

7 years agoMerge pull request #9322 from konadave/CRM-19567-master
Yashodha Chaku [Tue, 15 Nov 2016 06:34:46 +0000 (12:04 +0530)]
Merge pull request #9322 from konadave/CRM-19567-master

CRM-19567 FALSE amount owed warning

7 years agoMerge pull request #9386 from eileenmcnaughton/bits
colemanw [Tue, 15 Nov 2016 04:13:34 +0000 (23:13 -0500)]
Merge pull request #9386 from eileenmcnaughton/bits

CRM-15861 - minor cleanups towards this implementation

7 years agoMove status check to shared function
eileen [Tue, 15 Nov 2016 02:15:59 +0000 (15:15 +1300)]
Move status check to shared function

7 years agoUpdate dataTable param
Coleman Watts [Tue, 15 Nov 2016 02:33:34 +0000 (21:33 -0500)]
Update dataTable param

See https://datatables.net/upgrade/1.10-convert

7 years agoCRM-15861 remove permission check that is duplicated in the parent function (called...
eileenmcnaugton [Mon, 31 Oct 2016 08:03:16 +0000 (21:03 +1300)]
CRM-15861 remove permission check that is duplicated in the parent function (called next)

7 years agoMerge pull request #9380 from KarinG/patch-6
colemanw [Tue, 15 Nov 2016 02:03:10 +0000 (21:03 -0500)]
Merge pull request #9380 from KarinG/patch-6

Set a value for iDisplayLength

7 years agoMerge pull request #9385 from eileenmcnaughton/reg
Eileen McNaughton [Tue, 15 Nov 2016 01:00:47 +0000 (14:00 +1300)]
Merge pull request #9385 from eileenmcnaughton/reg

CRM-19646 fix error introduced to ACLs

7 years agoCRM-19646 fix error introduced to ACLs
eileen [Mon, 14 Nov 2016 23:12:29 +0000 (12:12 +1300)]
CRM-19646 fix error introduced to ACLs

7 years agoComment tidy-ups
eileen [Mon, 14 Nov 2016 04:47:46 +0000 (17:47 +1300)]
Comment tidy-ups

7 years agoMerge pull request #9384 from scardinius/crm-19645
Yashodha Chaku [Mon, 14 Nov 2016 13:44:55 +0000 (19:14 +0530)]
Merge pull request #9384 from scardinius/crm-19645

CRM-19645 - Add missing translation of label on Opt Out button

7 years agoMerge pull request #9372 from agh1/no-notification-offline-text
Yashodha Chaku [Mon, 14 Nov 2016 13:08:11 +0000 (18:38 +0530)]
Merge pull request #9372 from agh1/no-notification-offline-text

CRM-18139 CiviEvent: batch status change message clarification

7 years agoMerge pull request #8785 from JMAConsulting/CRM-19153
Monish Deb [Mon, 14 Nov 2016 13:03:09 +0000 (18:33 +0530)]
Merge pull request #8785 from JMAConsulting/CRM-19153

[ready for core review] CRM-19153 Fixed future payment dates for future start pledge dates

7 years agoCRM-19645 - Add missing translation of label on Opt Out button
scardinius [Mon, 14 Nov 2016 12:59:50 +0000 (13:59 +0100)]
CRM-19645 - Add missing translation of label on Opt Out button

7 years agoMerge pull request #9383 from jitendrapurohit/testfix
Monish Deb [Mon, 14 Nov 2016 11:21:54 +0000 (16:51 +0530)]
Merge pull request #9383 from jitendrapurohit/testfix

Fix membership join_date test

7 years agoFix membership join_date test
jitendrapurohit [Mon, 14 Nov 2016 10:50:28 +0000 (16:20 +0530)]
Fix membership join_date test

7 years agoMerge pull request #9382 from monishdeb/CRM-16558
Monish Deb [Mon, 14 Nov 2016 10:11:26 +0000 (15:41 +0530)]
Merge pull request #9382 from monishdeb/CRM-16558

CRM-16558: Remove Update Subscription URL link from recurring contribution emails when not available

7 years agomove to 4.7.14 message_template folder
deb.monish [Mon, 14 Nov 2016 08:43:28 +0000 (14:13 +0530)]
move to 4.7.14 message_template folder

7 years agoMove upgrades to 4.7.13 as requested
Andrew Cormick-Dockery [Thu, 6 Oct 2016 23:05:22 +0000 (23:05 +0000)]
Move upgrades to 4.7.13 as requested

7 years agoEnsure changes to message templates are reflected in database upgrade
Andrew Cormick-Dockery [Wed, 31 Aug 2016 08:04:46 +0000 (08:04 +0000)]
Ensure changes to message templates are reflected in database upgrade

7 years agoCRM-16558 - Remove Update Subscription URL link from recurring contribution emails...
Andrew Cormick-Dockery [Wed, 31 Aug 2016 02:47:23 +0000 (02:47 +0000)]
CRM-16558 - Remove Update Subscription URL link from recurring contribution emails when not available

7 years agoSet a value for iDisplayLength
Karin Gerritsen [Mon, 14 Nov 2016 03:21:41 +0000 (20:21 -0700)]
Set a value for iDisplayLength

The default (if none is set) turns out to be 10. Eileen said (and I quote): "if you wanted to propose an increase in core to 25 that would be an easy sell I think" :-)

7 years agoMerge pull request #9379 from colemanw/CRM-17335
colemanw [Sun, 13 Nov 2016 15:26:26 +0000 (10:26 -0500)]
Merge pull request #9379 from colemanw/CRM-17335

CRM-17335 - Remove unnecessary use of CRM_Core_DAO::$_nullObject

7 years agoCRM-17335 - Remove more uses of CRM_Core_DAO::$_nullObject
Coleman Watts [Fri, 11 Nov 2016 22:21:09 +0000 (17:21 -0500)]
CRM-17335 - Remove more uses of CRM_Core_DAO::$_nullObject

7 years agoMerge pull request #9373 from JMAConsulting/reports-bugs
Eileen McNaughton [Sun, 13 Nov 2016 07:18:33 +0000 (20:18 +1300)]
Merge pull request #9373 from JMAConsulting/reports-bugs

CRM-19635, fixed notice error

7 years agoMerge pull request #9377 from colemanw/CRM-19640
colemanw [Sat, 12 Nov 2016 21:13:00 +0000 (16:13 -0500)]
Merge pull request #9377 from colemanw/CRM-19640

CRM-19640 - Add pre/post hooks to CustomField ops

7 years agoCRM-17335 - Remove unnecessary use of CRM_Core_DAO::$_nullObject
Coleman Watts [Fri, 11 Nov 2016 21:47:44 +0000 (16:47 -0500)]
CRM-17335 - Remove unnecessary use of CRM_Core_DAO::$_nullObject

7 years agoMerge pull request #9376 from davejenx/CRM-19431
colemanw [Fri, 11 Nov 2016 21:32:50 +0000 (16:32 -0500)]
Merge pull request #9376 from davejenx/CRM-19431

CRM-19431: avoid pollution (in EntityTag) and use (in ContactType) of…

7 years agoCRM-19640 - Add pre/post hooks to CustomField ops
Coleman Watts [Fri, 11 Nov 2016 21:28:26 +0000 (16:28 -0500)]
CRM-19640 - Add pre/post hooks to CustomField ops

7 years agoCRM-19431: avoid pollution (in EntityTag) and use (in ContactType) of CRM_Core_DAO::.
Dave Jenkins [Fri, 11 Nov 2016 18:01:05 +0000 (18:01 +0000)]
CRM-19431: avoid pollution (in EntityTag) and use (in ContactType) of CRM_Core_DAO::.

7 years agoMerge pull request #8633 from totten/master-fts-empty-to
Yashodha Chaku [Fri, 11 Nov 2016 12:52:38 +0000 (18:22 +0530)]
Merge pull request #8633 from totten/master-fts-empty-to

CRM-19048 - CRM_Utils_QueryFormatter - Multiple fixes for InnoDB FTS

7 years agoMerge pull request #9354 from sharique/CRM-19606
Monish Deb [Fri, 11 Nov 2016 11:24:45 +0000 (16:54 +0530)]
Merge pull request #9354 from sharique/CRM-19606

(NFC) CRM-19606 : provide help text for providing mysql port info

7 years agoCRM-19635, fixed notice error
Pradeep Nayak [Fri, 11 Nov 2016 11:10:10 +0000 (16:40 +0530)]
CRM-19635, fixed notice error

----------------------------------------
* CRM-19635: Notice errors on Contribution Aggregate by Relationship report
  https://issues.civicrm.org/jira/browse/CRM-19635

7 years agoMerge pull request #9358 from jitendrapurohit/CRM-18503
Yashodha Chaku [Fri, 11 Nov 2016 07:58:47 +0000 (13:28 +0530)]
Merge pull request #9358 from jitendrapurohit/CRM-18503

CRM-18503 - Membership join_date is incorrectly set by CiviContribute…

7 years agoCRM-18139 CiviEvent: batch status change message clarification
Andrew Hunt [Thu, 10 Nov 2016 22:57:02 +0000 (17:57 -0500)]
CRM-18139 CiviEvent: batch status change message clarification

7 years agoCRM-19606 : code review changes, fixing typo
Sharique A. Farooqui [Thu, 10 Nov 2016 19:01:08 +0000 (00:31 +0530)]
CRM-19606 : code review changes, fixing typo

----------------------------------------
* CRM-19606: Provide help text in installer to provide mysql port, if mysql is running on different port
  https://issues.civicrm.org/jira/browse/CRM-19606

7 years agoMerge pull request #9361 from tschuettler/CRM-19617
Yashodha Chaku [Thu, 10 Nov 2016 12:07:29 +0000 (17:37 +0530)]
Merge pull request #9361 from tschuettler/CRM-19617

CRM-19617 - Fix undefined index notice in CRM_Contact_Form_Contact::checkDuplicateContacts()

7 years agoMerge pull request #9366 from JMAConsulting/reports-bugs
Yashodha Chaku [Thu, 10 Nov 2016 06:33:29 +0000 (12:03 +0530)]
Merge pull request #9366 from JMAConsulting/reports-bugs

CRM-19623, code cleanup for report filters and fields, fixed report f…

7 years agoCRM-19623, added test
Pradeep Nayak [Wed, 9 Nov 2016 19:01:34 +0000 (00:31 +0530)]
CRM-19623, added test

----------------------------------------
* CRM-19623: is not of the type Int when report is filtered with postal code
  https://issues.civicrm.org/jira/browse/CRM-19623

7 years agoCRM-17879 PDF formats in Message Templates not loading
Mathieu Lutfy [Wed, 9 Nov 2016 16:19:35 +0000 (11:19 -0500)]
CRM-17879 PDF formats in Message Templates not loading

7 years agoCRM-19617 - Fix undefined index notice in CRM_Contact_Form_Contact::checkDuplicateCon...
Thomas Schüttler [Wed, 9 Nov 2016 16:03:01 +0000 (17:03 +0100)]
CRM-19617 - Fix undefined index notice in CRM_Contact_Form_Contact::checkDuplicateContacts()

7 years agoCRM-19623, code cleanup for report filters and fields, fixed report filter type
Pradeep Nayak [Wed, 9 Nov 2016 09:45:41 +0000 (15:15 +0530)]
CRM-19623, code cleanup for report filters and fields, fixed report filter type

----------------------------------------
* CRM-19623: is not of the type Int when report is filtered with postal code
  https://issues.civicrm.org/jira/browse/CRM-19623

7 years agoMerge pull request #9363 from colemanw/CRM-19560
Monish Deb [Wed, 9 Nov 2016 07:23:22 +0000 (12:53 +0530)]
Merge pull request #9363 from colemanw/CRM-19560

CRM-19560 - Better labels for export participant fields

7 years agoMerge pull request #9347 from monishdeb/CRM-19589
Monish Deb [Wed, 9 Nov 2016 05:41:48 +0000 (11:11 +0530)]
Merge pull request #9347 from monishdeb/CRM-19589

CRM-19589: Search for contacts in Smart Groups based on group status shows incorrect results

7 years agoMerge pull request #9348 from colemanw/CRM-19593
colemanw [Wed, 9 Nov 2016 00:18:43 +0000 (19:18 -0500)]
Merge pull request #9348 from colemanw/CRM-19593

CRM-19593 - Hide edit/delete buttons for non-editable custom groups

7 years agodealing with bootstrap styles being applied to labels on the backend in joomla
Alice Frumin [Tue, 8 Nov 2016 23:43:48 +0000 (18:43 -0500)]
dealing with bootstrap styles being applied to labels on the backend in joomla

7 years agoCRM-19560 - Better labels for export participant fields
Coleman Watts [Tue, 8 Nov 2016 21:41:23 +0000 (16:41 -0500)]
CRM-19560 - Better labels for export participant fields

7 years agoCRM-19593 - Hide edit/delete buttons for non-editable custom groups
Coleman Watts [Wed, 2 Nov 2016 19:32:47 +0000 (15:32 -0400)]
CRM-19593 - Hide edit/delete buttons for non-editable custom groups

7 years agoMerge pull request #9360 from jitendrapurohit/helptextfix
colemanw [Tue, 8 Nov 2016 15:34:54 +0000 (10:34 -0500)]
Merge pull request #9360 from jitendrapurohit/helptextfix

CRM-19352: Fix pre-post help text on custom data

7 years agoMerge pull request #9359 from seamuslee001/CRM-19616
colemanw [Tue, 8 Nov 2016 15:07:08 +0000 (10:07 -0500)]
Merge pull request #9359 from seamuslee001/CRM-19616

CRM-19616 Fix urls for Manage Tag and New Tag wrongly set in 4.7.13

7 years agoCRM-19352: Fix pre-post help text on custom data
jitendrapurohit [Tue, 8 Nov 2016 09:54:03 +0000 (15:24 +0530)]
CRM-19352: Fix pre-post help text on custom data

7 years agominor fixes
jitendrapurohit [Tue, 8 Nov 2016 08:39:16 +0000 (14:09 +0530)]
minor fixes

7 years agoCRM-19616 Fix urls for Manage Tag and New Tag wrongly set in 4.7.13
Seamus Lee [Tue, 8 Nov 2016 06:27:14 +0000 (17:27 +1100)]
CRM-19616 Fix urls for Manage Tag and New Tag wrongly set in 4.7.13

7 years agoMerge pull request #9352 from monishdeb/CRM-19571
Yashodha Chaku [Mon, 7 Nov 2016 06:48:52 +0000 (12:18 +0530)]
Merge pull request #9352 from monishdeb/CRM-19571

CRM-19571: Smart Groups don't save Relation Contact settings

7 years agoMerge pull request #9355 from KarinG/patch-4
Eileen McNaughton [Sun, 6 Nov 2016 21:09:34 +0000 (10:09 +1300)]
Merge pull request #9355 from KarinG/patch-4

Update DataSource.php

7 years agoUpdate DataSource.php
Karin Gerritsen [Sun, 6 Nov 2016 16:26:33 +0000 (09:26 -0700)]
Update DataSource.php

https://issues.civicrm.org/jira/browse/CRM-19607

7 years agoMerge pull request #9350 from monishdeb/CRM-19590
Eileen McNaughton [Sun, 6 Nov 2016 07:03:45 +0000 (20:03 +1300)]
Merge pull request #9350 from monishdeb/CRM-19590

CRM-19590: Failed CC Contributions Listed with Status of Pending (Incomplete Transaction) Instead of Failed

7 years agoCRM-19606 : provide help text for providing mysql port info
Sharique A. Farooqui [Sat, 5 Nov 2016 11:31:18 +0000 (17:01 +0530)]
CRM-19606 : provide help text for providing mysql port info

----------------------------------------
* CRM-19606: Provide help text in installer to provide mysql port, if mysql is running on different port
  https://issues.civicrm.org/jira/browse/CRM-19606

7 years agoMerge pull request #9351 from vedantrathore/comment-fixes
Tim Otten [Fri, 4 Nov 2016 17:03:52 +0000 (10:03 -0700)]
Merge pull request #9351 from vedantrathore/comment-fixes

Comment Fixes for CRM/Profile directory

7 years agoCRM-19571: Smart Groups don't save Relation Contact settings
deb.monish [Fri, 4 Nov 2016 12:01:06 +0000 (17:31 +0530)]
CRM-19571: Smart Groups don't save Relation Contact settings

7 years agoComment Fixes for Profile
Vedant Rathore [Fri, 4 Nov 2016 00:49:54 +0000 (06:19 +0530)]
Comment Fixes for Profile

7 years agostyle fix
deb.monish [Thu, 3 Nov 2016 12:02:49 +0000 (17:32 +0530)]
style fix

7 years agoCRM-19590: Failed CC Contributions Listed with Status of Pending (Incomplete Transact...
deb.monish [Thu, 3 Nov 2016 11:57:32 +0000 (17:27 +0530)]
CRM-19590: Failed CC Contributions Listed with Status of Pending (Incomplete Transaction) Instead of Failed

7 years agoMerge pull request #9315 from jitendrapurohit/CRM-19642
Yashodha Chaku [Thu, 3 Nov 2016 09:16:19 +0000 (14:46 +0530)]
Merge pull request #9315 from jitendrapurohit/CRM-19642

CRM-19462 - membership autorenew error when included via price set

7 years agoMerge pull request #9299 from alifrumin/surveydetailsstreetaddress
Yashodha Chaku [Thu, 3 Nov 2016 09:14:22 +0000 (14:44 +0530)]
Merge pull request #9299 from alifrumin/surveydetailsstreetaddress

CRM-19595 : Adding street address to the survey details report

7 years agoMerge pull request #9342 from JMAConsulting/CRM-19587
Yashodha Chaku [Thu, 3 Nov 2016 08:57:11 +0000 (14:27 +0530)]
Merge pull request #9342 from JMAConsulting/CRM-19587

CRM-19587, donot delete financial account if its present in civicrm_f…

7 years agoMerge pull request #9346 from JMAConsulting/CRM-19587-1
Yashodha Chaku [Thu, 3 Nov 2016 08:45:16 +0000 (14:15 +0530)]
Merge pull request #9346 from JMAConsulting/CRM-19587-1

CRM-19587, changed variable name and error message

7 years agoMerge pull request #9337 from eileenmcnaughton/line_item
Yashodha Chaku [Wed, 2 Nov 2016 14:57:20 +0000 (20:27 +0530)]
Merge pull request #9337 from eileenmcnaughton/line_item

CRM-19583 show financial type of line items whenbackoffice users view…