From 1c502501a16dbb08e3f031e3c3a3038540c8b296 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Tue, 6 Oct 2020 14:08:00 +0200 Subject: [PATCH] [0005190] Supplier Invoices: customer reference field was unnecessary cleared on supplier selection change. Fixed. --- purchasing/includes/db/invoice_db.inc | 8 +++++--- purchasing/includes/ui/invoice_ui.inc | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 06d5c877..5085b57d 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -39,10 +39,7 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id) 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->supplier_name = $myrow['supp_name']; $supp_trans->terms = array( @@ -50,6 +47,11 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id) 'days_before_due' => $myrow['days_before_due'], 'day_in_following_month' => $myrow['day_in_following_month'] ); + if ($supp_trans->supplier_id != $supplier_id) + get_duedate_from_terms($supp_trans); + + $supp_trans->supplier_id = $supplier_id; + $supp_trans->credit = $myrow['cur_credit']; $supp_trans->tax_description = $myrow['tax_group_name']; diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index fc779227..4630ca55 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -103,6 +103,7 @@ function invoice_header(&$supp_trans) } if ($supp_trans->supplier_id != $_POST['supplier_id']) { + copy_to_trans($supp_trans); // supplier has changed // delete all the order items - drastic but necessary because of // change of currency, etc -- 2.30.2