X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcreate_recurrent_invoices.php;h=dcc9cffe44c4c11b3ab491cf18ac1707894b55ff;hb=9b7ac7414c4ec6b3284adb22876cd5142ac78fa3;hp=309f50f61a0dc7df76437a2a0b7a260538f40d3e;hpb=963bc21ea092322d5750d4c0914b5e532e7d2467;p=fa-stable.git

diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php
index 309f50f6..dcc9cffe 100644
--- a/sales/create_recurrent_invoices.php
+++ b/sales/create_recurrent_invoices.php
@@ -35,7 +35,7 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no
 	$doc->trans_no = 0;
 	$doc->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day
 
-	$doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
+	$doc->due_date = get_invoice_duedate($doc->payment, $doc->document_date);
 	$doc->reference = $Refs->get_next($doc->trans_type);
 	//$doc->Comments='';
 
@@ -54,41 +54,47 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no
 
 if (isset($_GET['recurrent']))
 {
-	$invs = array();
-	$myrow = get_recurrent_invoice($_GET['recurrent']);
-	if ($myrow['debtor_no'] == 0)
+	$date = Today();
+	if (is_date_in_fiscalyear($date))
 	{
-		$cust = get_cust_branches_from_group($myrow['group_no']);
-		while ($row = db_fetch($cust))
+		$invs = array();
+		$myrow = get_recurrent_invoice($_GET['recurrent']);
+		if ($myrow['debtor_no'] == 0)
 		{
-			$invs[] = create_recurrent_invoices($row['debtor_no'], $row['branch_code'], $myrow['order_no'], $myrow['id']);
-		}	
+			$cust = get_cust_branches_from_group($myrow['group_no']);
+			while ($row = db_fetch($cust))
+			{
+				$invs[] = create_recurrent_invoices($row['debtor_no'], $row['branch_code'], $myrow['order_no'], $myrow['id']);
+			}	
+		}
+		else
+		{
+			$invs[] = create_recurrent_invoices($myrow['debtor_no'], $myrow['group_no'], $myrow['order_no'], $myrow['id']);
+		}
+		if (count($invs) > 0)
+		{
+			$min = min($invs);
+			$max = max($invs);
+		}
+		else 
+			$min = $max = 0;
+		display_notification(sprintf(_("%s recurrent invoice(s) created, # $min - # $max."), count($invs)));
+		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);
+			display_note(print_link(_("&Print Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1);
+			$ar['PARAM_3'] = 1; 
+			display_note(print_link(_("&Email Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1);
+		}
 	}
 	else
-	{
-		$invs[] = create_recurrent_invoices($myrow['debtor_no'], $myrow['group_no'], $myrow['order_no'], $myrow['id']);
-	}
-	if (count($invs) > 0)
-	{
-		$min = min($invs);
-		$max = max($invs);
-	}
-	else 
-		$min = $max = 0;
-	display_notification(sprintf(_("%s recurrent invoice(s) created, # $min - # $max."), count($invs)));
-	if (count($invs) > 0)
-	{
-		$ar = array('PARAM_0' => $min,	'PARAM_1' => $max, 'PARAM_2' => "",
-			'PARAM_3' => 0,	'PARAM_4' => 0,	'PARAM_5' => "", 'PARAM_6' => ST_SALESINVOICE);
-		display_note(print_link(_("&Print Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1);
-		$ar['PARAM_3'] = 1; 
-		display_note(print_link(_("&Email Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1);
-	}
-}	
+		display_error(_("The entered date is not in fiscal year."));
+}
 
 $result = get_recurrent_invoices();
 
-start_table("$table_style 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;