Merge branch 'VAT-417-Push' of github.com:Parag18/civicrm-core into Parag18-VAT-417...

Conflicts:
	CRM/Contribute/Form/Task/Invoice.php

diff --cc CRM/Contribute/Form/Task/Invoice.php
index 377c8268591352b6c3d42e80a890e24ca7f19170,a6928029d9b211de1fa8caedf433ab9f32ec57c5..c2f581cc22a01b84d189e23c125c0966b098c615
--- 1/CRM/Contribute/Form/Task/Invoice.php
--- 2/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@@ -216,12 -308,19 +308,17 @@@ class CRM_Contribute_Form_Task_Invoice 
          }
        }
        
-       $stateProvinceAbbreviation = CRM_Core_PseudoConstant::stateProvinceAbbreviation($billingAddress[$contribution->contact_id]['state_province_id']);
+       if (!empty($billingAddress[$contribution->contact_id]['state_province_id'])) {
+         $stateProvinceAbbreviation = CRM_Core_PseudoConstant::stateProvinceAbbreviation($billingAddress[$contribution->contact_id]['state_province_id']);
+       }
+       else {
+         $stateProvinceAbbreviation = '';
+       }
        
        if ($contribution->contribution_status_id == $refundedStatusId) {
 -        $invoiceId = CRM_Utils_Array::value('credit_notes_prefix', $prefixValue). "" .$contribution->id;
 -      }
 -      else {
 -        $invoiceId = CRM_Utils_Array::value('invoice_prefix', $prefixValue). "" .$contribution->id;
 +        $creditNoteId = CRM_Utils_Array::value('credit_notes_prefix', $prefixValue) . "" . $contribution->id;
        }
 +      $invoiceId = CRM_Utils_Array::value('invoice_prefix', $prefixValue) . "" . $contribution->id;
        
        //to obtain due date for PDF invoice
        $contributionReceiveDate = date('F j,Y', strtotime(date($input['receive_date'])));
@@@ -380,10 -501,7 +500,10 @@@
        }
        
        $updateInvoiceId = CRM_Core_DAO::setFieldValue('CRM_Contribute_DAO_Contribution', $contribution->id, 'invoice_id', $invoiceId);
-       $this->_invoiceTemplate->clearTemplateVars();
 +      if ($contribution->contribution_status_id == $refundedStatusId) {
 +        $updateInvoiceId = CRM_Core_DAO::setFieldValue('CRM_Contribute_DAO_Contribution', $contribution->id, 'creditnote_id', $creditNoteId);
 +      }
+       $invoiceTemplate->clearTemplateVars();
      }
      
      if ($invoiceElements['createPdf']) {