X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcreate_recurrent_invoices.php;h=a8f817bbd0d4ca2035bc30def17bc6611eebcdf1;hb=de09a35c9e55aceaf1c71052cbb40f44e4b3bbc7;hp=ee92d03b9327e5d472125473a626a369b5595be7;hpb=d3a403292485062b56c5bfd9daeadd5185ecc7ed;p=fa-stable.git

diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php
index ee92d03b..a8f817bb 100644
--- a/sales/create_recurrent_invoices.php
+++ b/sales/create_recurrent_invoices.php
@@ -20,6 +20,8 @@ include_once($path_to_root . "/reporting/includes/reporting.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 600);
+if ($use_date_picker)
+	$js .= get_js_date_picker();
 
 page(_($help_context = "Create and Print Recurrent Invoices"), false, false, "", $js);
 
@@ -37,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];
@@ -48,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;
 }
@@ -61,11 +70,15 @@ function calculate_from($myrow)
 	return $from;	
 }
 
+if (!isset($_POST['date'])) {
+  $_POST['date'] = Today();
+}
+
 $id = find_submit("create");
 if ($id != -1)
 {
 	$Ajax->activate('_page_body');
-	$date = Today();
+	$date = $_POST['date'];
 	if (is_date_in_fiscalyear($date))
 	{
 		$invs = array();
@@ -98,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);
@@ -111,11 +124,17 @@ if ($id != -1)
 $result = get_recurrent_invoices();
 
 start_form();
-start_table(TABLESTYLE, "width=70%");
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+date_cells(_("Invoice date:"), 'date', '');
+end_row();
+end_table();
+
+start_table(TABLESTYLE, "width='70%'");
 $th = array(_("Description"), _("Template No"),_("Customer"),_("Branch")."/"._("Group"),_("Days"),_("Monthly"),_("Begin"),_("End"),_("Last Created"),"");
 table_header($th);
 $k = 0;
-$today = add_days(Today(), 1);
+$today = add_days($_POST['date'], 1);
 $due = false;
 while ($myrow = db_fetch($result)) 
 {