Merge pull request #13696 from mattwire/entityform_13578_fix

Move assign of currency for entityForm outside of foreach so order of fields don't matter

CRM/Core/Form/EntityFormTrait.php

@@ -162,25 +162,32 @@ protected function addFormButtons() {
    * Get the defaults for the entity.
    */
   protected function getEntityDefaults() {
-    $defaults = [];
+    $defaults = $moneyFields = [];
+
     if (!$this->isDeleteContext() &&
       $this->getEntityId()
     ) {
       $params = ['id' => $this->getEntityId()];
       $baoName = $this->_BAOName;
       $baoName::retrieve($params, $defaults);
     }
-    foreach ($this->entityFields as &$fieldSpec) {
+    foreach ($this->entityFields as $entityFieldName => $fieldSpec) {
       $value = CRM_Utils_Request::retrieveValue($fieldSpec['name'], $this->getValidationTypeForField($fieldSpec['name']));
       if ($value !== FALSE && $value !== NULL) {
         $defaults[$fieldSpec['name']] = $value;
       }
+      // Store a list of fields with money formatters
       if (CRM_Utils_Array::value('formatter', $fieldSpec) == 'crmMoney') {
-        if (!empty($defaults['currency'])) {
-          $fieldSpec['formatterParam'] = $defaults['currency'];
-        }
+        $moneyFields[] = $entityFieldName;
       }
     }
+    if (!empty($defaults['currency'])) {
+      // If we have a money formatter we need to pass the specified currency or it will render as the default
+      foreach ($moneyFields as $entityFieldName) {
+        $this->entityFields[$entityFieldName]['formatterParam'] = $defaults['currency'];
+      }
+    }
+
     // Assign again as we may have modified above
     $this->assign('entityFields', $this->entityFields);
     return $defaults;