From 4494b13c6e199e68ca38e20f5b88e2e7e81f55b9 Mon Sep 17 00:00:00 2001
From: Irina Peshinskaya <ipeshinskaya@gmail.com>
Date: Sat, 10 May 2014 20:33:21 +0300
Subject: [PATCH] MT#5879 Intermediate state before start datepeacker field.

---
 lib/NGCP/Panel/Form/Invoice/Generate.pm | 2 +-
 share/static/js/modalAjax.js            | 2 +-
 share/templates/invoice/list.tt         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/NGCP/Panel/Form/Invoice/Generate.pm b/lib/NGCP/Panel/Form/Invoice/Generate.pm
index bd0f3b12f0..eef1975a14 100644
--- a/lib/NGCP/Panel/Form/Invoice/Generate.pm
+++ b/lib/NGCP/Panel/Form/Invoice/Generate.pm
@@ -49,7 +49,7 @@ has_field 'end' => (
 );
 
 has_field 'save' => (
-    type => 'Submit',
+    type => 'Button',
     value => 'Generate',
     element_class => [qw/btn btn-primary/],
     do_label => 0,
diff --git a/share/static/js/modalAjax.js b/share/static/js/modalAjax.js
index 9c17994650..3cc312364f 100644
--- a/share/static/js/modalAjax.js
+++ b/share/static/js/modalAjax.js
@@ -22,8 +22,8 @@ function refreshMessagesAjax (  ){
 }
 function processModalFormAjax( form, callback ) {
     //preventDefault();
-    //alert(form.attr('action')+'?'+form.serialize());
     var item = form.attr('id');
+    //alert(form.attr('action')+'?'+form.serialize()+';itemname='+item+';');
     $.ajax( {
         url: form.attr('action'),
         type: "POST",
diff --git a/share/templates/invoice/list.tt b/share/templates/invoice/list.tt
index d71b24ea89..ff0363b353 100644
--- a/share/templates/invoice/list.tt
+++ b/share/templates/invoice/list.tt
@@ -9,8 +9,7 @@
 [%PROCESS 'helpers/modal.tt' -%]
 [%mf_helper = {
     ajax_load         => 1,
-    ajax_list_refresh => 'template',
- }%]
+}%]
 [%modal_script( m = mf_helper )%]
 
 [% site_config.title = c.loc('Invoices for [_1]', provider.name ) -%]
@@ -85,8 +84,8 @@ function applyClientFilter(table,tr,contact_id){
         { name => 'contracts.status', title => c.loc('Status'), search => 1 },
     ];
     helper.dt_buttons = [
-        { name => c.loc('Generate invoice'), uri => 'javascript:void(0);', onclick => "fetch_into(\\'invoice_generate_form\\', \\'" _ c.uri_for_action('/invoice/invoice_generate', [ provider.id]) _ "\\',\\'item=invoice_generate&client_contract_id='+full.contracts_id+'\\',function(){modalFormScript();});void(0);", class => 'btn-small btn-primary', icon => 'icon-star' },
         { name => c.loc('Filter invoices'), uri=>'javascript:void(0);', onclick => "applyClientFilter(\\'\\',\$(this).closest(\\'tr\\'),'+full.id+');", class => 'btn-small btn-primary', icon => 'icon-glass', tooltip => 'Click twice to clear client filter.' },
+        { name => c.loc('Generate invoice'), uri => 'javascript:void(0);', onclick => "fetch_into(\\'invoice_generate_form\\', \\'" _ c.uri_for_action('/invoice/invoice_generate', [ provider.id]) _ "\\',\\'item=invoice_generate&client_contract_id='+full.contracts_id+'\\',function(){modalFormScript();});void(0);", class => 'btn-small btn-primary', icon => 'icon-star' },
     ];
     helper.identifier = 'provider_client_list_ajax';
     helper.ajax_uri = c.uri_for_action( '/invoice/ajax_datatables_data', [ provider.id, 'provider_client_list' ] ) ;
@@ -121,7 +120,8 @@ function applyClientFilter(table,tr,contact_id){
         { name => 'contract_balances.contract.contact.reseller.name'},
         { name => 'contract_balances.contract.contact.id', title => c.loc('Client'), search => 1},
         { name => 'contract_balances.contract.id', title => c.loc('Contract'), search => 1},
-        { name => 'contract_balances.invoice_id', title => c.loc('Invoice #'), search => 1},
+        { name => 'contract_balances.invoice_id', title => c.loc('Invoice Id'), search => 1},
+        { name => 'contract_balances.invoice.serial', title => c.loc('Invoice #'), search => 1},
         { name => 'contract_balances.start', title => c.loc('Period Start'), search_from_epoch => 1, search_to_epoch => 1, search_use_datetime => 1 },
         { name => 'contract_balances.end', title => c.loc('Period End')},
         { name => 'contract_balances.cash_balance', title => c.loc('Cash balance')},