Transaction references extended with parametrized patterns, added check_reference...

[fa-stable.git] / sales / create_recurrent_invoices.php

diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php
index 0db31150c409ca2d00228c16bafc1e53ae3d8a95..de93bd5c7d968e669c8bdb6672df84276b54e97b 100644 (file)
--- a/sales/create_recurrent_invoices.php
+++ b/sales/create_recurrent_invoices.php
@@ -18,9 +18,9 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 600);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 page(_($help_context = "Create and Print Recurrent Invoices"), false, false, "", $js);
@@ -38,7 +38,8 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no
        $doc->document_date = $date; 
 
        $doc->due_date = get_invoice_duedate($doc->payment, $doc->document_date);
-       $doc->reference = $Refs->get_next($doc->trans_type);
+       $doc->reference = $Refs->get_next($doc->trans_type, null, array('customer' => $customer_id, 'branch' => $branch_id,
+               'date' => $date));
        if ($doc->Comments != "")
                $doc->Comments .= "\n";
        $doc->Comments .= sprintf(_("Recurrent Invoice covers period %s - %s."), $from, add_days($to, -1));
@@ -50,7 +51,8 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no
        }       
        $cart = $doc;
        $cart->trans_type = ST_SALESINVOICE;
-       $cart->reference = $Refs->get_next($cart->trans_type);
+       $cart->reference = $Refs->get_next($cart->trans_type, null, array('customer' => $customer_id, 'branch' => $branch_id,
+               'date' => $date));
        $invno = $cart->write(1);
        if ($invno == -1)
        {
@@ -111,14 +113,14 @@ 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' => $def_print_orientation);
+                               'PARAM_3' => 0, 'PARAM_4' => 0, 'PARAM_5' => "", 'PARAM_6' => user_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);
                }
        }
        else
-               display_error(_("The entered date is not in fiscal year."));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 }
 
 $result = get_recurrent_invoices();
@@ -130,7 +132,7 @@ date_cells(_("Invoice date:"), 'date', '');
 end_row();
 end_table();
 
-start_table(TABLESTYLE, "width=70%");
+start_table(TABLESTYLE, "width='70%'");
 $th = array(_("Description"), _("Template No"),_("Customer"),_("Branch")."/"._("Group"),_("Days"),_("Monthly"),_("Begin"),_("End"),_("Last Created"),"");
 table_header($th);
 $k = 0;
@@ -187,4 +189,3 @@ else
 br();
 
 end_page();
-?>