From 45aa0f7f7e8a8683305bbdbc58fdb3b791d2115e Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 6 Jul 2019 20:49:17 +0200 Subject: [PATCH 1/1] Code cleanup in supplier_invoice.php and supplier_credit.php --- purchasing/includes/supp_trans_class.inc | 2 +- purchasing/includes/ui/invoice_ui.inc | 1 - purchasing/supplier_credit.php | 3 +-- purchasing/supplier_invoice.php | 12 +----------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc index 8a70e414..be9ec00d 100644 --- a/purchasing/includes/supp_trans_class.inc +++ b/purchasing/includes/supp_trans_class.inc @@ -74,7 +74,7 @@ class supp_trans function add_grn_to_trans($grn_item_id, $po_detail_item, $item_code, $item_description, $qty_recd, $prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price, - $std_cost_unit, $gl_code) + $std_cost_unit=null, $gl_code='') { $this->grn_items[$grn_item_id] = new grn_item($grn_item_id, $po_detail_item, $item_code, $item_description, $qty_recd, $prev_quantity_inv, $this_quantity_inv, diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index d6258d28..e21c1adf 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -393,7 +393,6 @@ function display_grn_items_for_selection(&$supp_trans, $k) hidden('item_description'.$n, $myrow["description"]); hidden('prev_quantity_inv'.$n, $myrow['quantity_inv']); hidden('order_price'.$n, $myrow['unit_price']); - hidden('std_cost_unit'.$n, $myrow['std_cost_unit']); hidden('po_detail_item'.$n, $myrow['po_detail_item']); label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]), "nowrap align='right'"); label_cell($myrow["item_code"]); diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index b7e30fce..461c8044 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -282,8 +282,7 @@ function commit_item_data($n) $_POST['po_detail_item'.$n], $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n], $_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n), - $_POST['order_price'.$n], input_num('ChgPrice'.$n), - $_POST['std_cost_unit'.$n], ""); + $_POST['order_price'.$n], input_num('ChgPrice'.$n)); reset_tax_input(); } } diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index a21d0c91..0dc1a77a 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -295,20 +295,10 @@ function commit_item_data($n) { if (check_item_data($n)) { - if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n])) - { - $complete = true; - } - else - { - $complete = false; - } - $_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n], $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n], $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n), - $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete, - $_POST['std_cost_unit'.$n], ""); + $_POST['order_price'.$n], input_num('ChgPrice'.$n)); reset_tax_input(); } } -- 2.30.2