X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=2f99a616529a6f7332b8c7973f4a900dfa2b4a52;hb=6425de92749015d0e7ab29b5fd071a9d70cbb7d5;hp=d0bd3fa65226334b9a8981283ab010251d84648f;hpb=fbb7a3d6150e02e442bd763a717915649fb43437;p=fa-stable.git diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index d0bd3fa6..2f99a616 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -1,13 +1,13 @@ . + See the License here . ***********************************************************************/ //-------------------------------------------------------------------------------------------------- @@ -63,11 +63,20 @@ function invoice_header(&$supp_trans) table_section(1); - if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all())) - $_POST['supplier_id'] = get_global_supplier(); - - supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true); + if (isset($_POST['invoice_no'])) + { + $trans = get_supp_trans($_POST['invoice_no'], 20); + $_POST['supplier_id'] = $trans['supplier_id']; + $supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode']; + label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false)); + } + else + { + if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all())) + $_POST['supplier_id'] = get_global_supplier(); + supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true); + } if ($supp_trans->supplier_id != $_POST['supplier_id']) { // supplier has changed @@ -83,11 +92,16 @@ function invoice_header(&$supp_trans) else ref_row(_("Reference:"), 'reference', '', references::get_next(21)); - text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20); + if (isset($_POST['invoice_no'])) + { + label_row(_("Supplier's Ref.:"), $_POST['invoice_no'].hidden('invoice_no', $_POST['invoice_no'], false).hidden('supp_reference', $_POST['invoice_no'], false)); + } + else + text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20); table_section(2, "33%"); - date_row(_("Date") . ":", 'tran_date', '', null, 0, 0, 0, "", true); + date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true); if (isset($_POST['_tran_date_changed'])) { $Ajax->activate('_ex_rate'); $supp_trans->tran_date = $_POST['tran_date']; @@ -114,7 +128,7 @@ function invoice_header(&$supp_trans) label_row(_("Tax Group:"), $supp_trans->tax_description); - end_outer_table(); + end_outer_table(1); } //-------------------------------------------------------------------------------------------------- @@ -181,7 +195,7 @@ function display_gl_controls(&$supp_trans, $k) function display_gl_items(&$supp_trans, $mode=0) { - global $table_style, $path_to_root; + global $table_style, $path_to_root, $Ajax; // if displaying in form, and no items, exit if (($mode == 2 || $mode == 3) && count($supp_trans->gl_codes) == 0) @@ -194,8 +208,35 @@ function display_gl_items(&$supp_trans, $mode=0) else $heading = _("GL Items for this Credit Note"); + start_outer_table("width=100%"); + + if ($mode == 1) + { + $qes = has_quick_entries(QE_SUPPINV); + if ($qes !== false) + { + echo "
"; + echo _("Quick Entry:")." "; + quick_entries_list('qid', null, QE_SUPPINV, true); + $qid = get_quick_entry(get_post('qid')); + if (list_updated('qid')) { + unset($_POST['totamount']); // enable default + $Ajax->activate('totamount'); + } + echo " ".$qid['base_desc'].":"." "; + + $amount = input_num('totamount', $qid['base_amount']); + $dec = user_price_dec(); + echo " "; + submit('go', _("Go"), true, false, true); + echo "
"; + + } + } display_heading($heading); + end_outer_table(0, false); + vertical_space(); // ouer table div_start('gl_items'); @@ -280,9 +321,15 @@ function display_grn_items_for_selection(&$supp_trans, $k) if ($supp_trans->is_invoice) $result = get_grn_items(0, $supp_trans->supplier_id, true); - else - $result = get_grn_items(0, $supp_trans->supplier_id, false, true); - + else + { + if (isset($_POST['receive_begin']) && isset($_POST['receive_end'])) + $result = get_grn_items(0, $supp_trans->supplier_id, false, true, 0, $_POST['receive_begin'], $_POST['receive_end']); + else if (isset($_POST['invoice_no'])) + $result = get_grn_items(0, $supp_trans->supplier_id, false, true, $_POST['invoice_no']); + else + $result = get_grn_items(0, $supp_trans->supplier_id, false, true); + } if (db_num_rows($result) == 0) { return false; @@ -338,8 +385,11 @@ function display_grn_items_for_selection(&$supp_trans, $k) submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Invoice"), true); else submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Credit Note"), true); - if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs + if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) { // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs submit_cells('void_item_id'.$n, _("Remove"), '', _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"), true); + submit_js_confirm('void_item_id'.$n, + sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $n)); + } end_row(); } } @@ -390,12 +440,21 @@ function display_grn_items(&$supp_trans, $mode=0) if ($mode == 1) { + if (!$supp_trans->is_invoice && !isset($_POST['invoice_no'])) + { + echo ""; + date_cells(_("Received between"), 'receive_begin', "", null, -30, 0, 0, "valign=middle"); + date_cells(_("and"), 'receive_end', '', null, 1, 0, 0, "valign=middle"); + submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); + echo ""; + } + if ($heading2 != "") { //br(); display_note($heading2, 0, 0, "class='overduefg'"); } - echo ""; + echo ""; submit('InvGRNAll', _("Add All Items"), true, false,true); }