X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=14953a2fbaff67d984ff397c4b6f262e815b41db;hb=7618d9d62ee39a932f56565a4ce25d965bf53462;hp=e677cf3accf21bb20b3592a6f8b0b10ff26e0539;hpb=128be63f9ae68744f37eae8072f95d0f524f86b4;p=fa-stable.git

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index e677cf3a..14953a2f 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -109,6 +109,9 @@ function invoice_header(&$supp_trans)
 		$supp_trans->clear_items();
 		read_supplier_details_to_trans($supp_trans, $_POST['supplier_id']);
 		copy_from_trans($supp_trans);
+		$supp_trans->due_date = get_payment_due_date($supp_trans->terms, $supp_trans->tran_date);
+		$_POST['due_date'] = $supp_trans->due_date;
+		$Ajax->activate('due_date');
 	}
 
    	date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true);
@@ -127,7 +130,7 @@ function invoice_header(&$supp_trans)
 	if (isset($_POST['_tran_date_changed'])) {
 		$Ajax->activate('_ex_rate');
 		$supp_trans->tran_date = $_POST['tran_date'];
-		get_duedate_from_terms($supp_trans);
+		$supp_trans->due_date = get_payment_due_date($supp_trans->terms, $supp_trans->tran_date);
 		$_POST['due_date'] = $supp_trans->due_date;
 		$Ajax->activate('due_date');
 	}
@@ -573,26 +576,3 @@ function display_grn_items(&$supp_trans, $mode=0)
 
 	return $total_grn_value;
 }
-
-//--------------------------------------------------------------------------------------------------
-function get_duedate_from_terms(&$trans)
-{
-	$date = $trans->tran_date;
-
-	if (!is_date($date))
-	{
-		$date = Today();
-	}
-	if ($trans->terms['type'] == PTT_FOLLOWING)
-	{ /*Its a day in the following month when due */
-		$trans->due_date =
-			add_days(end_month($date), $trans->terms["days"]);
-	}
-	else
-	{ /*Use the Days Before Due to add to the invoice date */
-		$trans->due_date = add_days($date, $trans->terms["days"]);
-	}
-}
-
-//--------------------------------------------------------------------------------------------------
-