eileenmcnaughton [Wed, 16 Dec 2015 18:26:47 +0000 (18:26 +0000)]
CRM-17718 add Financial type to recur form
This has only been added for those with sites with no ACLs as the financial acl code is quite new & raised questions when I looked.
Further the option is only editable if there is a single line item. Multiple line item recurrings cannot be overridden from here
Contribution Recur Edit should not require installments
Leaving installments empty is valid - ie. it could be null for unlimited
(there is an implication that it should be '0' rather than null but null 'works' & is set in some cases
and we permit the DB field to be null - which we should not do if null is not OK)
eileenmcnaughton [Wed, 16 Dec 2015 18:07:32 +0000 (18:07 +0000)]
CRM-17118 use shared function to add campaign field
This function does some checks to make sure there are enabled campaigns
eileenmcnaughton [Wed, 16 Dec 2015 17:55:31 +0000 (17:55 +0000)]
CRM-17718 give precedence to financial type on recur record.
The financial type on the recurring contribution record can be updated over time and it should be preferred over that of the original contribution id
unless there is more than one line item (in which case updates are invalid). A passed in financial type should be preferred over both - with the same proviso as before
eileenmcnaughton [Wed, 16 Dec 2015 17:04:19 +0000 (17:04 +0000)]
CRM-17718 update repeattransaction to permit the financial_type_id to be passed in
eileenmcnaughton [Wed, 16 Dec 2015 16:25:37 +0000 (16:25 +0000)]
CRM-17718 update repeattransaction to accept contribution_recur_id instead of original_contribution_id
wq
I feel like passing in the contribution_recur_id actually makes more sense - the internals of which contribution is repeated should be 'core business' & consistent across processors.
Importantly it has been set here to repeat the latest rather than the earliest which is not as good as saving such things as line items against the recurring transaction but
better than using the earliest - ie. pick up changes over time
eileenmcnaughton [Wed, 16 Dec 2015 16:14:23 +0000 (16:14 +0000)]
CRM-17718 allow campaign id to be updated from contribution recur form
eileenmcnaughton [Wed, 16 Dec 2015 16:00:34 +0000 (16:00 +0000)]
CRM-17718 update repeattransaction api action to give precedence to contribution_recur for campaign id
Yashodha Chaku [Wed, 23 Dec 2015 13:28:13 +0000 (18:58 +0530)]
Merge pull request #7490 from yashodha/CRM-17398
CRM-17398: Enotice on participant delete
CiviCRM [Wed, 23 Dec 2015 11:43:26 +0000 (03:43 -0800)]
Update version to 4.7.beta5
Yashodha Chaku [Wed, 23 Dec 2015 10:36:35 +0000 (16:06 +0530)]
Merge pull request #7493 from jitendrapurohit/upgradeerror
Avoid insertion of warnings in gencode while creating distmaker
jitendrapurohit [Wed, 23 Dec 2015 09:26:16 +0000 (14:56 +0530)]
Avoid insertion of warnings in gencode while making distmaker
yashodha [Wed, 23 Dec 2015 05:21:03 +0000 (10:51 +0530)]
fix trailing comma
Eileen McNaughton [Wed, 23 Dec 2015 04:28:43 +0000 (17:28 +1300)]
Merge pull request #7467 from eileenmcnaughton/tests
Enhance membership form test
yashodha [Wed, 23 Dec 2015 04:24:17 +0000 (09:54 +0530)]
format fixes
yashodha [Wed, 23 Dec 2015 03:54:13 +0000 (09:24 +0530)]
CRM-17398: Enotice on participant delete
----------------------------------------
* CRM-17398: Enotice on participant delete
https://issues.civicrm.org/jira/browse/CRM-17398
Dave Greenberg [Tue, 22 Dec 2015 18:16:36 +0000 (10:16 -0800)]
Merge pull request #7473 from JMAConsulting/CRM-16259-2
--CRM-16259, added function to record partial payment
yashodha [Tue, 22 Dec 2015 07:14:16 +0000 (12:44 +0530)]
CRM-17398: Enotice on participant delete
----------------------------------------
* CRM-17398: Enotice on participant delete
https://issues.civicrm.org/jira/browse/CRM-17398
Tim Otten [Tue, 22 Dec 2015 02:43:39 +0000 (18:43 -0800)]
Merge pull request #7383 from thehereward/tidy-up-remove-unnecessary-imports
TidyUp: Remove unnecessary imports.
Dave Greenberg [Tue, 22 Dec 2015 01:48:33 +0000 (17:48 -0800)]
Merge pull request #7427 from eileenmcnaughton/CRM-17275-import
CRM-17275 fix import class to do a fallback external identifier check
Tim Otten [Tue, 22 Dec 2015 01:21:14 +0000 (17:21 -0800)]
Merge pull request #7489 from totten/master-cxn-check
CRM-16173 - Display alert for local/private sites.
Tim Otten [Tue, 22 Dec 2015 01:20:22 +0000 (17:20 -0800)]
Merge pull request #7488 from totten/master-upgrade-misc
Upgrades/Settings - Fix problems upgrading from older releases
CiviCRM [Mon, 21 Dec 2015 03:05:27 +0000 (19:05 -0800)]
CRM-16173 - Display alert for local/private sites.
CiviCRM [Mon, 21 Dec 2015 23:25:44 +0000 (15:25 -0800)]
SettingsBag - Fix bug upgrading `4.1.0-setupsh.sql.bz2` to 4.7.beta.
CiviCRM [Mon, 21 Dec 2015 23:10:16 +0000 (15:10 -0800)]
CRM_Core_Config::customCSSURL - Don't tample empty values
Ex: The 4.4 upgrader checks `customCSSURL` and sets `disable_core_css`
depending on whether the value is empty. Since the addTrailingSlash was
converting empty to '/', this caused bad upgrades.
Tim Otten [Mon, 21 Dec 2015 23:27:06 +0000 (15:27 -0800)]
Merge pull request #7471 from jitendrapurohit/CRM-17714
CRM-17714 - DB Error after upgradation to 4.7 beta3
Dave Greenberg [Mon, 21 Dec 2015 22:56:56 +0000 (14:56 -0800)]
Merge pull request #7465 from eileenmcnaughton/CRM-17228-payment-processor-form
CRM-17728 enotices on payment processor form
jitendrapurohit [Mon, 21 Dec 2015 05:55:22 +0000 (11:25 +0530)]
additional fixes
Dave Greenberg [Mon, 21 Dec 2015 03:33:42 +0000 (19:33 -0800)]
Merge pull request #7452 from seamuslee001/sl_export_tidy
Some extra tidy up ExportComponents function.
Dave Greenberg [Mon, 21 Dec 2015 03:20:59 +0000 (19:20 -0800)]
Merge pull request #7475 from JMAConsulting/CRM-16259-1
Crm 16259 1
Eileen McNaughton [Mon, 21 Dec 2015 02:45:17 +0000 (15:45 +1300)]
Merge pull request #7396 from eileenmcnaughton/CRM-17627
CRM-17627 minor code simplifications …
Dave Greenberg [Mon, 21 Dec 2015 02:39:46 +0000 (18:39 -0800)]
Merge pull request #7485 from davecivicrm/CRM-15967
CRM-15967 - Fix profile state/province sort.
Dave Greenberg [Mon, 21 Dec 2015 02:36:34 +0000 (18:36 -0800)]
CRM-15967 - Fix profile state/province sort.
----------------------------------------
* CRM-15967: profile: cannot sort state/province
https://issues.civicrm.org/jira/browse/CRM-15967
Tim Otten [Sun, 20 Dec 2015 21:56:49 +0000 (13:56 -0800)]
Merge pull request #7478 from xurizaemon/master
CRM-17733. Update to DOMPDF 0.6.2
Tim Otten [Sun, 20 Dec 2015 21:44:28 +0000 (13:44 -0800)]
Merge pull request #7482 from totten/master-pumpernickle
CRM-16173 - crmCxn - When reconnecting, display the *new* details/permissions.
Tim Otten [Sun, 20 Dec 2015 21:42:09 +0000 (13:42 -0800)]
Merge pull request #7418 from totten/master-nav-dupes
FourSeven Upgrade - Protect against duplicate "navigation" settings
CiviCRM [Sat, 19 Dec 2015 04:08:46 +0000 (20:08 -0800)]
CRM-16173 - crmCxn - When reconnecting, display the *new* details/permissions.
Dave Greenberg [Sat, 19 Dec 2015 01:18:12 +0000 (17:18 -0800)]
Merge pull request #7469 from lcdservices/CRM-17427
CRM-17427 condition receipt sent status msg properly
Dave Greenberg [Sat, 19 Dec 2015 01:04:45 +0000 (17:04 -0800)]
Merge pull request #7480 from davecivicrm/CRM-17716
CRM-17716 - new copy of generated (sample) data.
Dave Greenberg [Sat, 19 Dec 2015 01:03:27 +0000 (17:03 -0800)]
CRM-17716 - new copy of generated (sample) data.
----------------------------------------
* CRM-17716: civicrm_financial_trxn table missing some entries for sample data
https://issues.civicrm.org/jira/browse/CRM-17716
Dave Greenberg [Sat, 19 Dec 2015 01:02:40 +0000 (17:02 -0800)]
Merge pull request #7461 from pradpnayak/CRM-17716
--CRM-17716, fixed code to add missing accounting entries for Members…
Dave Greenberg [Sat, 19 Dec 2015 00:44:20 +0000 (16:44 -0800)]
Merge pull request #7463 from Kajakaran/twitter_link
CRM-17725 - Fix for Twitter link broken contributio email receipt
Seamus Lee [Thu, 17 Dec 2015 19:51:35 +0000 (19:51 +0000)]
Jenkins fix
Seamus Lee [Wed, 16 Dec 2015 07:26:19 +0000 (07:26 +0000)]
Fix issues found by Dave in testing
Seamus Lee [Tue, 15 Dec 2015 20:49:31 +0000 (20:49 +0000)]
Minor fixes
Seamus Lee [Tue, 15 Dec 2015 09:58:09 +0000 (09:58 +0000)]
Further split out sections of exportComponents
Dave Greenberg [Fri, 18 Dec 2015 20:23:00 +0000 (12:23 -0800)]
Merge pull request #7468 from eileenmcnaughton/CRM-17729
CRM-172729 fix default for cancelling a contribution
Dave Greenberg [Fri, 18 Dec 2015 20:03:06 +0000 (12:03 -0800)]
Merge pull request #7472 from rohankatkar/test4.7
Tests fix
Chris Burgess [Fri, 18 Dec 2015 19:05:10 +0000 (08:05 +1300)]
CRM-17733. Update to DOMPDF 0.6.2
Pradeep Nayak [Fri, 18 Dec 2015 14:03:56 +0000 (19:33 +0530)]
-CRM-16259, removed white spaces
Web Access [Fri, 18 Dec 2015 13:22:46 +0000 (18:52 +0530)]
Tests fix
jitendrapurohit [Fri, 18 Dec 2015 06:36:38 +0000 (12:06 +0530)]
CRM-17714 - DB Error after upgradation to 4.7 beta3
Brian Shaughnessy [Fri, 18 Dec 2015 03:10:19 +0000 (22:10 -0500)]
CRM-17427 fix constant casing
Brian Shaughnessy [Fri, 18 Dec 2015 02:59:19 +0000 (21:59 -0500)]
CRM-17427 condition receipt sent status msg properly
colemanw [Fri, 18 Dec 2015 02:40:20 +0000 (21:40 -0500)]
Merge pull request #7443 from eileenmcnaughton/CRM-17700
CRM-17700 allow contribution get to bypass permissions
eileenmcnaugton [Fri, 18 Dec 2015 02:24:41 +0000 (15:24 +1300)]
CRM-17229 fix default for cancelling a contribution
eileenmcnaugton [Fri, 18 Dec 2015 02:20:42 +0000 (15:20 +1300)]
Enhance membership form test
Eileen McNaughton [Fri, 18 Dec 2015 01:35:38 +0000 (14:35 +1300)]
Merge pull request #7466 from eileenmcnaughton/test-fix
Test fix : adjust expected message from when a.net is unresponsive
eileenmcnaugton [Fri, 18 Dec 2015 00:02:32 +0000 (13:02 +1300)]
Test fix : adjust expected message from when a.net is unresponsive
eileenmcnaugton [Thu, 17 Dec 2015 23:59:54 +0000 (12:59 +1300)]
CRM-17728 enotices on payment processor form
Dave Greenberg [Thu, 17 Dec 2015 22:59:44 +0000 (14:59 -0800)]
Merge pull request #7449 from johanv/CRM-14920-sort_order_labels_custom_search_2nd_try
Crm 14920 sort order labels custom search 2nd try
Kurund Jalmi [Thu, 17 Dec 2015 18:08:41 +0000 (23:38 +0530)]
Merge pull request #7462 from rohankatkar/testfix4.7
tests fixes
Kajan [Thu, 17 Dec 2015 15:04:08 +0000 (15:04 +0000)]
Fix for Twitter link broken contribution id in URL
Web Access [Thu, 17 Dec 2015 14:48:05 +0000 (20:18 +0530)]
tests fixes
Johan Vervloet [Thu, 17 Dec 2015 14:41:57 +0000 (15:41 +0100)]
Revert "CRM-14920 - labels from custom search: honor sort order."
This reverts commit
211c4cb1de75da6ea3cf9407505d0234827e969e.
Johan Vervloet [Thu, 17 Dec 2015 14:40:10 +0000 (15:40 +0100)]
CRM-14920 One more fix for ZipCodeRange custom search.
----------------------------------------
* CRM-14920: Custom Searches do not honor user sort order
https://issues.civicrm.org/jira/browse/CRM-14920
Yashodha Chaku [Thu, 17 Dec 2015 11:19:43 +0000 (16:49 +0530)]
Merge pull request #7460 from yashodha/CRM-17703
CRM-17703: Enotices on export when relationship type using 'any conta…
colemanw [Thu, 17 Dec 2015 11:19:06 +0000 (06:19 -0500)]
Merge pull request #7459 from totten/master-backdrop
CRM-17711 - Basic support for Backdrop CMS
Pradeep Nayak [Thu, 17 Dec 2015 11:05:52 +0000 (16:35 +0530)]
--CRM-17716, fixed code to add missing accounting entries for Membership payments
yashodha [Thu, 17 Dec 2015 09:37:25 +0000 (15:07 +0530)]
CRM-17703: Enotices on export when relationship type using 'any contact type' exists
----------------------------------------
* CRM-17703: Enotices on export when relationship type using 'any contact type' exists
https://issues.civicrm.org/jira/browse/CRM-17703
Tim Otten [Thu, 17 Dec 2015 04:48:34 +0000 (20:48 -0800)]
CRM-17711 - distmaker - Backdrop fixes
Tim Otten [Thu, 17 Dec 2015 04:39:44 +0000 (20:39 -0800)]
CRM-17711 - distmaker/backdrop - Load proper civicrm.config.php
Tim Otten [Wed, 16 Dec 2015 06:54:42 +0000 (22:54 -0800)]
CRM-17711 - Work with Backdrop `civicrm.module` in `./backdrop/` or `./drupal/`
Tim Otten [Wed, 16 Dec 2015 05:13:44 +0000 (21:13 -0800)]
GenCode - Display PHP errors
Nate Haug [Wed, 16 Dec 2015 03:17:23 +0000 (19:17 -0800)]
CRM-17711 - Updates to use Backdrop config system, fewer drupal_* functions.
----------------------------------------
* CRM-17711: Add Support for Backdrop
https://issues.civicrm.org/jira/browse/CRM-17711
Tim Otten [Wed, 16 Dec 2015 02:01:59 +0000 (18:01 -0800)]
CRM-17711 - distmaker for Backdrop
Also: Allow calling `distmaker` with less confusing arguments (`d56` vs
`Drupal6`; `j5` vs `Joomla).
Jen Lampton [Wed, 16 Dec 2015 01:39:08 +0000 (17:39 -0800)]
Add lots of Backdrop CMS suggestions to the docs in the civi settings file.
Jen Lampton [Wed, 16 Dec 2015 01:19:08 +0000 (17:19 -0800)]
Add a Backdrop CMS suggestion in the civi settings file.
Jen Lampton [Wed, 16 Dec 2015 01:03:57 +0000 (17:03 -0800)]
Add Backdrop support in CodeGen.
Tim Otten [Tue, 15 Dec 2015 23:35:53 +0000 (15:35 -0800)]
CRM-17711 - CRM_*_Backdrop - Fix enough to run setup.sh
Tim Otten [Tue, 15 Dec 2015 23:35:53 +0000 (15:35 -0800)]
CRM_*_Backdrop - Fix enough to run setup.sh
Tim Otten [Tue, 15 Dec 2015 23:18:19 +0000 (15:18 -0800)]
Copy CRM/*/Drupal.php to CRM/*/Backdrop.php
Dave Greenberg [Thu, 17 Dec 2015 01:43:44 +0000 (17:43 -0800)]
Merge pull request #7450 from davejenx/CRM-17702
CRM-17702 - Fix validation for multiple membership types when using price sets on back-end membership creation…
eileen [Thu, 17 Dec 2015 00:22:51 +0000 (13:22 +1300)]
CRM-17700 fix api to respect skipping permissions at the custom field level
Dave Greenberg [Thu, 17 Dec 2015 00:15:39 +0000 (16:15 -0800)]
Merge pull request #7454 from eileenmcnaughton/R8995
CRM_17474 standardise address field addition to other reports
eileen [Wed, 16 Dec 2015 22:41:25 +0000 (11:41 +1300)]
CRM-17700 test for custom fields with permissions
eileen [Mon, 14 Dec 2015 01:49:09 +0000 (14:49 +1300)]
CRM-17700 allow contribution get to bypass permissions
Note this just extends the existing 'check_permissions' to apply to custom data as well. Using
check permission defaults to 0 for php api & 1 for json (can not be overriden in json)
colemanw [Wed, 16 Dec 2015 19:57:33 +0000 (14:57 -0500)]
Merge pull request #7456 from davejenx/CRM-17717
CRM-17717 - send correct MIME type for .jpg files
Dave Jenkins [Wed, 16 Dec 2015 16:54:16 +0000 (16:54 +0000)]
CRM-17717 - apply strtolower to file extension.
Johan Vervloet [Wed, 16 Dec 2015 15:37:01 +0000 (16:37 +0100)]
CRM-16587 - revert of some changes of 379902.
I reverted some changes that are not needed, so that it is easier
to see what exactly changed in the pull request.
----------------------------------------
* CRM-16587: Action menu is not available on selected records on a Custom search
https://issues.civicrm.org/jira/browse/CRM-16587
Johan Vervloet [Wed, 16 Dec 2015 15:27:00 +0000 (16:27 +0100)]
CRM-14920 - Fixed issues when results are sorted on contact ID.
----------------------------------------
* CRM-14920: Custom Searches do not honor user sort order
https://issues.civicrm.org/jira/browse/CRM-14920
Dave Jenkins [Wed, 16 Dec 2015 14:49:19 +0000 (14:49 +0000)]
CRM-17717 - send correct MIME type for .jpg files
Pradeep Nayak [Wed, 16 Dec 2015 13:50:40 +0000 (19:20 +0530)]
--CRM-16259, added function to record partial payment
Pradeep Nayak [Wed, 16 Dec 2015 13:13:08 +0000 (18:43 +0530)]
--CRM-16259, added upgrade code to set is_payment flag
Pradeep Nayak [Wed, 16 Dec 2015 13:12:27 +0000 (18:42 +0530)]
CRM-16259, set is_payment=1 for sample data
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 16 Dec 2015 12:34:36 +0000 (18:04 +0530)]
CRM-16259, added test for pay later for checking is_payment flag
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 16 Dec 2015 12:13:48 +0000 (17:43 +0530)]
--CRM-16259, added test to check is_payment flag is set or not
Pradeep Nayak [Wed, 16 Dec 2015 11:36:58 +0000 (17:06 +0530)]
--CRM-16259, set is_payment flag for non pending statuses payments
CiviCRM [Wed, 16 Dec 2015 10:11:13 +0000 (02:11 -0800)]
Update version to 4.7.beta4
Monish Deb [Wed, 16 Dec 2015 05:57:16 +0000 (11:27 +0530)]
Merge pull request #7455 from yashodha/minor-fix
get rid of auto-incremented column id
yashodha [Wed, 16 Dec 2015 05:53:38 +0000 (11:23 +0530)]
get rid of auto-incremented column id