Merge pull request #19093 from civicrm/5.32

5.32

diff --git a/CRM/Financial/Form/PaymentEdit.php b/CRM/Financial/Form/PaymentEdit.php
index b40f1325a344db138a3caf4fe3818a8d901f422a..ff85efa7351cebaa2e2bd98d26127218ffb5fee7 100644 (file)
--- a/CRM/Financial/Form/PaymentEdit.php
+++ b/CRM/Financial/Form/PaymentEdit.php
@@ -67,11 +67,7 @@ class CRM_Financial_Form_PaymentEdit extends CRM_Core_Form {
    */
   public function setDefaultValues() {
     $defaults = $this->_values;
-    // Format money fields - localize for display
-    $moneyFields = ['total_amount', 'fee_amount', 'net_amount'];
-    foreach ($moneyFields as $field) {
-      $defaults[$field] = CRM_Utils_Money::formatLocaleNumericRoundedForDefaultCurrency($this->_values[$field]);
-    }
+    $defaults['total_amount'] = CRM_Utils_Money::formatLocaleNumericRoundedForDefaultCurrency($this->_values['total_amount']);
     return $defaults;
   }
 
@@ -195,7 +191,7 @@ class CRM_Financial_Form_PaymentEdit extends CRM_Core_Form {
       $previousFinanciaTrxn['contribution_id'] = $newFinancialTrxn['contribution_id'] = $this->_contributionID;
 
       $newFinancialTrxn['to_financial_account_id'] = CRM_Financial_BAO_FinancialTypeAccount::getInstrumentFinancialAccount($submittedValues['payment_instrument_id']);
-      foreach (['total_amount', 'fee_amount', 'net_amount', 'currency', 'is_payment', 'status_id'] as $fieldName) {
+      foreach (['total_amount', 'currency', 'is_payment', 'status_id'] as $fieldName) {
         $newFinancialTrxn[$fieldName] = $this->_values[$fieldName];
       }
 

diff --git a/ang/crmMailing/EditRecipOptionsDialogCtrl.html b/ang/crmMailing/EditRecipOptionsDialogCtrl.html
index 56faec438aa814e61bf00876a5069c1170702cd7..1f6a7d3fe7285c530fd51ae2ea8cd93edb8f871c 100644 (file)
--- a/ang/crmMailing/EditRecipOptionsDialogCtrl.html
+++ b/ang/crmMailing/EditRecipOptionsDialogCtrl.html
@@ -20,7 +20,7 @@
           >
           <option value="">{{:: ts('Automatic') }}</option>
           <option ng-repeat="locType in model.fields.location_type_id.options"
-                  ng-value="locType.key">{{locType.value}}</option>
+                  value="{{ locType.key }}">{{locType.value}}</option>
         </select>
       </div>
 
@@ -32,7 +32,7 @@
           ng-model="model.mailing.email_selection_method"
           >
           <option ng-repeat="selMet in model.fields.email_selection_method.options"
-                  ng-value="selMet.key">{{selMet.value}}</option>
+                  value="{{ selMet.key }}">{{selMet.value}}</option>
         </select>
       </div>
 

diff --git a/ang/crmMailingAB/BlockMailing.html b/ang/crmMailingAB/BlockMailing.html
index 0b0063fc1f73ddc4b91ffc9c530d21e42be514f4..522edfd7c43aff3b25ffc0e4935b656109c5b852 100644 (file)
--- a/ang/crmMailingAB/BlockMailing.html
+++ b/ang/crmMailingAB/BlockMailing.html
@@ -26,7 +26,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
             ng-change="loadTemplate(abtest.mailings.a, abtest.mailings.a.msg_template_id)"
             >
             <option value=""></option>
-            <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
+            <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" value="{{ frm.id }}">{{frm.msg_title}}</option>
           </select>
           <a crm-icon="fa-floppy-o" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{:: ts('Save As') }}"></a>
         </div>
@@ -42,7 +42,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
             ng-change="loadTemplate(abtest.mailings.a, abtest.mailings.a.msg_template_id)"
             >
             <option value=""></option>
-            <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
+            <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" value="{{ frm.id }}">{{frm.msg_title}}</option>
           </select>
           <a crm-icon="fa-floppy-o" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{:: ts('Save As') }}"></a>
         </div>
@@ -58,7 +58,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
             ng-change="loadTemplate(abtest.mailings.b, abtest.mailings.b.msg_template_id)"
             >
             <option value=""></option>
-            <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
+            <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" value="{{ frm.id }}">{{frm.msg_title}}</option>
           </select>
           <a crm-icon="fa-floppy-o" ng-click="saveTemplate(abtest.mailings.b)" class="crm-hover-button" title="{{:: ts('Save As') }}"></a>
         </div>

diff --git a/ang/crmMailingAB/ListCtrl.html b/ang/crmMailingAB/ListCtrl.html
index 0d5c1499e8b0c5a87a2f14795a0f7bbbd6cb3956..9e102810c2de85b38b8f870c5f6f811cada5488b 100644 (file)
--- a/ang/crmMailingAB/ListCtrl.html
+++ b/ang/crmMailingAB/ListCtrl.html
@@ -13,13 +13,13 @@ Required vars: mailingABList
     <span>
       <select crm-ui-select style="width: 10em;" ng-model="filter.status">
         <option value="">{{:: ts('- Status -') }}</option>
-        <option ng-repeat="o in fields.status.options" ng-value="o.key">{{o.value}}</option>
+        <option ng-repeat="o in fields.status.options" value="{{o.key}}">{{o.value}}</option>
       </select>
     </span>
     <span>
       <select crm-ui-select style="width: 20em;" ng-model="filter.testing_criteria">
         <option value="">{{:: ts('- Test Type -') }}</option>
-        <option ng-repeat="o in fields.testing_criteria.options" ng-value="o.key">{{o.value}}</option>
+        <option ng-repeat="o in fields.testing_criteria.options" value="{{o.key}}">{{o.value}}</option>
       </select>
     </span>
   </form>

diff --git a/release-notes/5.32.0.md b/release-notes/5.32.0.md
index c78fa24d18f9d6167c73ddbb5df05900e4198e4d..30b5aea16078515303b1d9cba0208c45566e5385 100644 (file)
--- a/release-notes/5.32.0.md
+++ b/release-notes/5.32.0.md
@@ -66,18 +66,27 @@ Released December 2, 2020
   Preliminary cleanup of code to move towards making search actions available
   from search builder.
 
-- **Lotsa new features for the Search Kit extension
+- **Search Kit: Lotsa new features
   ([18876](https://github.com/civicrm/civicrm-core/pull/18876))**
 
   Integrates Search Kit/Afform. Adds a standalone page for viewing search kit
   displays. Adds first search kit display type "table". Adds search kit display
   entity and UI. Adds CRUD form for managing saved search kit searches.
 
-- **Search ext: Add links to search admin and improve links in displays
+- **Search Kit: Add links to search admin and improve links in displays
   ([18909](https://github.com/civicrm/civicrm-core/pull/18909))**
 
   Improves links in search kit results.
 
+- **Search Kit: Bind parameters to URL
+  ([#18976](https://github.com/civicrm/civicrm-core/pull/18976))**
+
+- **Search Kit: Add "List" display. Fix other bugs.
+  ([#18999](https://github.com/civicrm/civicrm-core/pull/18999))**
+
+- **Search Kit: Improve options in "List" search display
+  ([19031](https://github.com/civicrm/civicrm-core/pull/19031/files))**
+
 - **SavedSearch - Add name and label columns
   ([18809](https://github.com/civicrm/civicrm-core/pull/18809))**
 
@@ -144,12 +153,15 @@ Released December 2, 2020
 
 ### CiviMail
 
-- **OAuth2 administration (email focus) (Work Towards
-  [dev/core#2141](https://lab.civicrm.org/dev/core/-/issues/2141):
+- **OAuth2 Client ([dev/core#2141](https://lab.civicrm.org/dev/core/-/issues/2141):
   [18902](https://github.com/civicrm/civicrm-core/pull/18902),
   [18914](https://github.com/civicrm/civicrm-core/pull/18914),
-  [18885](https://github.com/civicrm/civicrm-core/pull/18885) and
-  [18908](https://github.com/civicrm/civicrm-core/pull/18908))**
+  [18885](https://github.com/civicrm/civicrm-core/pull/18885),
+  [18908](https://github.com/civicrm/civicrm-core/pull/18908),
+  [18943](https://github.com/civicrm/civicrm-core/pull/18943),
+  [18955](https://github.com/civicrm/civicrm-core/pull/18955),
+  [18951](https://github.com/civicrm/civicrm-core/pull/18951), and
+  [19001](https://github.com/civicrm/civicrm-core/pull/19001))**
 
   Adds a new hook `hook_civicrm_alterMailStore` which can be used to add or
   modify a driver. Adds a hidden `oauth-client` extension for connecting to
@@ -290,6 +302,10 @@ Released December 2, 2020
 - **Rationalise date formatting
   ([18805](https://github.com/civicrm/civicrm-core/pull/18805))**
 
+- **Fix filter for users who have permission "view deleted contacts"
+  ([19088](https://github.com/civicrm/civicrm-core/pull/19088))**
+
+
 ### CiviCampaign
 
 - **Fix campaign_id handling for batch entry
@@ -304,6 +320,9 @@ Released December 2, 2020
   ([dev/core#2152](https://lab.civicrm.org/dev/core/-/issues/2152):
   [18884](https://github.com/civicrm/civicrm-core/pull/18884))**
 
+- **Fix deprecation notice
+  ([dev/core#2205](https://lab.civicrm.org/dev/core/-/issues/2205): [#19018](https://github.com/civicrm/civicrm-core/pull/19018))**
+
 ### CiviContribute
 
 - **finish 'this round' of completeOrder cleanup
@@ -358,6 +377,13 @@ Released December 2, 2020
 - **PCP 'Your Message' should use WYSIWYG
   ([18411](https://github.com/civicrm/civicrm-core/pull/18411))**
 
+- **Fix fatal error on "Edit Contribution" form
+  ([19091](https://github.com/civicrm/civicrm-core/pull/19091))**
+
+- **Fix product form such that it is possible to unselec duration unit, frequency unit
+  ([dev/drupal#148](https://lab.civicrm.org/dev/drupal/-/issues/148): [19084](https://github.com/civicrm/civicrm-core/pull/19084))**
+
+
 ### CiviEvent
 
 - **.ical files not populating correctly for sites with ACL's configured for
@@ -376,6 +402,9 @@ Released December 2, 2020
 - **crmMailing - Only load Angular settings if they're needed
   ([18749](https://github.com/civicrm/civicrm-core/pull/18749))**
 
+- **Error when changing "Location Type"
+  ([dev/core#2228](https://lab.civicrm.org/dev/core/-/issues/2228): [19092](https://github.com/civicrm/civicrm-core/pull/19092))**
+
 ### CiviSMS
 
 - **Error in the selected phone to send an SMS when the Mobile type label is
@@ -421,6 +450,8 @@ Released December 2, 2020
 
 ## <a name="misc"></a>Miscellany
 
+- **_Composer Patches_: Update to v1.7.0. Support Composer v2. ([#18940](https://github.com/civicrm/civicrm-core/pull/18940))**
+
 - **Schema handler fixes
   ([18932](https://github.com/civicrm/civicrm-core/pull/18932))**
 
@@ -465,6 +496,15 @@ Released December 2, 2020
 - **Hack away at false negative test fails
   ([18892](https://github.com/civicrm/civicrm-core/pull/18892))**
 
+- **Search Kit - Fix search action button
+  ([19055](https://github.com/civicrm/civicrm-core/pull/19055))**
+
+- **Release Notes: Add 5.32.0
+  ([#18958](https://github.com/civicrm/civicrm-core/pull/18958), [#18945](https://github.com/civicrm/civicrm-core/pull/18945))**
+
+- **Release Notes: Add 5.31.1
+  ([#19029](https://github.com/civicrm/civicrm-core/pull/19029))**
+
 - **Remove always-true IF
   ([18803](https://github.com/civicrm/civicrm-core/pull/18803))**
 
@@ -554,6 +594,9 @@ Released December 2, 2020
 - **unit test for #18306 - order create api test for contribution
   ([18785](https://github.com/civicrm/civicrm-core/pull/18785))**
 
+- **(NFC) Update cache/integration-tests
+  ([19076](https://github.com/civicrm/civicrm-core/pull/19076))**
+
 - **(NFC) Fix typo in Money valueFormat depretation warning
   ([18886](https://github.com/civicrm/civicrm-core/pull/18886))**