diff --git a/lib/NGCP/Panel/Controller/Invoice.pm b/lib/NGCP/Panel/Controller/Invoice.pm index 88fdce7510..5144ad6293 100644 --- a/lib/NGCP/Panel/Controller/Invoice.pm +++ b/lib/NGCP/Panel/Controller/Invoice.pm @@ -17,7 +17,7 @@ use NGCP::Panel::Utils::Message; use NGCP::Panel::Form::Invoice::Template; use NGCP::Panel::Form::Invoice::Generate; use NGCP::Panel::Form::Invoice::Send; -#use NGCP::Panel::Form::Invoice::Basic; +use NGCP::Panel::Form::Invoice::Basic; use NGCP::Panel::Model::DB::InvoiceTemplate; use NGCP::Panel::Utils::InvoiceTemplate; diff --git a/lib/NGCP/Panel/Form/Invoice/Basic.pm b/lib/NGCP/Panel/Form/Invoice/Basic.pm index 43a178b8e4..6e190231c2 100644 --- a/lib/NGCP/Panel/Form/Invoice/Basic.pm +++ b/lib/NGCP/Panel/Form/Invoice/Basic.pm @@ -40,7 +40,7 @@ has_field 'save' => ( has_field 'client_contract_id' => ( type => 'Hidden', - required => 1, + required => 0, ); has_block 'fields' => ( diff --git a/share/templates/invoice/list.tt b/share/templates/invoice/list.tt index e473e444ea..35e2ecd9ed 100644 --- a/share/templates/invoice/list.tt +++ b/share/templates/invoice/list.tt @@ -86,6 +86,7 @@ function sendInvoiceForm(invoice_id){ ); } function deleteInvoice(invoice_id,table_name){ + //alert('table_name='+table_name+';'); fetch_into('messages', '[%c.uri_for_action("/invoice/invoice_delete", [ provider.id ] )%]', 'invoice_id='+invoice_id, @@ -199,7 +200,7 @@ function deleteInvoice(invoice_id,table_name){ }, { name = c.loc('Delete'), - uri = "javascript:deleteInvoice(\\''+full.contract_balances_invoice_id+'\\',\\'" _ helper.identifier _ "\\');void(0);", + uri = "javascript:deleteInvoice(\\''+full.contract_balances_invoice_id+'\\',\\'" _ helper.identifier _ "_table\\');void(0);", class = 'btn-small btn-secondary', icon = 'icon-trash', attributes= ' cancel-hide="1"'