X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=0fad0e6eddfc06f0d06b5072da58049106f129d5;hb=2383d33373d6ddec06906658a0ed6398077c1147;hp=9341a11cc1f403771899605fd9dd0d2bc726fc16;hpb=66626dafdf0a397406e36663f3ed15321d09984a;p=fa-stable.git diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 9341a11c..0fad0e6e 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security=5; $path_to_root=".."; @@ -49,8 +58,10 @@ if (isset($_GET['AddedID'])) display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1); - hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1"); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1"); + hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no"); + display_footer_exit(); } @@ -82,7 +93,7 @@ function clear_fields() unset($_POST['amount']); unset($_POST['memo_']); unset($_POST['AddGLCodeToTrans']); - $Ajax->activate('gl_ctrls'); + $Ajax->activate('gl_items'); set_focus('gl_code'); } //------------------------------------------------------------------------------------------------ @@ -119,6 +130,12 @@ if (isset($_POST['AddGLCodeToTrans'])){ } } + if (!is_tax_gl_unique(get_post('gl_code'))) { + display_error(_("Cannot post to GL account used by more than one tax type.")); + set_focus('gl_code'); + $input_error = true; + } + if ($input_error == false) { $_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name, @@ -178,7 +195,11 @@ function check_data() return false; } - $sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id='" . $_SESSION['supp_trans']->supplier_id . "' AND supp_reference='" . $_POST['supp_reference'] . "'"; + $sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id='" + . $_SESSION['supp_trans']->supplier_id . "' AND supp_reference='" + . $_POST['supp_reference'] + . "' AND ov_amount!=0"; // ignore voided invoice references + $result=db_query($sql,"The sql to check for the previous entry of the same invoice failed"); $myrow = db_fetch_row($result); @@ -263,12 +284,11 @@ function check_item_data($n) return true; } -$id = find_submit('grn_item_id'); -if ($id != -1) +function commit_item_data($n) { - if (check_item_data($id)) + if (check_item_data($n)) { - if (input_num('this_quantity_inv'.$id) >= ($_POST['qty_recd'.$id] - $_POST['prev_quantity_inv'.$id])) + if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n])) { $complete = true; } @@ -277,79 +297,58 @@ if ($id != -1) $complete = false; } - $_SESSION['supp_trans']->add_grn_to_trans($id, $_POST['po_detail_item'.$id], - $_POST['item_code'.$id], $_POST['item_description'.$id], $_POST['qty_recd'.$id], - $_POST['prev_quantity_inv'.$id], input_num('this_quantity_inv'.$id), - $_POST['order_price'.$id], input_num('ChgPrice'.$id), $complete, - $_POST['std_cost_unit'.$id], ""); + $_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], ""); } } -//-------------------------------------------------------------------------------------------------- -$id = find_submit('Delete'); -if ($id != -1) -{ - $_SESSION['supp_trans']->remove_grn_from_trans($id); - $Ajax->activate('grn_items'); - $Ajax->activate('grn_table'); - $Ajax->activate('inv_tot'); -} +//----------------------------------------------------------------------------------------- -$id = find_submit('Delete2'); +$id = find_submit('grn_item_id'); if ($id != -1) { - $_SESSION['supp_trans']->remove_gl_codes_from_trans($id); - clear_fields(); - $Ajax->activate('gl_items'); - $Ajax->activate('inv_tot'); -} - -start_form(false, true); - -start_table("$table_style2 width=98%", 8); -echo "