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.
gjungwirth/voicemail_number
Irina Peshinskaya 11 years ago
parent 76b059fae7
commit 2f67a948ac

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

@ -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))),
)

Loading…
Cancel
Save