X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcreate_recurrent_invoices.php;h=dcc9cffe44c4c11b3ab491cf18ac1707894b55ff;hb=55bddc51260dc87dba6e3217e2117cc760346306;hp=c38a3ae3387ad37bf2d7d7d8e19598747037afc6;hpb=f594502f92947a070eaf0cef9b9fdf765030c5fa;p=fa-stable.git

diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php
index c38a3ae3..dcc9cffe 100644
--- a/sales/create_recurrent_invoices.php
+++ b/sales/create_recurrent_invoices.php
@@ -23,13 +23,6 @@ if ($use_popup_windows)
 
 page(_($help_context = "Create and Print Recurrent Invoices"), false, false, "", $js);
 
-function set_last_sent($id, $date)
-{
-	$date = date2sql($date);
-	$sql = "UPDATE ".TB_PREF."recurrent_invoices SET last_sent='$date' WHERE id=".db_escape($id);
-   	db_query($sql,"The recurrent invoice could not be updated or added");
-}	
-
 function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no)
 {
 	global $Refs;
@@ -42,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='';
 
@@ -55,7 +48,7 @@ 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);
-	set_last_sent($tmpl_no, $cart->document_date);
+	update_last_sent_recurrent_invoice($tmpl_no, $cart->document_date);
 	return $invno;
 }
 
@@ -65,10 +58,7 @@ if (isset($_GET['recurrent']))
 	if (is_date_in_fiscalyear($date))
 	{
 		$invs = array();
-		$sql = "SELECT * FROM ".TB_PREF."recurrent_invoices WHERE id=".db_escape($_GET['recurrent']);
-
-		$result = db_query($sql,"could not get recurrent invoice");
-		$myrow = db_fetch($result);
+		$myrow = get_recurrent_invoice($_GET['recurrent']);
 		if ($myrow['debtor_no'] == 0)
 		{
 			$cust = get_cust_branches_from_group($myrow['group_no']);
@@ -91,7 +81,7 @@ if (isset($_GET['recurrent']))
 		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' => "",
+			$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; 
@@ -100,21 +90,11 @@ if (isset($_GET['recurrent']))
 	}
 	else
 		display_error(_("The entered date is not in fiscal year."));
-}	
-
-//-------------------------------------------------------------------------------------------------
-function get_sales_group_name($group_no)
-{
-	$sql = "SELECT description FROM ".TB_PREF."groups WHERE id = ".db_escape($group_no);
-	$result = db_query($sql, "could not get group");
-	$row = db_fetch($result);
-	return $row[0];
 }
 
-$sql = "SELECT * FROM ".TB_PREF."recurrent_invoices ORDER BY description, group_no, debtor_no";
-$result = db_query($sql,"could not get recurrent invoices");
+$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;
@@ -170,7 +150,7 @@ if ($due)
 else
 	display_note(_("No recurrent invoices are due."), 1, 0);
 
-echo '<br>';
+br();
 
 end_page();
 ?>