From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Fri, 19 Aug 2011 08:04:08 +0000 (+0200)
Subject: Due date should be preserved on purchase invoice edition start.
X-Git-Tag: v2.4.2~19^2~375
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=571c4b723869faf700dc7e3a0b1992df7b2bdae4;p=fa-stable.git

Due date should be preserved on purchase invoice edition start.
---

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index a7282c47..33cfd871 100644
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -32,6 +32,16 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
 
 	$myrow = db_fetch($result);
 
+    if ($supp_trans->tran_date == "")
+    {
+		$supp_trans->tran_date = Today();
+
+		if (!is_date_in_fiscalyear($supp_trans->tran_date))
+			$supp_trans->tran_date = end_fiscalyear();
+	}
+	if ($supp_trans->supplier_id != $supplier_id)
+	    get_duedate_from_terms($supp_trans);
+
     $supp_trans->supplier_id = $supplier_id;
     $supp_trans->tax_included = $myrow['tax_included'];
     $supp_trans->tax_algorithm = $supp_trans->stored_algorithm = $myrow['tax_algorithm'];
@@ -46,16 +56,6 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
 	$supp_trans->tax_description = $myrow['tax_group_name'];
 	$supp_trans->tax_group_id = $myrow['tax_group_id'];
 
-    if ($supp_trans->tran_date == "")
-    {
-		$supp_trans->tran_date = Today();
-		if (!is_date_in_fiscalyear($supp_trans->tran_date))
-			$supp_trans->tran_date = end_fiscalyear();
-	}
-    //if ($supp_trans->due_date=="") {
-    //	get_duedate_from_terms($supp_trans);
-    //}
-    get_duedate_from_terms($supp_trans);
 }
 
 //--------------------------------------------------------------------------------------------------