X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcreate_recurrent_invoices.php;h=0db31150c409ca2d00228c16bafc1e53ae3d8a95;hb=879a85f0d6bab6e938c816d6b6a615e18c6b2101;hp=fc4312c603e0fa56ddc66ee35bd2c8483abac24f;hpb=8b8b7b7bf582261ad886aa0ef0d521576635c2c8;p=fa-stable.git diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php index fc4312c6..0db31150 100644 --- a/sales/create_recurrent_invoices.php +++ b/sales/create_recurrent_invoices.php @@ -39,7 +39,9 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no $doc->due_date = get_invoice_duedate($doc->payment, $doc->document_date); $doc->reference = $Refs->get_next($doc->trans_type); - $doc->Comments = sprintf(_("Recurrent Invoice covers period %s - %s."), $from, add_days($to, -1)); + if ($doc->Comments != "") + $doc->Comments .= "\n"; + $doc->Comments .= sprintf(_("Recurrent Invoice covers period %s - %s."), $from, add_days($to, -1)); foreach ($doc->line_items as $line_no=>$item) { $line = &$doc->line_items[$line_no]; @@ -50,6 +52,11 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no $cart->trans_type = ST_SALESINVOICE; $cart->reference = $Refs->get_next($cart->trans_type); $invno = $cart->write(1); + if ($invno == -1) + { + display_error(_("The entered reference is already in use.")); + display_footer_exit(); + } update_last_sent_recurrent_invoice($tmpl_no, $to); return $invno; } @@ -104,7 +111,7 @@ if ($id != -1) if (count($invs) > 0) { $ar = array('PARAM_0' => $min."-".ST_SALESINVOICE, 'PARAM_1' => $max."-".ST_SALESINVOICE, 'PARAM_2' => "", - 'PARAM_3' => 0, 'PARAM_4' => 0, 'PARAM_5' => "", 'PARAM_6' => ST_SALESINVOICE); + 'PARAM_3' => 0, 'PARAM_4' => 0, 'PARAM_5' => "", 'PARAM_6' => $def_print_orientation); display_note(print_link(sprintf(_("&Print Recurrent Invoices # %s - # %s"), $min, $max), 107, $ar), 0, 1); $ar['PARAM_3'] = 1; // email display_note(print_link(sprintf(_("&Email Recurrent Invoices # %s - # %s"), $min, $max), 107, $ar), 0, 1);