X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=14ff76e2f2d8f3b2777e7a76785043d1b99cecc0;hb=6c7615033b01cce21a088dcfdb20e874533cc921;hp=88fcfd59bbee596a76618bb28e059acc86643a45;hpb=21a54e6ceb2149d31ab7738af30f731f6fe10251;p=fa-stable.git diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index 88fcfd59..14ff76e2 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ //-------------------------------------------------------------------------------------------------- function copy_from_trans(&$supp_trans) @@ -44,23 +53,30 @@ function copy_to_trans(&$supp_trans) function invoice_header(&$supp_trans) { - global $Ajax; + global $Ajax, $table_style; // if vars have been lost, recopy if (!isset($_POST['tran_date'])) copy_from_trans($supp_trans); - start_table("width=100%", 5); - start_row(); - echo""; // outer - - echo ""; + start_outer_table("$table_style width=98%", 5); - if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all())) - $_POST['supplier_id'] = get_global_supplier(); + table_section(1); - 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 @@ -76,13 +92,14 @@ 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); - - echo "
"; - - echo ""; // outer + 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); - echo ""; + table_section(2, "33%"); date_row(_("Date") . ":", 'tran_date', '', null, 0, 0, 0, "", true); if (isset($_POST['_tran_date_changed'])) { @@ -97,11 +114,7 @@ function invoice_header(&$supp_trans) label_row(_("Terms:"), $supp_trans->terms_description); - echo "
"; - - echo ""; // outer - - echo ""; + table_section(3, "33%"); $supplier_currency = get_supplier_currency($supp_trans->supplier_id); @@ -113,12 +126,9 @@ function invoice_header(&$supp_trans) exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']); } - label_row(_("Tax Group:"), $supp_trans->tax_description); - echo "
"; + label_row(_("Tax Group:"), $supp_trans->tax_description); - echo ""; - end_row(); - end_table(); // outer + end_outer_table(1); } //-------------------------------------------------------------------------------------------------- @@ -143,12 +153,10 @@ function invoice_totals(&$supp_trans) label_row(_("Credit Note Total"), $display_total, "align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'"); - end_table(); - br(1); + end_table(1); start_table($table_style2); textarea_row(_("Memo:"), "Comments", null, 50, 3); - end_table(); - br(1); + end_table(1); } //-------------------------------------------------------------------------------------------------- @@ -160,7 +168,7 @@ function display_gl_controls(&$supp_trans, $k) $_POST['gl_code'] = $accs['purchase_account']; alt_table_row_color($k); - gl_all_accounts_list('gl_code', null, true, false, true); + gl_all_accounts_list('gl_code', null, true, true); $dim = get_company_pref('use_dimension'); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); @@ -187,30 +195,52 @@ 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) return 0; - echo "
"; - - start_table("width=95%"); - echo ""; // outertable + start_outer_table("width=95%"); if ($supp_trans->is_invoice) $heading = _("GL Items for this Invoice"); else $heading = _("GL Items for this Credit Note"); - echo ""; - echo ""; - echo "
$heading
"; + 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); - echo ""; // ouer table + vertical_space(); // ouer table div_start('gl_items'); - echo ""; + start_table("$table_style width=100%"); $dim = get_company_pref('use_dimension'); if ($dim == 2) @@ -253,7 +283,7 @@ function display_gl_items(&$supp_trans, $mode=0) if ($mode == 1) { - edit_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"), + delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"), _('Remove line from document')); label_cell(""); } @@ -276,12 +306,10 @@ function display_gl_items(&$supp_trans, $mode=0) label_row(_("Total"), price_format($total_gl_value), "colspan=".$colspan." align=right", "nowrap align=right"); - echo "
"; + end_table(); div_end(); - echo ""; - - end_table(); // outertable + end_outer_table(0, false); // outertable return $total_gl_value; } @@ -293,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; @@ -351,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(); } } @@ -374,9 +411,9 @@ function display_grn_items(&$supp_trans, $mode=0) // if displaying in form, and no items, exit if (($mode == 2 || $mode == 3) && count($supp_trans->grn_items) == 0) return 0; - br(1); - start_table("width=95%"); - echo ""; // outertable + + start_outer_table("width=95%"); + $heading2 = ""; if ($mode == 1) { @@ -396,24 +433,35 @@ function display_grn_items(&$supp_trans, $mode=0) else $heading = _("Received Items Credited on this Note"); } - echo ""; - echo ""; + + start_outer_table("width=100%"); + + display_heading($heading); + if ($mode == 1) { - submit_cells('InvGRNAll', _("Add All Items"), "align=right",false,true); + if (!$supp_trans->is_invoice && !isset($_POST['invoice_no'])) + { + echo ""; + date_cells(_("Received between"), 'receive_begin', "", null, -30); + date_cells(_("and"), 'receive_end', '', null, 1); + submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); + echo "\n"; - } + } + echo "
$heading"; + } + if ($heading2 != "") { - echo "
"; + //br(); display_note($heading2, 0, 0, "class='overduefg'"); - echo ""; + submit('InvGRNAll', _("Add All Items"), true, false,true); } - echo "
"; - echo ""; // outer table + end_outer_table(0, false); div_start('grn_items'); - echo ""; + start_table("$table_style width=100%"); if ($mode == 1) { $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"), @@ -464,7 +512,7 @@ function display_grn_items(&$supp_trans, $mode=0) if ($mode == 1) { - edit_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line')); + delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line')); if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) label_cell(""); } @@ -490,7 +538,7 @@ function display_grn_items(&$supp_trans, $mode=0) $colspan = 5; label_row(_("Total"), price_format($total_grn_value), "colspan=$colspan align=right", "nowrap align=right"); - echo "
"; + end_table(); if (!$ret) { if ($supp_trans->is_invoice) @@ -502,9 +550,8 @@ function display_grn_items(&$supp_trans, $mode=0) } } div_end(); - echo ""; - end_table(); // outertable + end_outer_table(0, false); // outertable return $total_grn_value; }