Merge pull request #21050 from eileenmcnaughton/notice

Tpl notice fixes

templates/CRM/Contribute/Form/Search/Common.tpl

@@ -25,7 +25,7 @@
     <label>{ts}Currency{/ts}</label> <br />
     {$form.contribution_currency_type.html|crmAddClass:twenty}
   </td>
-  {if $form.contribution_batch_id.html }
+  {if !empty($form.contribution_batch_id.html)}
     <td>
       {$form.contribution_batch_id.label}<br />
       {$form.contribution_batch_id.html}
@@ -136,8 +136,10 @@
     {$form.contribution_source.html|crmAddClass:twenty}
   </td>
   <td>
-    {$form.contribution_product_id.label} <br />
-    {$form.contribution_product_id.html|crmAddClass:twenty}
+    {if !empty($form.contribution_product_id)}
+      {$form.contribution_product_id.label} <br />
+      {$form.contribution_product_id.html|crmAddClass:twenty}
+    {/if}
   </td>
 </tr>
 <tr>