From 2f67a948acb9826fda0ac2d333fae832df35d8bb Mon Sep 17 00:00:00 2001 From: Irina Peshinskaya Date: Tue, 17 Jun 2014 08:25:38 +0300 Subject: [PATCH] MT#5879 Contract buttons and generate_invoice. Remove contract buttons from Reseller form work. Fix generate_invoice error found in run on clean new vm. --- lib/NGCP/Panel/Controller/Contract.pm | 3 --- share/tools/generate_invoices.pl | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/NGCP/Panel/Controller/Contract.pm b/lib/NGCP/Panel/Controller/Contract.pm index 8ac1f9c482..a29470ab87 100644 --- a/lib/NGCP/Panel/Controller/Contract.pm +++ b/lib/NGCP/Panel/Controller/Contract.pm @@ -406,9 +406,6 @@ sub reseller_create :Chained('reseller_list') :PathPart('create') :Args(0) { form => $form, fields => {'contact.create' => $c->uri_for('/contact/create/noreseller'), 'billing_profile.create' => $c->uri_for('/billing/create/noreseller'), - 'subscriber_email_template.create' => $c->uri_for('/emailtemplate/create'), - 'passreset_email_template.create' => $c->uri_for('/emailtemplate/create'), - 'invoice_email_template.create' => $c->uri_for('/emailtemplate/create'), }, back_uri => $c->req->uri, ); diff --git a/share/tools/generate_invoices.pl b/share/tools/generate_invoices.pl index 2828a4be51..5216f6a905 100644 --- a/share/tools/generate_invoices.pl +++ b/share/tools/generate_invoices.pl @@ -108,7 +108,7 @@ sub process_invoices{ '.ifp(' where ', join(' and ', !$opt->{resend}?' invoices.sent_date is null ':(), - (ify(' contracts.contract_id ', (@{$opt->{client_contract_id}}, $client_contract->{id}) )), + (ify(' contracts.id ', (@{$opt->{client_contract_id}}, $client_contract->{id}) )), (ifk(' date(invoices.period_start) >= ?', v2a($stime->ymd))), (ifk(' date(invoices.period_start) <= ?', v2a($etime->ymd))), )