From 610d2dac63b443db6a1c51e3e9e6e575c6c91412 Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Fri, 21 Jul 2017 14:26:11 +0530
Subject: [PATCH] CRM-20933 - Updating Pay later event registration from
 backend produces formRule error

---
 CRM/Event/Form/EventFees.php   | 1 +
 CRM/Event/Form/Participant.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CRM/Event/Form/EventFees.php b/CRM/Event/Form/EventFees.php
index ba7aa9ccd8..3a4dffb629 100644
--- a/CRM/Event/Form/EventFees.php
+++ b/CRM/Event/Form/EventFees.php
@@ -226,6 +226,7 @@ class CRM_Event_Form_EventFees {
 
     // CRM-4395
     if ($contriId = $form->get('onlinePendingContributionId')) {
+      $defaults[$form->_pId]['record_contribution'] = 1;
       $contribution = new CRM_Contribute_DAO_Contribution();
       $contribution->id = $contriId;
       $contribution->find(TRUE);
diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index c524956793..d2e7c95c0e 100644
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -823,7 +823,9 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
       if (empty($values['payment_instrument_id'])) {
         $errorMsg['payment_instrument_id'] = ts('Payment Method is a required field.');
       }
-      CRM_Price_BAO_PriceField::priceSetValidation($values['priceSetId'], $values, $errorMsg);
+      if (!empty($values['priceSetId'])) {
+        CRM_Price_BAO_PriceField::priceSetValidation($values['priceSetId'], $values, $errorMsg);
+      }
     }
 
     // validate contribution status for 'Failed'.
-- 
2.25.1