From 01efed67bbd592ea8b96705d225e6113545aecfd Mon Sep 17 00:00:00 2001
From: yashodha <yashodha@cividesk.com>
Date: Mon, 9 Oct 2017 11:08:14 +0530
Subject: [PATCH] CRM-19850 - Add a offline membership without 'record payment'
 option, later edit the membership and saving with 'record payment' option

---
 CRM/Contribute/Form/Search.php                 | 2 +-
 templates/CRM/Member/Form/MembershipCommon.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
index b0174523f6..3cbbc3f682 100644
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@ -248,7 +248,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search {
 
     $this->_done = TRUE;
 
-    if (!empty($_POST)) {
+    if (!empty($_POST) && !$this->_force) {
       $this->_formValues = $this->controller->exportValues($this->_name);
     }
 
diff --git a/templates/CRM/Member/Form/MembershipCommon.tpl b/templates/CRM/Member/Form/MembershipCommon.tpl
index fcad577e7f..a0739b6b13 100644
--- a/templates/CRM/Member/Form/MembershipCommon.tpl
+++ b/templates/CRM/Member/Form/MembershipCommon.tpl
@@ -1,5 +1,5 @@
 {if !$membershipMode}
-  {if $accessContribution && $action != 2}
+  {if $accessContribution && ($action != 2 or (!$rows.0.contribution_id AND !$softCredit) or $onlinePendingContributionId)}
     <table>
       <tr class="crm-{$formClass}-form-block-contribution-contact">
         <td class="label">{$form.is_different_contribution_contact.label}</td>
-- 
2.25.1