X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_invoice.php;h=5302ee670e774011182c69145e0670d2f8304802;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=28f7f33b982c9846f6e4f2e1759e751b901e1532;hpb=0517097815894f0221e3755a2d14612f69f72b86;p=fa-stable.git diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 28f7f33b..5302ee67 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = 'SA_SUPPLIERINVOICE'; +$path_to_root = ".."; include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); @@ -18,23 +27,10 @@ if ($use_date_picker) $js .= get_js_date_picker(); page(_("Enter Supplier Invoice"), false, false, "", $js); - //---------------------------------------------------------------------------------------- check_db_has_suppliers(_("There are no suppliers defined in the system.")); -//--------------------------------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - // return from supplier editor - copy_from_trans($_SESSION['supp_trans']); - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; -} -if (isset($_POST['_supplier_id_editor'])) { - copy_to_trans($_SESSION['supp_trans']); - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'supp_trans'); -} - //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -49,6 +45,8 @@ if (isset($_GET['AddedID'])) display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1); + hyperlink_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice")); + 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"); @@ -84,7 +82,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'); } //------------------------------------------------------------------------------------------------ @@ -121,6 +119,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, @@ -180,7 +184,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); @@ -265,12 +273,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; } @@ -279,79 +286,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 "