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 a7282c470312780c1a5cc06d8f77e58d751110a7..33cfd8710fd31f0c8cc4d263f0513492fef4380c 100644 (file)
--- 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);
 }
 
 //--------------------------------------------------------------------------------------------------