MT#5879 Fix invoice deletion after conditional fields.

ipeshinskaya/InvoiceTemplate5
Irina Peshinskaya 12 years ago committed by Victor Seva
parent 749f143cb7
commit 088ca06ea7

@ -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;

@ -40,7 +40,7 @@ has_field 'save' => (
has_field 'client_contract_id' => (
type => 'Hidden',
required => 1,
required => 0,
);
has_block 'fields' => (

@ -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"'

Loading…
Cancel
Save