diff --git a/lib/NGCP/Panel/I18N/de.po b/lib/NGCP/Panel/I18N/de.po
index fb321f0e72..3c927f9d32 100644
--- a/lib/NGCP/Panel/I18N/de.po
+++ b/lib/NGCP/Panel/I18N/de.po
@@ -99,7 +99,7 @@ msgstr ""
 #: lib/NGCP/Panel/Controller/Administrator.pm:29
 #: lib/NGCP/Panel/Controller/Billing.pm:323
 #: lib/NGCP/Panel/Controller/Billing.pm:36
-#: lib/NGCP/Panel/Controller/Billing.pm:684
+#: lib/NGCP/Panel/Controller/Billing.pm:652
 #: lib/NGCP/Panel/Controller/Billing.pm:98
 #: lib/NGCP/Panel/Controller/Contact.pm:32
 #: lib/NGCP/Panel/Controller/Contract.pm:25
@@ -190,9 +190,7 @@ msgstr "%1 von maximal %2 Subscribern %3 erstellt"
 msgid "%1<span class=\"pull-right\">for %2s</span>"
 msgstr "%1<span class=\"pull-right\">für %2s</span>"
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:232
-#: lib/NGCP/Panel/Controller/Billing.pm:484
-#: lib/NGCP/Panel/Controller/Voucher.pm:303
+#: lib/NGCP/Panel/Controller/Voucher.pm:303 lib/NGCP/Panel/Utils/Billing.pm:58
 msgid ", but skipped the following line numbers: "
 msgstr ", aber folgende Zeilen wurden ignoriert: "
 
@@ -808,8 +806,7 @@ msgstr "Verrechnungskosten-Eintrag existiert nicht!"
 msgid "Billing Fee successfully created!"
 msgstr "Verrechnungskosten-Eintrag erfolgreich erstellt!"
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:230
-#: lib/NGCP/Panel/Controller/Billing.pm:482
+#: lib/NGCP/Panel/Utils/Billing.pm:56
 msgid "Billing Fee successfully uploaded"
 msgstr "Verrechnungskosten-Eintrag erfolgreich hochgeladen"
 
@@ -861,7 +858,7 @@ msgstr ""
 msgid "Billing Zone"
 msgstr "Verrechungs-Zone"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:605
+#: lib/NGCP/Panel/Controller/Billing.pm:573
 msgid "Billing Zone successfully created"
 msgstr "Verrechungs-Zone erfolgreich erstellt"
 
@@ -869,15 +866,15 @@ msgstr "Verrechungs-Zone erfolgreich erstellt"
 msgid "Billing Zones"
 msgstr "Verrechungs-Zonen"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:552
+#: lib/NGCP/Panel/Controller/Billing.pm:520
 msgid "Billing fee not found!"
 msgstr "Verrechnungs-Eintrag nicht gefunden!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:535
+#: lib/NGCP/Panel/Controller/Billing.pm:503
 msgid "Billing fee successfully changed!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:561
+#: lib/NGCP/Panel/Controller/Billing.pm:529
 msgid "Billing fee successfully deleted!"
 msgstr ""
 
@@ -909,11 +906,11 @@ msgstr ""
 msgid "Billing zone"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:645
+#: lib/NGCP/Panel/Controller/Billing.pm:613
 msgid "Billing zone does not exist!"
 msgstr "Verrechungs-Zone existiert nicht!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:661
+#: lib/NGCP/Panel/Controller/Billing.pm:629
 msgid "Billing zone successfully deleted"
 msgstr "Verrechungs-Zone erfolgreich gelöscht"
 
@@ -2394,7 +2391,7 @@ msgstr ""
 msgid "Dialogic Settings"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:437
+#: lib/NGCP/Panel/Controller/Peering.pm:446
 msgid "Dialogic successfully flashed."
 msgstr ""
 
@@ -2734,7 +2731,7 @@ msgstr ""
 msgid "End"
 msgstr "Ende"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:686
+#: lib/NGCP/Panel/Controller/Billing.pm:654
 msgid "End Date"
 msgstr "End-Datum"
 
@@ -2901,7 +2898,7 @@ msgstr ""
 msgid "Failed to create billing voucher"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:611
+#: lib/NGCP/Panel/Controller/Billing.pm:579
 msgid "Failed to create billing zone"
 msgstr ""
 
@@ -2970,7 +2967,7 @@ msgstr ""
 msgid "Failed to create peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:579
+#: lib/NGCP/Panel/Controller/Peering.pm:588
 msgid "Failed to create peering rule"
 msgstr ""
 
@@ -3000,7 +2997,7 @@ msgstr ""
 msgid "Failed to create sound set"
 msgstr "Sound-Set erstellen fehlgeschlagen."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:937
+#: lib/NGCP/Panel/Controller/Billing.pm:905
 msgid "Failed to create special offpeak entry"
 msgstr ""
 
@@ -3053,7 +3050,7 @@ msgstr ""
 msgid "Failed to delete auto attendant slot"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:668
+#: lib/NGCP/Panel/Controller/Billing.pm:636
 msgid "Failed to delete billing zone"
 msgstr ""
 
@@ -3110,7 +3107,7 @@ msgstr ""
 msgid "Failed to delete peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:681
+#: lib/NGCP/Panel/Controller/Peering.pm:690
 msgid "Failed to delete peering rule"
 msgstr ""
 
@@ -3144,7 +3141,7 @@ msgstr "Sound Handle löschen fehlgeschlagen."
 msgid "Failed to delete sound set"
 msgstr "Sound Set löschen fehlgeschlagen."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:897
+#: lib/NGCP/Panel/Controller/Billing.pm:865
 msgid "Failed to delete special offpeak entry"
 msgstr ""
 
@@ -3180,7 +3177,7 @@ msgstr "Registriertes Gerät nicht gefunden."
 msgid "Failed to find voicemail user."
 msgstr "Benutzer für Sprachnachricht nicht gefunden."
 
-#: lib/NGCP/Panel/Controller/Peering.pm:443
+#: lib/NGCP/Panel/Controller/Peering.pm:452
 msgid "Failed to flash dialogic"
 msgstr ""
 
@@ -3375,7 +3372,7 @@ msgstr ""
 msgid "Failed to update peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:652
+#: lib/NGCP/Panel/Controller/Peering.pm:661
 msgid "Failed to update peering rule"
 msgstr ""
 
@@ -3419,7 +3416,7 @@ msgstr "Sound Handle aktualisieren fehlgeschlagen."
 msgid "Failed to update sound set"
 msgstr "Sound Set aktualisieren fehlgeschlagen."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:872
+#: lib/NGCP/Panel/Controller/Billing.pm:840
 msgid "Failed to update special offpeak entry"
 msgstr ""
 
@@ -3463,7 +3460,7 @@ msgstr "Hochgeladenes Sound Handle aktualisieren fehlgeschlagen."
 msgid "Failed to update voicemail setting"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:494
+#: lib/NGCP/Panel/Controller/Billing.pm:462
 msgid "Failed to upload Billing Fees"
 msgstr "Verrechungs-Gebühren hochladen fehlgeschlagen."
 
@@ -3642,7 +3639,7 @@ msgstr "Freiminuten"
 msgid "Free-Time Balance"
 msgstr "Freiminuten-Saldo"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:776
+#: lib/NGCP/Panel/Controller/Billing.pm:744
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1173
 msgid "Friday"
 msgstr "Freitag"
@@ -4145,7 +4142,7 @@ msgstr "Ungültige Administrator ID"
 msgid "Invalid billing fee id detected!"
 msgstr "Ungültige Verrechungs-Gebühr ID"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:633
+#: lib/NGCP/Panel/Controller/Billing.pm:601
 msgid "Invalid billing zone id detected"
 msgstr "Ungültige Verrechungs-Zonen ID"
 
@@ -4227,11 +4224,11 @@ msgstr "Ungültige Nummernblock ID"
 msgid "Invalid password reset attempt."
 msgstr "Ungültiger Passwortrücksetzungs-Versuch"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:817
+#: lib/NGCP/Panel/Controller/Billing.pm:785
 msgid "Invalid peaktime date id detected!"
 msgstr "Ungültige Onpeak Datum ID"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:600
+#: lib/NGCP/Panel/Controller/Peering.pm:609
 msgid "Invalid peering rule id detected"
 msgstr "Ungültige Peering-Regel ID"
 
@@ -4817,7 +4814,7 @@ msgstr "Modell"
 msgid "Model type"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:772
+#: lib/NGCP/Panel/Controller/Billing.pm:740
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1129
 msgid "Monday"
 msgstr "Montag"
@@ -5019,7 +5016,7 @@ msgstr "Neue Nachrichten"
 msgid "New Name"
 msgstr "Neuer Name"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:434
+#: lib/NGCP/Panel/Controller/Billing.pm:432
 msgid "No Billing Fee file specified!"
 msgstr "Keine Verrechnungs-Gebühren-Datei angegeben"
 
@@ -5466,7 +5463,7 @@ msgstr ""
 msgid "Pbx hunt timeout"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:830
+#: lib/NGCP/Panel/Controller/Billing.pm:798
 msgid "Peaktime date does not exist!"
 msgstr "Onpeak-Datum existiert nicht!"
 
@@ -5528,7 +5525,7 @@ msgstr "Peering-Gruppen"
 msgid "Peering Rule"
 msgstr "Peering-Regel"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:612
+#: lib/NGCP/Panel/Controller/Peering.pm:621
 msgid "Peering Rule does not exist"
 msgstr "Peering-Regel existiert nicht"
 
@@ -5559,15 +5556,15 @@ msgstr "Peering-Gruppe erfolgreich erstellt"
 msgid "Peering group successfully updated"
 msgstr "Peering-Gruppe erfolgreich aktualisiert"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:646
+#: lib/NGCP/Panel/Controller/Peering.pm:655
 msgid "Peering rule successfully changed"
 msgstr "Peering-Regel erfolgreich aktualisiert"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:573
+#: lib/NGCP/Panel/Controller/Peering.pm:582
 msgid "Peering rule successfully created"
 msgstr "Peering-Regel erfolgreich erstellt"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:675
+#: lib/NGCP/Panel/Controller/Peering.pm:684
 msgid "Peering rule successfully deleted"
 msgstr "Peering-Regel erfolgreich gelöscht"
 
@@ -6355,7 +6352,7 @@ msgstr ""
 "Wie \"ncos\", aber nur setzbar durch Administratoren. Wird vor Benutzer-NCOS-"
 "Stufe überprüft."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:777
+#: lib/NGCP/Panel/Controller/Billing.pm:745
 #: lib/NGCP/Panel/Utils/DbStrings.pm:889
 msgid "Saturday"
 msgstr "Samstag"
@@ -6836,15 +6833,15 @@ msgstr ""
 msgid "Source uuid"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:929
+#: lib/NGCP/Panel/Controller/Billing.pm:897
 msgid "Special offpeak entry successfully created"
 msgstr "Spezial-Offpeak-Eintrag erfolgreich erstellt"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:890
+#: lib/NGCP/Panel/Controller/Billing.pm:858
 msgid "Special offpeak entry successfully deleted"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:864
+#: lib/NGCP/Panel/Controller/Billing.pm:832
 msgid "Special offpeak entry successfully updated"
 msgstr "Spezial-Offpeak-Eintrag erfolgreich aktualisiert"
 
@@ -6949,7 +6946,7 @@ msgstr "Start"
 msgid "Start - End"
 msgstr "Start - Ende"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:685
+#: lib/NGCP/Panel/Controller/Billing.pm:653
 msgid "Start Date"
 msgstr "Start Datum"
 
@@ -7339,7 +7336,7 @@ msgstr "Vertraute Quelle erfolgreich aktualisiert"
 msgid "Successfully updated voicemail setting"
 msgstr "Sprachnachrichten-Einstellungen erfolgreich aktualisiert"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:778
+#: lib/NGCP/Panel/Controller/Billing.pm:746
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1241
 msgid "Sunday"
 msgstr "Sonntag"
@@ -8503,7 +8500,7 @@ msgstr ""
 msgid "The time the reminder call is triggered."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:744
+#: lib/NGCP/Panel/Controller/Billing.pm:712
 msgid "The timerange you wanted to delete does not exist"
 msgstr ""
 
@@ -8587,11 +8584,11 @@ msgstr "Die Versionsnummer der Firmware."
 msgid "The voucher code."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:706
+#: lib/NGCP/Panel/Controller/Billing.pm:674
 msgid "This weekday does not exist"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:775
+#: lib/NGCP/Panel/Controller/Billing.pm:743
 #: lib/NGCP/Panel/Utils/DbStrings.pm:656
 msgid "Thursday"
 msgstr "Donnerstag"
@@ -8614,11 +8611,11 @@ msgstr "Zeit-Sets"
 msgid "Timeout"
 msgstr "Zeitüberschreitung"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:733
+#: lib/NGCP/Panel/Controller/Billing.pm:701
 msgid "Timerange has been successfully created"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:755
+#: lib/NGCP/Panel/Controller/Billing.pm:723
 msgid "Timerange has been successfully deleted"
 msgstr ""
 
@@ -8685,7 +8682,7 @@ msgstr "Vertraute Quellen"
 msgid "Trusted source entry not found"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:773
+#: lib/NGCP/Panel/Controller/Billing.pm:741
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1110
 msgid "Tuesday"
 msgstr "Dienstag"
@@ -9014,7 +9011,7 @@ msgstr "Web Benutzername"
 msgid "Web password successfully recovered, please re-login."
 msgstr "Web-Passwort erfolgreich wiederhergestellt, bitte neu einloggen."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:774
+#: lib/NGCP/Panel/Controller/Billing.pm:742
 #: lib/NGCP/Panel/Utils/DbStrings.pm:473
 msgid "Wednesday"
 msgstr "Mittwoch"
diff --git a/lib/NGCP/Panel/I18N/es.po b/lib/NGCP/Panel/I18N/es.po
index 8e8a5d97f3..837b8973a2 100644
--- a/lib/NGCP/Panel/I18N/es.po
+++ b/lib/NGCP/Panel/I18N/es.po
@@ -88,7 +88,7 @@ msgstr ""
 #: lib/NGCP/Panel/Controller/Administrator.pm:29
 #: lib/NGCP/Panel/Controller/Billing.pm:323
 #: lib/NGCP/Panel/Controller/Billing.pm:36
-#: lib/NGCP/Panel/Controller/Billing.pm:684
+#: lib/NGCP/Panel/Controller/Billing.pm:652
 #: lib/NGCP/Panel/Controller/Billing.pm:98
 #: lib/NGCP/Panel/Controller/Contact.pm:32
 #: lib/NGCP/Panel/Controller/Contract.pm:25
@@ -179,9 +179,7 @@ msgstr ""
 msgid "%1<span class=\"pull-right\">for %2s</span>"
 msgstr "%1<span class=\"pull-right\">para %2s</span>"
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:232
-#: lib/NGCP/Panel/Controller/Billing.pm:484
-#: lib/NGCP/Panel/Controller/Voucher.pm:303
+#: lib/NGCP/Panel/Controller/Voucher.pm:303 lib/NGCP/Panel/Utils/Billing.pm:58
 msgid ", but skipped the following line numbers: "
 msgstr ", pero omitir los siguientes números: "
 
@@ -796,8 +794,7 @@ msgstr "¡La tarifa no existe!"
 msgid "Billing Fee successfully created!"
 msgstr "¡Tarifa creada con éxito!"
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:230
-#: lib/NGCP/Panel/Controller/Billing.pm:482
+#: lib/NGCP/Panel/Utils/Billing.pm:56
 msgid "Billing Fee successfully uploaded"
 msgstr "Tarifa subida con éxito"
 
@@ -849,7 +846,7 @@ msgstr ""
 msgid "Billing Zone"
 msgstr "Zona de facturación"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:605
+#: lib/NGCP/Panel/Controller/Billing.pm:573
 msgid "Billing Zone successfully created"
 msgstr "Zona de facturación creada con éxito"
 
@@ -857,15 +854,15 @@ msgstr "Zona de facturación creada con éxito"
 msgid "Billing Zones"
 msgstr "Zonas de facturación"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:552
+#: lib/NGCP/Panel/Controller/Billing.pm:520
 msgid "Billing fee not found!"
 msgstr "¡Tarifa no encontrada!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:535
+#: lib/NGCP/Panel/Controller/Billing.pm:503
 msgid "Billing fee successfully changed!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:561
+#: lib/NGCP/Panel/Controller/Billing.pm:529
 msgid "Billing fee successfully deleted!"
 msgstr ""
 
@@ -897,11 +894,11 @@ msgstr ""
 msgid "Billing zone"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:645
+#: lib/NGCP/Panel/Controller/Billing.pm:613
 msgid "Billing zone does not exist!"
 msgstr "¡La zona de facturación no existe!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:661
+#: lib/NGCP/Panel/Controller/Billing.pm:629
 msgid "Billing zone successfully deleted"
 msgstr "Zona de facturación eliminada con éxito"
 
@@ -2359,7 +2356,7 @@ msgstr ""
 msgid "Dialogic Settings"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:437
+#: lib/NGCP/Panel/Controller/Peering.pm:446
 msgid "Dialogic successfully flashed."
 msgstr ""
 
@@ -2702,7 +2699,7 @@ msgstr ""
 msgid "End"
 msgstr "Fin"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:686
+#: lib/NGCP/Panel/Controller/Billing.pm:654
 msgid "End Date"
 msgstr "Fecha de finalización"
 
@@ -2870,7 +2867,7 @@ msgstr ""
 msgid "Failed to create billing voucher"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:611
+#: lib/NGCP/Panel/Controller/Billing.pm:579
 msgid "Failed to create billing zone"
 msgstr ""
 
@@ -2939,7 +2936,7 @@ msgstr ""
 msgid "Failed to create peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:579
+#: lib/NGCP/Panel/Controller/Peering.pm:588
 msgid "Failed to create peering rule"
 msgstr ""
 
@@ -2969,7 +2966,7 @@ msgstr ""
 msgid "Failed to create sound set"
 msgstr "Fallo al crear grupo de locuciones"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:937
+#: lib/NGCP/Panel/Controller/Billing.pm:905
 msgid "Failed to create special offpeak entry"
 msgstr ""
 
@@ -3022,7 +3019,7 @@ msgstr ""
 msgid "Failed to delete auto attendant slot"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:668
+#: lib/NGCP/Panel/Controller/Billing.pm:636
 msgid "Failed to delete billing zone"
 msgstr ""
 
@@ -3079,7 +3076,7 @@ msgstr ""
 msgid "Failed to delete peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:681
+#: lib/NGCP/Panel/Controller/Peering.pm:690
 msgid "Failed to delete peering rule"
 msgstr ""
 
@@ -3113,7 +3110,7 @@ msgstr "Fallo al borrar el manejador de sonido"
 msgid "Failed to delete sound set"
 msgstr "Fallo al borrar grupo de locuciones"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:897
+#: lib/NGCP/Panel/Controller/Billing.pm:865
 msgid "Failed to delete special offpeak entry"
 msgstr ""
 
@@ -3149,7 +3146,7 @@ msgstr "Fallo al encontrar dispositivo registrado."
 msgid "Failed to find voicemail user."
 msgstr "Fallo al encontrar usuario de buzón."
 
-#: lib/NGCP/Panel/Controller/Peering.pm:443
+#: lib/NGCP/Panel/Controller/Peering.pm:452
 msgid "Failed to flash dialogic"
 msgstr ""
 
@@ -3344,7 +3341,7 @@ msgstr ""
 msgid "Failed to update peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:652
+#: lib/NGCP/Panel/Controller/Peering.pm:661
 msgid "Failed to update peering rule"
 msgstr ""
 
@@ -3389,7 +3386,7 @@ msgstr "Failed to update sound handle"
 msgid "Failed to update sound set"
 msgstr "Fallo al actualizar grupo de locuciones"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:872
+#: lib/NGCP/Panel/Controller/Billing.pm:840
 msgid "Failed to update special offpeak entry"
 msgstr ""
 
@@ -3434,7 +3431,7 @@ msgstr "Failed to update uploaded sound handle"
 msgid "Failed to update voicemail setting"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:494
+#: lib/NGCP/Panel/Controller/Billing.pm:462
 msgid "Failed to upload Billing Fees"
 msgstr "Fallo al subir tarifas"
 
@@ -3612,7 +3609,7 @@ msgstr "Tiempo gratis"
 msgid "Free-Time Balance"
 msgstr "Saldo de tiempo gratis"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:776
+#: lib/NGCP/Panel/Controller/Billing.pm:744
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1173
 msgid "Friday"
 msgstr "Viernes"
@@ -4119,7 +4116,7 @@ msgstr "Id de administrador inválido detectado"
 msgid "Invalid billing fee id detected!"
 msgstr "Id de tarifa inválido detectado"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:633
+#: lib/NGCP/Panel/Controller/Billing.pm:601
 msgid "Invalid billing zone id detected"
 msgstr "Id de zona de facturación inválida detectada"
 
@@ -4201,11 +4198,11 @@ msgstr ""
 msgid "Invalid password reset attempt."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:817
+#: lib/NGCP/Panel/Controller/Billing.pm:785
 msgid "Invalid peaktime date id detected!"
 msgstr "Fecha de hora punta inválida detectada"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:600
+#: lib/NGCP/Panel/Controller/Peering.pm:609
 msgid "Invalid peering rule id detected"
 msgstr "Id de regla de peering inválida detectada"
 
@@ -4784,7 +4781,7 @@ msgstr "Modelo"
 msgid "Model type"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:772
+#: lib/NGCP/Panel/Controller/Billing.pm:740
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1129
 msgid "Monday"
 msgstr "Lunes"
@@ -4985,7 +4982,7 @@ msgstr "Nuevos Mensajes"
 msgid "New Name"
 msgstr "Nuevo Nombre"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:434
+#: lib/NGCP/Panel/Controller/Billing.pm:432
 msgid "No Billing Fee file specified!"
 msgstr "¡No se ha especificado fichero de tarifas!"
 
@@ -5439,7 +5436,7 @@ msgstr ""
 msgid "Pbx hunt timeout"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:830
+#: lib/NGCP/Panel/Controller/Billing.pm:798
 msgid "Peaktime date does not exist!"
 msgstr "La Hora punta no existe!"
 
@@ -5501,7 +5498,7 @@ msgstr "Grupos de peering"
 msgid "Peering Rule"
 msgstr "Regla de peering"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:612
+#: lib/NGCP/Panel/Controller/Peering.pm:621
 msgid "Peering Rule does not exist"
 msgstr "La regla de peering no existe"
 
@@ -5532,15 +5529,15 @@ msgstr "Grupo de peering creado con éxito"
 msgid "Peering group successfully updated"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:646
+#: lib/NGCP/Panel/Controller/Peering.pm:655
 msgid "Peering rule successfully changed"
 msgstr "Regla de peering modificada con éxito"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:573
+#: lib/NGCP/Panel/Controller/Peering.pm:582
 msgid "Peering rule successfully created"
 msgstr "Regla de peering creada con éxito"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:675
+#: lib/NGCP/Panel/Controller/Peering.pm:684
 msgid "Peering rule successfully deleted"
 msgstr "Regla de peering eliminada con éxito"
 
@@ -6335,7 +6332,7 @@ msgstr ""
 "Igual que \"ncos\" pero únicamente puede ser modificado por administradores "
 "y tiene precedencia."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:777
+#: lib/NGCP/Panel/Controller/Billing.pm:745
 #: lib/NGCP/Panel/Utils/DbStrings.pm:889
 msgid "Saturday"
 msgstr "Sábado"
@@ -6821,15 +6818,15 @@ msgstr ""
 msgid "Source uuid"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:929
+#: lib/NGCP/Panel/Controller/Billing.pm:897
 msgid "Special offpeak entry successfully created"
 msgstr "Special offpeak entry successfully created"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:890
+#: lib/NGCP/Panel/Controller/Billing.pm:858
 msgid "Special offpeak entry successfully deleted"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:864
+#: lib/NGCP/Panel/Controller/Billing.pm:832
 msgid "Special offpeak entry successfully updated"
 msgstr "Special offpeak entry successfully updated"
 
@@ -6933,7 +6930,7 @@ msgstr "Inicio"
 msgid "Start - End"
 msgstr "Inicio - Fin"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:685
+#: lib/NGCP/Panel/Controller/Billing.pm:653
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
@@ -7319,7 +7316,7 @@ msgstr "Origen de confianza modificado con éxito"
 msgid "Successfully updated voicemail setting"
 msgstr "Buzón modificado con éxito"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:778
+#: lib/NGCP/Panel/Controller/Billing.pm:746
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1241
 msgid "Sunday"
 msgstr "Domingo"
@@ -8481,7 +8478,7 @@ msgstr ""
 msgid "The time the reminder call is triggered."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:744
+#: lib/NGCP/Panel/Controller/Billing.pm:712
 msgid "The timerange you wanted to delete does not exist"
 msgstr ""
 
@@ -8567,11 +8564,11 @@ msgstr ""
 msgid "The voucher code."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:706
+#: lib/NGCP/Panel/Controller/Billing.pm:674
 msgid "This weekday does not exist"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:775
+#: lib/NGCP/Panel/Controller/Billing.pm:743
 #: lib/NGCP/Panel/Utils/DbStrings.pm:656
 msgid "Thursday"
 msgstr "Jueves"
@@ -8594,11 +8591,11 @@ msgstr "Grupos de Tiempos"
 msgid "Timeout"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:733
+#: lib/NGCP/Panel/Controller/Billing.pm:701
 msgid "Timerange has been successfully created"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:755
+#: lib/NGCP/Panel/Controller/Billing.pm:723
 msgid "Timerange has been successfully deleted"
 msgstr ""
 
@@ -8665,7 +8662,7 @@ msgstr "Orígenes de confianza"
 msgid "Trusted source entry not found"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:773
+#: lib/NGCP/Panel/Controller/Billing.pm:741
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1110
 msgid "Tuesday"
 msgstr "Martes"
@@ -8999,7 +8996,7 @@ msgstr "Usuario web"
 msgid "Web password successfully recovered, please re-login."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:774
+#: lib/NGCP/Panel/Controller/Billing.pm:742
 #: lib/NGCP/Panel/Utils/DbStrings.pm:473
 msgid "Wednesday"
 msgstr "Miércoles"
diff --git a/lib/NGCP/Panel/I18N/it.po b/lib/NGCP/Panel/I18N/it.po
index a04b54d487..a1b2db4201 100644
--- a/lib/NGCP/Panel/I18N/it.po
+++ b/lib/NGCP/Panel/I18N/it.po
@@ -103,7 +103,7 @@ msgstr ""
 #: lib/NGCP/Panel/Controller/Administrator.pm:29
 #: lib/NGCP/Panel/Controller/Billing.pm:323
 #: lib/NGCP/Panel/Controller/Billing.pm:36
-#: lib/NGCP/Panel/Controller/Billing.pm:684
+#: lib/NGCP/Panel/Controller/Billing.pm:652
 #: lib/NGCP/Panel/Controller/Billing.pm:98
 #: lib/NGCP/Panel/Controller/Contact.pm:32
 #: lib/NGCP/Panel/Controller/Contract.pm:25
@@ -194,9 +194,7 @@ msgstr "creati %3 abbonati dei %1 su un massimo di %2"
 msgid "%1<span class=\"pull-right\">for %2s</span>"
 msgstr "%1<span class=\"pull-right\">per %2s</span>"
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:232
-#: lib/NGCP/Panel/Controller/Billing.pm:484
-#: lib/NGCP/Panel/Controller/Voucher.pm:303
+#: lib/NGCP/Panel/Controller/Voucher.pm:303 lib/NGCP/Panel/Utils/Billing.pm:58
 msgid ", but skipped the following line numbers: "
 msgstr ", ma ha saltato i seguenti numeri di riga: "
 
@@ -806,8 +804,7 @@ msgstr "Quota di Fatturazione inesistente!"
 msgid "Billing Fee successfully created!"
 msgstr "Quota di Fatturazione creata con successo!"
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:230
-#: lib/NGCP/Panel/Controller/Billing.pm:482
+#: lib/NGCP/Panel/Utils/Billing.pm:56
 msgid "Billing Fee successfully uploaded"
 msgstr "Quota di Fatturazione aggiornata con successo"
 
@@ -859,7 +856,7 @@ msgstr ""
 msgid "Billing Zone"
 msgstr "Zona di Fatturazione"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:605
+#: lib/NGCP/Panel/Controller/Billing.pm:573
 msgid "Billing Zone successfully created"
 msgstr "Zona di Fatturazione creata con successo!"
 
@@ -867,15 +864,15 @@ msgstr "Zona di Fatturazione creata con successo!"
 msgid "Billing Zones"
 msgstr "Zone di Fatturazione"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:552
+#: lib/NGCP/Panel/Controller/Billing.pm:520
 msgid "Billing fee not found!"
 msgstr "Quota di Fatturazione non trovata!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:535
+#: lib/NGCP/Panel/Controller/Billing.pm:503
 msgid "Billing fee successfully changed!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:561
+#: lib/NGCP/Panel/Controller/Billing.pm:529
 msgid "Billing fee successfully deleted!"
 msgstr ""
 
@@ -907,11 +904,11 @@ msgstr ""
 msgid "Billing zone"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:645
+#: lib/NGCP/Panel/Controller/Billing.pm:613
 msgid "Billing zone does not exist!"
 msgstr "Zona di fatturazione inesistente!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:661
+#: lib/NGCP/Panel/Controller/Billing.pm:629
 msgid "Billing zone successfully deleted"
 msgstr "Zona di fatturazione eliminata con successo"
 
@@ -2406,7 +2403,7 @@ msgstr ""
 msgid "Dialogic Settings"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:437
+#: lib/NGCP/Panel/Controller/Peering.pm:446
 msgid "Dialogic successfully flashed."
 msgstr ""
 
@@ -2746,7 +2743,7 @@ msgstr ""
 msgid "End"
 msgstr "Fine"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:686
+#: lib/NGCP/Panel/Controller/Billing.pm:654
 msgid "End Date"
 msgstr "Data di Fine"
 
@@ -2912,7 +2909,7 @@ msgstr ""
 msgid "Failed to create billing voucher"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:611
+#: lib/NGCP/Panel/Controller/Billing.pm:579
 msgid "Failed to create billing zone"
 msgstr ""
 
@@ -2981,7 +2978,7 @@ msgstr ""
 msgid "Failed to create peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:579
+#: lib/NGCP/Panel/Controller/Peering.pm:588
 msgid "Failed to create peering rule"
 msgstr ""
 
@@ -3011,7 +3008,7 @@ msgstr ""
 msgid "Failed to create sound set"
 msgstr "Creazione set di suoni fallita."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:937
+#: lib/NGCP/Panel/Controller/Billing.pm:905
 msgid "Failed to create special offpeak entry"
 msgstr ""
 
@@ -3064,7 +3061,7 @@ msgstr ""
 msgid "Failed to delete auto attendant slot"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:668
+#: lib/NGCP/Panel/Controller/Billing.pm:636
 msgid "Failed to delete billing zone"
 msgstr ""
 
@@ -3121,7 +3118,7 @@ msgstr ""
 msgid "Failed to delete peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:681
+#: lib/NGCP/Panel/Controller/Peering.pm:690
 msgid "Failed to delete peering rule"
 msgstr ""
 
@@ -3155,7 +3152,7 @@ msgstr "Eliminazione riferimento suono fallita."
 msgid "Failed to delete sound set"
 msgstr "Eliminazione set di suoni fallita."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:897
+#: lib/NGCP/Panel/Controller/Billing.pm:865
 msgid "Failed to delete special offpeak entry"
 msgstr ""
 
@@ -3191,7 +3188,7 @@ msgstr "Ricerca dispositivo registrato fallita."
 msgid "Failed to find voicemail user."
 msgstr "Ricerca utente casella vocale fallita."
 
-#: lib/NGCP/Panel/Controller/Peering.pm:443
+#: lib/NGCP/Panel/Controller/Peering.pm:452
 msgid "Failed to flash dialogic"
 msgstr ""
 
@@ -3386,7 +3383,7 @@ msgstr ""
 msgid "Failed to update peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:652
+#: lib/NGCP/Panel/Controller/Peering.pm:661
 msgid "Failed to update peering rule"
 msgstr ""
 
@@ -3430,7 +3427,7 @@ msgstr "Aggiornamento riferimento suono fallito."
 msgid "Failed to update sound set"
 msgstr "Aggiornamento set di suoni fallito."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:872
+#: lib/NGCP/Panel/Controller/Billing.pm:840
 msgid "Failed to update special offpeak entry"
 msgstr ""
 
@@ -3474,7 +3471,7 @@ msgstr "Aggiornamento riferimento suono caricato fallito."
 msgid "Failed to update voicemail setting"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:494
+#: lib/NGCP/Panel/Controller/Billing.pm:462
 msgid "Failed to upload Billing Fees"
 msgstr "Caricamento delle quote di fatturazione fallito"
 
@@ -3652,7 +3649,7 @@ msgstr "Tempo Gratuito"
 msgid "Free-Time Balance"
 msgstr "Accredito Tempo Gratuito"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:776
+#: lib/NGCP/Panel/Controller/Billing.pm:744
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1173
 msgid "Friday"
 msgstr "Venerdí"
@@ -4154,7 +4151,7 @@ msgstr "Id amministratore non valido"
 msgid "Invalid billing fee id detected!"
 msgstr "Id della quota di fatturazione non valido!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:633
+#: lib/NGCP/Panel/Controller/Billing.pm:601
 msgid "Invalid billing zone id detected"
 msgstr "Id zona di fatturazione non valido"
 
@@ -4236,11 +4233,11 @@ msgstr ""
 msgid "Invalid password reset attempt."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:817
+#: lib/NGCP/Panel/Controller/Billing.pm:785
 msgid "Invalid peaktime date id detected!"
 msgstr "Id data ora di picco non valida!"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:600
+#: lib/NGCP/Panel/Controller/Peering.pm:609
 msgid "Invalid peering rule id detected"
 msgstr "Id regola di peer non valido"
 
@@ -4820,7 +4817,7 @@ msgstr "Modello"
 msgid "Model type"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:772
+#: lib/NGCP/Panel/Controller/Billing.pm:740
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1129
 msgid "Monday"
 msgstr "Lunedì"
@@ -5022,7 +5019,7 @@ msgstr "Nuovi Messaggi"
 msgid "New Name"
 msgstr "Nuovo nome"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:434
+#: lib/NGCP/Panel/Controller/Billing.pm:432
 msgid "No Billing Fee file specified!"
 msgstr "Nessun file delle quote di fatturazione specificato!"
 
@@ -5468,7 +5465,7 @@ msgstr ""
 msgid "Pbx hunt timeout"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:830
+#: lib/NGCP/Panel/Controller/Billing.pm:798
 msgid "Peaktime date does not exist!"
 msgstr "Data orario di picco non esistente!"
 
@@ -5530,7 +5527,7 @@ msgstr "Gruppi Peer"
 msgid "Peering Rule"
 msgstr "Regola Peer"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:612
+#: lib/NGCP/Panel/Controller/Peering.pm:621
 msgid "Peering Rule does not exist"
 msgstr "Regola peer non esistente"
 
@@ -5561,15 +5558,15 @@ msgstr "Gruppo peer creato con successo"
 msgid "Peering group successfully updated"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:646
+#: lib/NGCP/Panel/Controller/Peering.pm:655
 msgid "Peering rule successfully changed"
 msgstr "Regola peer cambiata con successo"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:573
+#: lib/NGCP/Panel/Controller/Peering.pm:582
 msgid "Peering rule successfully created"
 msgstr "Regola peer creata con successo"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:675
+#: lib/NGCP/Panel/Controller/Peering.pm:684
 msgid "Peering rule successfully deleted"
 msgstr "Regola peer eliminata con successo"
 
@@ -6355,7 +6352,7 @@ msgstr ""
 "Lo stesso di \"ncos\" ma può essere settato solo da amministratori ed è "
 "applicato con priorità maggiore rispetto ai settaggi utente."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:777
+#: lib/NGCP/Panel/Controller/Billing.pm:745
 #: lib/NGCP/Panel/Utils/DbStrings.pm:889
 msgid "Saturday"
 msgstr "Sabato"
@@ -6836,15 +6833,15 @@ msgstr ""
 msgid "Source uuid"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:929
+#: lib/NGCP/Panel/Controller/Billing.pm:897
 msgid "Special offpeak entry successfully created"
 msgstr "Fuori picco speciale creato con successo"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:890
+#: lib/NGCP/Panel/Controller/Billing.pm:858
 msgid "Special offpeak entry successfully deleted"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:864
+#: lib/NGCP/Panel/Controller/Billing.pm:832
 msgid "Special offpeak entry successfully updated"
 msgstr "Fuori picco speciale aggiornato con successo"
 
@@ -6950,7 +6947,7 @@ msgstr "Inizio"
 msgid "Start - End"
 msgstr "Inizio - Fine"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:685
+#: lib/NGCP/Panel/Controller/Billing.pm:653
 msgid "Start Date"
 msgstr "Data di Inizio"
 
@@ -7336,7 +7333,7 @@ msgstr "Sorgente fidata aggiornata con successo"
 msgid "Successfully updated voicemail setting"
 msgstr "Configurazione casella vocale aggiornata con successo"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:778
+#: lib/NGCP/Panel/Controller/Billing.pm:746
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1241
 msgid "Sunday"
 msgstr "Domenica"
@@ -8500,7 +8497,7 @@ msgstr "La data e ora della registrazione del messaggio."
 msgid "The time the reminder call is triggered."
 msgstr "La data e ora in cui è impostato il promemoria."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:744
+#: lib/NGCP/Panel/Controller/Billing.pm:712
 msgid "The timerange you wanted to delete does not exist"
 msgstr ""
 
@@ -8584,11 +8581,11 @@ msgstr "Il numero di versione di questo firmware."
 msgid "The voucher code."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:706
+#: lib/NGCP/Panel/Controller/Billing.pm:674
 msgid "This weekday does not exist"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:775
+#: lib/NGCP/Panel/Controller/Billing.pm:743
 #: lib/NGCP/Panel/Utils/DbStrings.pm:656
 msgid "Thursday"
 msgstr "Giovedì"
@@ -8611,11 +8608,11 @@ msgstr "Settaggi Temporali"
 msgid "Timeout"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:733
+#: lib/NGCP/Panel/Controller/Billing.pm:701
 msgid "Timerange has been successfully created"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:755
+#: lib/NGCP/Panel/Controller/Billing.pm:723
 msgid "Timerange has been successfully deleted"
 msgstr ""
 
@@ -8682,7 +8679,7 @@ msgstr "IP Sorgenti Fidati"
 msgid "Trusted source entry not found"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:773
+#: lib/NGCP/Panel/Controller/Billing.pm:741
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1110
 msgid "Tuesday"
 msgstr "Martedì"
@@ -9011,7 +9008,7 @@ msgstr "Nome Utente Web"
 msgid "Web password successfully recovered, please re-login."
 msgstr "Password di accesso Web ripristinata, si prega di ricollegarsi."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:774
+#: lib/NGCP/Panel/Controller/Billing.pm:742
 #: lib/NGCP/Panel/Utils/DbStrings.pm:473
 msgid "Wednesday"
 msgstr "Mercoledì"
diff --git a/lib/NGCP/Panel/I18N/messages.pot b/lib/NGCP/Panel/I18N/messages.pot
index f3e3f3ecdb..c20981779c 100644
--- a/lib/NGCP/Panel/I18N/messages.pot
+++ b/lib/NGCP/Panel/I18N/messages.pot
@@ -55,7 +55,7 @@ msgstr ""
 msgid "\"Voice Mail\" - An internal flag for the voice_mail pseudo-preference feature to be able to map it do subscriber profiles. Not directly used."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Administrator.pm:29 lib/NGCP/Panel/Controller/Billing.pm:323 lib/NGCP/Panel/Controller/Billing.pm:36 lib/NGCP/Panel/Controller/Billing.pm:684 lib/NGCP/Panel/Controller/Billing.pm:98 lib/NGCP/Panel/Controller/Contact.pm:32 lib/NGCP/Panel/Controller/Contract.pm:25 lib/NGCP/Panel/Controller/Contract.pm:392 lib/NGCP/Panel/Controller/Customer.pm:282 lib/NGCP/Panel/Controller/Customer.pm:288 lib/NGCP/Panel/Controller/Customer.pm:297 lib/NGCP/Panel/Controller/Customer.pm:335 lib/NGCP/Panel/Controller/Customer.pm:50 lib/NGCP/Panel/Controller/Customer.pm:97 lib/NGCP/Panel/Controller/Device.pm:104 lib/NGCP/Panel/Controller/Device.pm:117 lib/NGCP/Panel/Controller/Device.pm:43 lib/NGCP/Panel/Controller/Device.pm:58 lib/NGCP/Panel/Controller/Device.pm:74 lib/NGCP/Panel/Controller/Device.pm:88 lib/NGCP/Panel/Controller/Domain.pm:29 lib/NGCP/Panel/Controller/EmailTemplate.pm:33 lib/NGCP/Panel/Controller/Invoice.pm:38 lib/NGCP/Panel/Controller/Invoice.pm:51 lib/NGCP/Panel/Controller/InvoiceTemplate.pm:32 lib/NGCP/Panel/Controller/NCOS.pm:237 lib/NGCP/Panel/Controller/NCOS.pm:29 lib/NGCP/Panel/Controller/NumberBlock.pm:39 lib/NGCP/Panel/Controller/Peering.pm:27 lib/NGCP/Panel/Controller/Peering.pm:80 lib/NGCP/Panel/Controller/Peering.pm:91 lib/NGCP/Panel/Controller/Product.pm:22 lib/NGCP/Panel/Controller/Reseller.pm:130 lib/NGCP/Panel/Controller/Reseller.pm:137 lib/NGCP/Panel/Controller/Reseller.pm:142 lib/NGCP/Panel/Controller/Reseller.pm:151 lib/NGCP/Panel/Controller/Reseller.pm:158 lib/NGCP/Panel/Controller/Reseller.pm:163 lib/NGCP/Panel/Controller/Reseller.pm:35 lib/NGCP/Panel/Controller/Reseller.pm:43 lib/NGCP/Panel/Controller/Rewrite.pm:31 lib/NGCP/Panel/Controller/Subscriber.pm:114 lib/NGCP/Panel/Controller/Subscriber.pm:2046 lib/NGCP/Panel/Controller/Subscriber.pm:2065 lib/NGCP/Panel/Controller/Subscriber.pm:2072 lib/NGCP/Panel/Controller/Subscriber.pm:260 lib/NGCP/Panel/Controller/Subscriber.pm:2614 lib/NGCP/Panel/Controller/Subscriber.pm:265 lib/NGCP/Panel/Controller/Subscriber.pm:270 lib/NGCP/Panel/Controller/Subscriber.pm:280 lib/NGCP/Panel/Controller/SubscriberProfile.pm:330 lib/NGCP/Panel/Controller/SubscriberProfile.pm:39 lib/NGCP/Panel/Controller/Voucher.pm:38 lib/NGCP/Panel/Utils/DbStrings.pm:940 lib/NGCP/Panel/Utils/Sounds.pm:65 share/templates/customer/details.tt:60
+#: lib/NGCP/Panel/Controller/Administrator.pm:29 lib/NGCP/Panel/Controller/Billing.pm:323 lib/NGCP/Panel/Controller/Billing.pm:36 lib/NGCP/Panel/Controller/Billing.pm:652 lib/NGCP/Panel/Controller/Billing.pm:98 lib/NGCP/Panel/Controller/Contact.pm:32 lib/NGCP/Panel/Controller/Contract.pm:25 lib/NGCP/Panel/Controller/Contract.pm:392 lib/NGCP/Panel/Controller/Customer.pm:282 lib/NGCP/Panel/Controller/Customer.pm:288 lib/NGCP/Panel/Controller/Customer.pm:297 lib/NGCP/Panel/Controller/Customer.pm:335 lib/NGCP/Panel/Controller/Customer.pm:50 lib/NGCP/Panel/Controller/Customer.pm:97 lib/NGCP/Panel/Controller/Device.pm:104 lib/NGCP/Panel/Controller/Device.pm:117 lib/NGCP/Panel/Controller/Device.pm:43 lib/NGCP/Panel/Controller/Device.pm:58 lib/NGCP/Panel/Controller/Device.pm:74 lib/NGCP/Panel/Controller/Device.pm:88 lib/NGCP/Panel/Controller/Domain.pm:29 lib/NGCP/Panel/Controller/EmailTemplate.pm:33 lib/NGCP/Panel/Controller/Invoice.pm:38 lib/NGCP/Panel/Controller/Invoice.pm:51 lib/NGCP/Panel/Controller/InvoiceTemplate.pm:32 lib/NGCP/Panel/Controller/NCOS.pm:237 lib/NGCP/Panel/Controller/NCOS.pm:29 lib/NGCP/Panel/Controller/NumberBlock.pm:39 lib/NGCP/Panel/Controller/Peering.pm:27 lib/NGCP/Panel/Controller/Peering.pm:80 lib/NGCP/Panel/Controller/Peering.pm:91 lib/NGCP/Panel/Controller/Product.pm:22 lib/NGCP/Panel/Controller/Reseller.pm:130 lib/NGCP/Panel/Controller/Reseller.pm:137 lib/NGCP/Panel/Controller/Reseller.pm:142 lib/NGCP/Panel/Controller/Reseller.pm:151 lib/NGCP/Panel/Controller/Reseller.pm:158 lib/NGCP/Panel/Controller/Reseller.pm:163 lib/NGCP/Panel/Controller/Reseller.pm:35 lib/NGCP/Panel/Controller/Reseller.pm:43 lib/NGCP/Panel/Controller/Rewrite.pm:31 lib/NGCP/Panel/Controller/Subscriber.pm:114 lib/NGCP/Panel/Controller/Subscriber.pm:2046 lib/NGCP/Panel/Controller/Subscriber.pm:2065 lib/NGCP/Panel/Controller/Subscriber.pm:2072 lib/NGCP/Panel/Controller/Subscriber.pm:260 lib/NGCP/Panel/Controller/Subscriber.pm:2614 lib/NGCP/Panel/Controller/Subscriber.pm:265 lib/NGCP/Panel/Controller/Subscriber.pm:270 lib/NGCP/Panel/Controller/Subscriber.pm:280 lib/NGCP/Panel/Controller/SubscriberProfile.pm:330 lib/NGCP/Panel/Controller/SubscriberProfile.pm:39 lib/NGCP/Panel/Controller/Voucher.pm:38 lib/NGCP/Panel/Utils/DbStrings.pm:940 lib/NGCP/Panel/Utils/Sounds.pm:65 share/templates/customer/details.tt:60
 msgid "#"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr ""
 msgid "%1<span class=\"pull-right\">for %2s</span>"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:232 lib/NGCP/Panel/Controller/Billing.pm:484 lib/NGCP/Panel/Controller/Voucher.pm:303
+#: lib/NGCP/Panel/Controller/Voucher.pm:303 lib/NGCP/Panel/Utils/Billing.pm:58
 msgid ", but skipped the following line numbers: "
 msgstr ""
 
@@ -591,7 +591,7 @@ msgstr ""
 msgid "Billing Fee successfully created!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:230 lib/NGCP/Panel/Controller/Billing.pm:482
+#: lib/NGCP/Panel/Utils/Billing.pm:56
 msgid "Billing Fee successfully uploaded"
 msgstr ""
 
@@ -635,7 +635,7 @@ msgstr ""
 msgid "Billing Zone"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:605
+#: lib/NGCP/Panel/Controller/Billing.pm:573
 msgid "Billing Zone successfully created"
 msgstr ""
 
@@ -643,15 +643,15 @@ msgstr ""
 msgid "Billing Zones"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:552
+#: lib/NGCP/Panel/Controller/Billing.pm:520
 msgid "Billing fee not found!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:535
+#: lib/NGCP/Panel/Controller/Billing.pm:503
 msgid "Billing fee successfully changed!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:561
+#: lib/NGCP/Panel/Controller/Billing.pm:529
 msgid "Billing fee successfully deleted!"
 msgstr ""
 
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Billing zone"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:645
+#: lib/NGCP/Panel/Controller/Billing.pm:613
 msgid "Billing zone does not exist!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:661
+#: lib/NGCP/Panel/Controller/Billing.pm:629
 msgid "Billing zone successfully deleted"
 msgstr ""
 
@@ -1902,7 +1902,7 @@ msgstr ""
 msgid "Dialogic Settings"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:437
+#: lib/NGCP/Panel/Controller/Peering.pm:446
 msgid "Dialogic successfully flashed."
 msgstr ""
 
@@ -2152,7 +2152,7 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:686
+#: lib/NGCP/Panel/Controller/Billing.pm:654
 msgid "End Date"
 msgstr ""
 
@@ -2304,7 +2304,7 @@ msgstr ""
 msgid "Failed to create billing voucher"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:611
+#: lib/NGCP/Panel/Controller/Billing.pm:579
 msgid "Failed to create billing zone"
 msgstr ""
 
@@ -2372,7 +2372,7 @@ msgstr ""
 msgid "Failed to create peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:579
+#: lib/NGCP/Panel/Controller/Peering.pm:588
 msgid "Failed to create peering rule"
 msgstr ""
 
@@ -2401,7 +2401,7 @@ msgstr ""
 msgid "Failed to create sound set"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:937
+#: lib/NGCP/Panel/Controller/Billing.pm:905
 msgid "Failed to create special offpeak entry"
 msgstr ""
 
@@ -2453,7 +2453,7 @@ msgstr ""
 msgid "Failed to delete auto attendant slot"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:668
+#: lib/NGCP/Panel/Controller/Billing.pm:636
 msgid "Failed to delete billing zone"
 msgstr ""
 
@@ -2509,7 +2509,7 @@ msgstr ""
 msgid "Failed to delete peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:681
+#: lib/NGCP/Panel/Controller/Peering.pm:690
 msgid "Failed to delete peering rule"
 msgstr ""
 
@@ -2542,7 +2542,7 @@ msgstr ""
 msgid "Failed to delete sound set"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:897
+#: lib/NGCP/Panel/Controller/Billing.pm:865
 msgid "Failed to delete special offpeak entry"
 msgstr ""
 
@@ -2578,7 +2578,7 @@ msgstr ""
 msgid "Failed to find voicemail user."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:443
+#: lib/NGCP/Panel/Controller/Peering.pm:452
 msgid "Failed to flash dialogic"
 msgstr ""
 
@@ -2768,7 +2768,7 @@ msgstr ""
 msgid "Failed to update peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:652
+#: lib/NGCP/Panel/Controller/Peering.pm:661
 msgid "Failed to update peering rule"
 msgstr ""
 
@@ -2809,7 +2809,7 @@ msgstr ""
 msgid "Failed to update sound set"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:872
+#: lib/NGCP/Panel/Controller/Billing.pm:840
 msgid "Failed to update special offpeak entry"
 msgstr ""
 
@@ -2853,7 +2853,7 @@ msgstr ""
 msgid "Failed to update voicemail setting"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:494
+#: lib/NGCP/Panel/Controller/Billing.pm:462
 msgid "Failed to upload Billing Fees"
 msgstr ""
 
@@ -3006,7 +3006,7 @@ msgstr ""
 msgid "Free-Time Balance"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:776 lib/NGCP/Panel/Utils/DbStrings.pm:1173
+#: lib/NGCP/Panel/Controller/Billing.pm:744 lib/NGCP/Panel/Utils/DbStrings.pm:1173
 msgid "Friday"
 msgstr ""
 
@@ -3475,7 +3475,7 @@ msgstr ""
 msgid "Invalid billing fee id detected!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:633
+#: lib/NGCP/Panel/Controller/Billing.pm:601
 msgid "Invalid billing zone id detected"
 msgstr ""
 
@@ -3552,11 +3552,11 @@ msgstr ""
 msgid "Invalid password reset attempt."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:817
+#: lib/NGCP/Panel/Controller/Billing.pm:785
 msgid "Invalid peaktime date id detected!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:600
+#: lib/NGCP/Panel/Controller/Peering.pm:609
 msgid "Invalid peering rule id detected"
 msgstr ""
 
@@ -4073,7 +4073,7 @@ msgstr ""
 msgid "Model type"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:772 lib/NGCP/Panel/Utils/DbStrings.pm:1129
+#: lib/NGCP/Panel/Controller/Billing.pm:740 lib/NGCP/Panel/Utils/DbStrings.pm:1129
 msgid "Monday"
 msgstr ""
 
@@ -4235,7 +4235,7 @@ msgstr ""
 msgid "New Name"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:434
+#: lib/NGCP/Panel/Controller/Billing.pm:432
 msgid "No Billing Fee file specified!"
 msgstr ""
 
@@ -4662,7 +4662,7 @@ msgstr ""
 msgid "Pbx hunt timeout"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:830
+#: lib/NGCP/Panel/Controller/Billing.pm:798
 msgid "Peaktime date does not exist!"
 msgstr ""
 
@@ -4723,7 +4723,7 @@ msgstr ""
 msgid "Peering Rule"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:612
+#: lib/NGCP/Panel/Controller/Peering.pm:621
 msgid "Peering Rule does not exist"
 msgstr ""
 
@@ -4751,15 +4751,15 @@ msgstr ""
 msgid "Peering group successfully updated"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:646
+#: lib/NGCP/Panel/Controller/Peering.pm:655
 msgid "Peering rule successfully changed"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:573
+#: lib/NGCP/Panel/Controller/Peering.pm:582
 msgid "Peering rule successfully created"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:675
+#: lib/NGCP/Panel/Controller/Peering.pm:684
 msgid "Peering rule successfully deleted"
 msgstr ""
 
@@ -5385,7 +5385,7 @@ msgstr ""
 msgid "Same as \"ncos\", but may only be set by administrators and is applied prior to the user setting."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:777 lib/NGCP/Panel/Utils/DbStrings.pm:889
+#: lib/NGCP/Panel/Controller/Billing.pm:745 lib/NGCP/Panel/Utils/DbStrings.pm:889
 msgid "Saturday"
 msgstr ""
 
@@ -5806,15 +5806,15 @@ msgstr ""
 msgid "Source uuid"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:929
+#: lib/NGCP/Panel/Controller/Billing.pm:897
 msgid "Special offpeak entry successfully created"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:890
+#: lib/NGCP/Panel/Controller/Billing.pm:858
 msgid "Special offpeak entry successfully deleted"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:864
+#: lib/NGCP/Panel/Controller/Billing.pm:832
 msgid "Special offpeak entry successfully updated"
 msgstr ""
 
@@ -5878,7 +5878,7 @@ msgstr ""
 msgid "Start - End"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:685
+#: lib/NGCP/Panel/Controller/Billing.pm:653
 msgid "Start Date"
 msgstr ""
 
@@ -6225,7 +6225,7 @@ msgstr ""
 msgid "Successfully updated voicemail setting"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:778 lib/NGCP/Panel/Utils/DbStrings.pm:1241
+#: lib/NGCP/Panel/Controller/Billing.pm:746 lib/NGCP/Panel/Utils/DbStrings.pm:1241
 msgid "Sunday"
 msgstr ""
 
@@ -7185,7 +7185,7 @@ msgstr ""
 msgid "The time the reminder call is triggered."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:744
+#: lib/NGCP/Panel/Controller/Billing.pm:712
 msgid "The timerange you wanted to delete does not exist"
 msgstr ""
 
@@ -7269,11 +7269,11 @@ msgstr ""
 msgid "The voucher code."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:706
+#: lib/NGCP/Panel/Controller/Billing.pm:674
 msgid "This weekday does not exist"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:775 lib/NGCP/Panel/Utils/DbStrings.pm:656
+#: lib/NGCP/Panel/Controller/Billing.pm:743 lib/NGCP/Panel/Utils/DbStrings.pm:656
 msgid "Thursday"
 msgstr ""
 
@@ -7293,11 +7293,11 @@ msgstr ""
 msgid "Timeout"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:733
+#: lib/NGCP/Panel/Controller/Billing.pm:701
 msgid "Timerange has been successfully created"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:755
+#: lib/NGCP/Panel/Controller/Billing.pm:723
 msgid "Timerange has been successfully deleted"
 msgstr ""
 
@@ -7358,7 +7358,7 @@ msgstr ""
 msgid "Trusted source entry not found"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:773 lib/NGCP/Panel/Utils/DbStrings.pm:1110
+#: lib/NGCP/Panel/Controller/Billing.pm:741 lib/NGCP/Panel/Utils/DbStrings.pm:1110
 msgid "Tuesday"
 msgstr ""
 
@@ -7648,7 +7648,7 @@ msgstr ""
 msgid "Web password successfully recovered, please re-login."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:774 lib/NGCP/Panel/Utils/DbStrings.pm:473
+#: lib/NGCP/Panel/Controller/Billing.pm:742 lib/NGCP/Panel/Utils/DbStrings.pm:473
 msgid "Wednesday"
 msgstr ""
 
diff --git a/lib/NGCP/Panel/I18N/ru.po b/lib/NGCP/Panel/I18N/ru.po
index b168ef3457..8944b8f114 100644
--- a/lib/NGCP/Panel/I18N/ru.po
+++ b/lib/NGCP/Panel/I18N/ru.po
@@ -102,7 +102,7 @@ msgstr ""
 #: lib/NGCP/Panel/Controller/Administrator.pm:29
 #: lib/NGCP/Panel/Controller/Billing.pm:323
 #: lib/NGCP/Panel/Controller/Billing.pm:36
-#: lib/NGCP/Panel/Controller/Billing.pm:684
+#: lib/NGCP/Panel/Controller/Billing.pm:652
 #: lib/NGCP/Panel/Controller/Billing.pm:98
 #: lib/NGCP/Panel/Controller/Contact.pm:32
 #: lib/NGCP/Panel/Controller/Contract.pm:25
@@ -193,9 +193,7 @@ msgstr "создано %1 из максимально доступных %2 аб
 msgid "%1<span class=\"pull-right\">for %2s</span>"
 msgstr "%1<span class=\"pull-right\">для %2s</span>"
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:232
-#: lib/NGCP/Panel/Controller/Billing.pm:484
-#: lib/NGCP/Panel/Controller/Voucher.pm:303
+#: lib/NGCP/Panel/Controller/Voucher.pm:303 lib/NGCP/Panel/Utils/Billing.pm:58
 msgid ", but skipped the following line numbers: "
 msgstr ", но пропущены следующие номера строк: "
 
@@ -803,8 +801,7 @@ msgstr "Цена не существует!"
 msgid "Billing Fee successfully created!"
 msgstr "Цена успешно создана!"
 
-#: lib/NGCP/Panel/Controller/API/BillingFees.pm:230
-#: lib/NGCP/Panel/Controller/Billing.pm:482
+#: lib/NGCP/Panel/Utils/Billing.pm:56
 msgid "Billing Fee successfully uploaded"
 msgstr "Цена успешно обновлена!"
 
@@ -856,7 +853,7 @@ msgstr ""
 msgid "Billing Zone"
 msgstr "Тарифная зона"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:605
+#: lib/NGCP/Panel/Controller/Billing.pm:573
 msgid "Billing Zone successfully created"
 msgstr "Тарифная зона успешно создана"
 
@@ -864,15 +861,15 @@ msgstr "Тарифная зона успешно создана"
 msgid "Billing Zones"
 msgstr "Тарифные зоны"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:552
+#: lib/NGCP/Panel/Controller/Billing.pm:520
 msgid "Billing fee not found!"
 msgstr "Цена не найдена!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:535
+#: lib/NGCP/Panel/Controller/Billing.pm:503
 msgid "Billing fee successfully changed!"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:561
+#: lib/NGCP/Panel/Controller/Billing.pm:529
 msgid "Billing fee successfully deleted!"
 msgstr ""
 
@@ -904,11 +901,11 @@ msgstr ""
 msgid "Billing zone"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:645
+#: lib/NGCP/Panel/Controller/Billing.pm:613
 msgid "Billing zone does not exist!"
 msgstr "Тарифная зона не существует!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:661
+#: lib/NGCP/Panel/Controller/Billing.pm:629
 msgid "Billing zone successfully deleted"
 msgstr "Тарифная зона успешно удалена"
 
@@ -2391,7 +2388,7 @@ msgstr ""
 msgid "Dialogic Settings"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:437
+#: lib/NGCP/Panel/Controller/Peering.pm:446
 msgid "Dialogic successfully flashed."
 msgstr ""
 
@@ -2732,7 +2729,7 @@ msgstr ""
 msgid "End"
 msgstr "Конец"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:686
+#: lib/NGCP/Panel/Controller/Billing.pm:654
 msgid "End Date"
 msgstr "Конечная Дата"
 
@@ -2898,7 +2895,7 @@ msgstr ""
 msgid "Failed to create billing voucher"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:611
+#: lib/NGCP/Panel/Controller/Billing.pm:579
 msgid "Failed to create billing zone"
 msgstr ""
 
@@ -2967,7 +2964,7 @@ msgstr ""
 msgid "Failed to create peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:579
+#: lib/NGCP/Panel/Controller/Peering.pm:588
 msgid "Failed to create peering rule"
 msgstr ""
 
@@ -2997,7 +2994,7 @@ msgstr ""
 msgid "Failed to create sound set"
 msgstr "Не удалось создать набор звуков"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:937
+#: lib/NGCP/Panel/Controller/Billing.pm:905
 msgid "Failed to create special offpeak entry"
 msgstr ""
 
@@ -3050,7 +3047,7 @@ msgstr ""
 msgid "Failed to delete auto attendant slot"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:668
+#: lib/NGCP/Panel/Controller/Billing.pm:636
 msgid "Failed to delete billing zone"
 msgstr ""
 
@@ -3107,7 +3104,7 @@ msgstr ""
 msgid "Failed to delete peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:681
+#: lib/NGCP/Panel/Controller/Peering.pm:690
 msgid "Failed to delete peering rule"
 msgstr ""
 
@@ -3141,7 +3138,7 @@ msgstr "Не удалось удалить запись"
 msgid "Failed to delete sound set"
 msgstr "Не удалось удалить набор звуков"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:897
+#: lib/NGCP/Panel/Controller/Billing.pm:865
 msgid "Failed to delete special offpeak entry"
 msgstr ""
 
@@ -3177,7 +3174,7 @@ msgstr "Не удалось найти зарегистрированное ус
 msgid "Failed to find voicemail user."
 msgstr "Не удалось найти пользователя голосовой почты."
 
-#: lib/NGCP/Panel/Controller/Peering.pm:443
+#: lib/NGCP/Panel/Controller/Peering.pm:452
 msgid "Failed to flash dialogic"
 msgstr ""
 
@@ -3372,7 +3369,7 @@ msgstr ""
 msgid "Failed to update peering group"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Peering.pm:652
+#: lib/NGCP/Panel/Controller/Peering.pm:661
 msgid "Failed to update peering rule"
 msgstr ""
 
@@ -3416,7 +3413,7 @@ msgstr "Не удалось обновить звуковой указатель
 msgid "Failed to update sound set"
 msgstr "Не удалось обновить набор звуков"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:872
+#: lib/NGCP/Panel/Controller/Billing.pm:840
 msgid "Failed to update special offpeak entry"
 msgstr ""
 
@@ -3460,7 +3457,7 @@ msgstr "Не удалось обновить загруженный звуков
 msgid "Failed to update voicemail setting"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:494
+#: lib/NGCP/Panel/Controller/Billing.pm:462
 msgid "Failed to upload Billing Fees"
 msgstr "Не удалось загрузить цены"
 
@@ -3638,7 +3635,7 @@ msgstr "Бесплатные минуты"
 msgid "Free-Time Balance"
 msgstr "Баланс бесплатных минут"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:776
+#: lib/NGCP/Panel/Controller/Billing.pm:744
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1173
 msgid "Friday"
 msgstr "Пятница"
@@ -4146,7 +4143,7 @@ msgstr "Обнаружен некорректный id администрато
 msgid "Invalid billing fee id detected!"
 msgstr "Обнаружен некорректный id для цены в биллинге!"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:633
+#: lib/NGCP/Panel/Controller/Billing.pm:601
 msgid "Invalid billing zone id detected"
 msgstr "Обнаружен некорректный id для тарифной зоны"
 
@@ -4228,11 +4225,11 @@ msgstr "Обнаружен некорректный id блока номеров
 msgid "Invalid password reset attempt."
 msgstr "Не удачная попытка сброса пароля."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:817
+#: lib/NGCP/Panel/Controller/Billing.pm:785
 msgid "Invalid peaktime date id detected!"
 msgstr "Обнаружен некорректный id бизнес-времени (peaktime)"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:600
+#: lib/NGCP/Panel/Controller/Peering.pm:609
 msgid "Invalid peering rule id detected"
 msgstr "Обнаружен некорректный id SIP Транк правила"
 
@@ -4814,7 +4811,7 @@ msgstr "Модель"
 msgid "Model type"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:772
+#: lib/NGCP/Panel/Controller/Billing.pm:740
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1129
 msgid "Monday"
 msgstr "Понедельник"
@@ -5015,7 +5012,7 @@ msgstr "Новые сообщения"
 msgid "New Name"
 msgstr "Новое имя"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:434
+#: lib/NGCP/Panel/Controller/Billing.pm:432
 msgid "No Billing Fee file specified!"
 msgstr "Не указан файл с ценами!"
 
@@ -5461,7 +5458,7 @@ msgstr "Политика перебора PBX группы"
 msgid "Pbx hunt timeout"
 msgstr "Таймаут перебора PBX группы"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:830
+#: lib/NGCP/Panel/Controller/Billing.pm:798
 msgid "Peaktime date does not exist!"
 msgstr "Указанное Бизнес-время не существует!"
 
@@ -5523,7 +5520,7 @@ msgstr "SIP Транк группы"
 msgid "Peering Rule"
 msgstr "SIP Транк правил"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:612
+#: lib/NGCP/Panel/Controller/Peering.pm:621
 msgid "Peering Rule does not exist"
 msgstr "SIP Транк правило не существует"
 
@@ -5554,15 +5551,15 @@ msgstr "SIP Транк группа успешно создана"
 msgid "Peering group successfully updated"
 msgstr "SIP Транк группа успешно обновлена"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:646
+#: lib/NGCP/Panel/Controller/Peering.pm:655
 msgid "Peering rule successfully changed"
 msgstr "SIP Транк группа успешно изменена"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:573
+#: lib/NGCP/Panel/Controller/Peering.pm:582
 msgid "Peering rule successfully created"
 msgstr "SIP Транк правило успешно создано"
 
-#: lib/NGCP/Panel/Controller/Peering.pm:675
+#: lib/NGCP/Panel/Controller/Peering.pm:684
 msgid "Peering rule successfully deleted"
 msgstr "SIP Транк правило успешно удалено"
 
@@ -6356,7 +6353,7 @@ msgstr ""
 "Аналогично \"ncos\" но может быть установлено только администраторами и "
 "применяется перед пользовательскими настройками."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:777
+#: lib/NGCP/Panel/Controller/Billing.pm:745
 #: lib/NGCP/Panel/Utils/DbStrings.pm:889
 msgid "Saturday"
 msgstr "Суббота"
@@ -6840,15 +6837,15 @@ msgstr "Исходный идентификатор пользователя"
 msgid "Source uuid"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:929
+#: lib/NGCP/Panel/Controller/Billing.pm:897
 msgid "Special offpeak entry successfully created"
 msgstr "Специальная offpeak запись успешно создана"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:890
+#: lib/NGCP/Panel/Controller/Billing.pm:858
 msgid "Special offpeak entry successfully deleted"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:864
+#: lib/NGCP/Panel/Controller/Billing.pm:832
 msgid "Special offpeak entry successfully updated"
 msgstr "Специальная offpeak запись успешно обновлена"
 
@@ -6954,7 +6951,7 @@ msgstr "Начало"
 msgid "Start - End"
 msgstr "Начало - Конец"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:685
+#: lib/NGCP/Panel/Controller/Billing.pm:653
 msgid "Start Date"
 msgstr "Дата начала"
 
@@ -7339,7 +7336,7 @@ msgstr "IP авторизация успешно обновлена"
 msgid "Successfully updated voicemail setting"
 msgstr "Настройки голосовой почты успешно обновлены"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:778
+#: lib/NGCP/Panel/Controller/Billing.pm:746
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1241
 msgid "Sunday"
 msgstr "Воскресенье"
@@ -8516,7 +8513,7 @@ msgstr "Время записи сообщения."
 msgid "The time the reminder call is triggered."
 msgstr "Время звонка."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:744
+#: lib/NGCP/Panel/Controller/Billing.pm:712
 msgid "The timerange you wanted to delete does not exist"
 msgstr ""
 
@@ -8601,11 +8598,11 @@ msgstr "Номер версии этой прошивки."
 msgid "The voucher code."
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:706
+#: lib/NGCP/Panel/Controller/Billing.pm:674
 msgid "This weekday does not exist"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:775
+#: lib/NGCP/Panel/Controller/Billing.pm:743
 #: lib/NGCP/Panel/Utils/DbStrings.pm:656
 msgid "Thursday"
 msgstr "Четверг"
@@ -8628,11 +8625,11 @@ msgstr "Периоды"
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: lib/NGCP/Panel/Controller/Billing.pm:733
+#: lib/NGCP/Panel/Controller/Billing.pm:701
 msgid "Timerange has been successfully created"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:755
+#: lib/NGCP/Panel/Controller/Billing.pm:723
 msgid "Timerange has been successfully deleted"
 msgstr ""
 
@@ -8699,7 +8696,7 @@ msgstr "IP авторизация"
 msgid "Trusted source entry not found"
 msgstr ""
 
-#: lib/NGCP/Panel/Controller/Billing.pm:773
+#: lib/NGCP/Panel/Controller/Billing.pm:741
 #: lib/NGCP/Panel/Utils/DbStrings.pm:1110
 msgid "Tuesday"
 msgstr "Вторник"
@@ -9028,7 +9025,7 @@ msgstr "Web имя пользователя"
 msgid "Web password successfully recovered, please re-login."
 msgstr "Web пароль успешно восстановлен, пожалуйста войдите повторно."
 
-#: lib/NGCP/Panel/Controller/Billing.pm:774
+#: lib/NGCP/Panel/Controller/Billing.pm:742
 #: lib/NGCP/Panel/Utils/DbStrings.pm:473
 msgid "Wednesday"
 msgstr "Среда"