MT#5879 Fix generation for ampersands;

(cherry picked from commit 00c4306088)

Conflicts:
	share/tools/generate_invoices.pl

share/tools/generate_invoices.pl

@@ -282,7 +282,13 @@ sub generate_invoice_data{
     #$logger->debug( Dumper $contract_balance );
     
     $client_contact->{country} = country($client_contact->{country} || '');
+    foreach(keys %$client_contact){
+        $client_contact->{$_} = encode_entities($client_contact->{$_});
+    }
     $provider_contact->{country} = country($provider_contact->{country} || '');
+    foreach(keys %$provider_contact){
+        $provider_contact->{$_} = encode_entities($provider_contact->{$_});
+    }
     # TODO: if not a full month, calculate fraction?
     #TODO: to utils::contract and share with catalyst version
     my $invoice_amounts = NGCP::Panel::Utils::Invoice::get_invoice_amounts(