From c001557f8ebee630494c6323477bd865a61942d9 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 19 Mar 2019 21:40:45 +0100 Subject: [PATCH] No edit in supplier invoice quick entry fixed. @Braath Waate. --- purchasing/includes/ui/invoice_ui.inc | 8 +++++--- purchasing/supplier_invoice.php | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index 93524a4b..7805faec 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -199,8 +199,9 @@ function invoice_totals(&$supp_trans) function display_gl_controls(&$supp_trans, $k) { $accs = get_supplier_accounts($supp_trans->supplier_id); - $_POST['gl_code'] = $accs['purchase_account'] ? - $accs['purchase_account'] : get_company_pref('default_cogs_act'); + if (!isset($_POST['gl_code'])) + $_POST['gl_code'] = $accs['purchase_account'] ? + $accs['purchase_account'] : get_company_pref('default_cogs_act'); alt_table_row_color($k); echo gl_all_accounts_list('gl_code', null, true, true); @@ -316,7 +317,8 @@ function display_gl_items(&$supp_trans, $mode=0) { delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"), _('Remove line from document')); - label_cell(""); + edit_button_cell("Edit" . $entered_gl_code->Counter, _("Edit"), + _('Edit line from document')); } end_row(); if ($mode > 1) { diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 080e8fc3..a21d0c91 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -352,6 +352,20 @@ if ($id4 != -1) $Ajax->activate('gl_items'); } +$id5 = find_submit('Edit'); +if ($id5 != -1) +{ + $_POST['gl_code'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_code; + $_POST['dimension_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim; + $_POST['dimension2_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim2; + $_POST['amount'] = $_SESSION['supp_trans']->gl_codes[$id5]->amount; + $_POST['memo_'] = $_SESSION['supp_trans']->gl_codes[$id5]->memo_; + + $_SESSION['supp_trans']->remove_gl_codes_from_trans($id5); + reset_tax_input(); + $Ajax->activate('gl_items'); +} + $id2 = -1; if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) { -- 2.30.2