X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=cee5abbda36d252205c39a506ad9fae1adae828a;hb=95303d7b5280820af76ddbd8908b120813f1e763;hp=13115116c927a32d5d96b939b86ec8155426554d;hpb=6e3e48e051f3b4c819777df71a09f8c725bb9e81;p=fa-stable.git diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index 13115116..cee5abbd 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) @@ -27,7 +36,7 @@ function copy_to_trans(&$supp_trans) { foreach ( $supp_trans->grn_items as $grn) { - $supp_trans->ov_amount += round(($grn->this_quantity_inv * $grn->chg_price), + $supp_trans->ov_amount += round2(($grn->this_quantity_inv * $grn->chg_price), user_price_dec()); } } @@ -35,7 +44,9 @@ function copy_to_trans(&$supp_trans) { foreach ( $supp_trans->gl_codes as $gl_line) { - $supp_trans->ov_amount += $gl_line->amount; + ////////// 2009-08-18 Joe Hunt + if (!is_tax_account($gl_line->gl_code)) + $supp_trans->ov_amount += $gl_line->amount; } } } @@ -44,21 +55,30 @@ function copy_to_trans(&$supp_trans) function invoice_header(&$supp_trans) { + 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 @@ -74,25 +94,29 @@ 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); + 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']; + get_duedate_from_terms($supp_trans); + $_POST['due_date'] = $supp_trans->due_date; + $Ajax->activate('due_date'); + } date_row(_("Due Date") . ":", 'due_date'); label_row(_("Terms:"), $supp_trans->terms_description); - echo "
"; - - echo ""; // outer - - echo ""; + table_section(3, "33%"); $supplier_currency = get_supplier_currency($supp_trans->supplier_id); @@ -104,12 +128,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); } //-------------------------------------------------------------------------------------------------- @@ -129,65 +150,99 @@ function invoice_totals(&$supp_trans) $display_total = price_format($supp_trans->ov_amount + $tax_total); if ($supp_trans->is_invoice) - label_row(_("Invoice Total:"), $display_total, "align=right", "align=right"); + label_row(_("Invoice Total:"), $display_total, "align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'"); else - label_row("" . _("Credit Note Total:") . "", - "$display_total", "align=right", "nowrap align=right"); + 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); } //-------------------------------------------------------------------------------------------------- +function display_gl_controls(&$supp_trans, $k) +{ + global $table_style; + + $accs = get_supplier_accounts($supp_trans->supplier_id); + $_POST['gl_code'] = $accs['purchase_account']; + + alt_table_row_color($k); + 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); + if ($dim > 1) + dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2); + amount_cells(null, 'amount'); + if ($dim < 1) + text_cells_ex(null, 'memo_', 35, 50, null, null, null, hidden('dimension_id', 0, false).hidden('dimension2_id', 0, false)); + else if ($dim < 2) + text_cells_ex(null, 'memo_', 35, 50, null, null, null, hidden('dimension2_id', 0, false)); + else + text_cells_ex(null, 'memo_', 35, 50, null, null, null); + submit_cells('AddGLCodeToTrans', _("Add"), "", + _('Add GL Line'), true); + submit_cells('ClearFields', _("Reset"), "", + _("Clear all GL entry fields"), true); + end_row(); +} -// $mode = 0 display on invoice page -// = 1 display on gl items edit page +// $mode = 0 none at the moment +// = 1 display on invoice/credit page // = 2 display on view invoice // = 3 display on view credit function display_gl_items(&$supp_trans, $mode=0) { - global $table_style, $path_to_root; - - if ($mode == 0 && isset($_POST["InvGL"])) - { - copy_to_trans($supp_trans); - meta_forward("$path_to_root/purchasing/supplier_trans_gl.php"); - exit; - } + 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; - - echo "
"; + return 0; - 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 ""; - if ($mode == 0) + start_outer_table("width=100%"); + + if ($mode == 1) { - submit_cells('InvGL', _("Edit"), "align=right", - _('Moves to additional costs posting page'), true); + $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 "
"; + + } } - echo "
$heading
"; + display_heading($heading); - echo ""; // ouer table + end_outer_table(0, false); + + vertical_space(); // ouer table div_start('gl_items'); - start_form(); - echo ""; + start_table("$table_style width=100%"); $dim = get_company_pref('use_dimension'); if ($dim == 2) @@ -197,6 +252,11 @@ function display_gl_items(&$supp_trans, $mode=0) else $th = array(_("Account"), _("Name"), _("Amount"), _("Memo")); + if ($mode == 1) + { + $th[] = ""; + $th[] = ""; + } table_header($th); $total_gl_value=0; $i = $k = 0; @@ -220,17 +280,21 @@ function display_gl_items(&$supp_trans, $mode=0) if ($dim > 1) label_cell(get_dimension_string($entered_gl_code->gl_dim2, true)); - amount_cell($entered_gl_code->amount); + amount_cell($entered_gl_code->amount, true); label_cell($entered_gl_code->memo_); if ($mode == 1) - edit_button_cell("Delete" . $entered_gl_code->Counter, _("Delete"), + { + delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"), _('Remove line from document')); - + label_cell(""); + } end_row(); - - $total_gl_value += $entered_gl_code->amount; - + /////////// 2009-08-18 Joe Hunt + if ($mode > 1 && !is_tax_account($entered_gl_code->gl_code)) + $total_gl_value += $entered_gl_code->amount; + else + $total_gl_value += $entered_gl_code->amount; $i++; if ($i > 15) { @@ -240,24 +304,107 @@ function display_gl_items(&$supp_trans, $mode=0) } } + if ($mode == 1) + display_gl_controls($supp_trans, $k); $colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2)); label_row(_("Total"), price_format($total_gl_value), "colspan=".$colspan." align=right", "nowrap align=right"); - echo "
"; - - echo ""; - - end_table(); // outertable - end_form(); + end_table(); div_end(); + + end_outer_table(0, false); // outertable return $total_gl_value; } -//-------------------------------------------------------------------------------------------------- +//--------------//----------------------------------------------------------------------------------------- + +function display_grn_items_for_selection(&$supp_trans, $k) +{ + global $table_style; + + if ($supp_trans->is_invoice) + $result = get_grn_items(0, $supp_trans->supplier_id, 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; + } + + /*Set up a table to show the outstanding GRN items for selection */ + + while ($myrow = db_fetch($result)) + { + $grn_already_on_invoice = false; -// $mode = 0 display on invoice page -// = 1 display on grn items edit page + foreach ($supp_trans->grn_items as $entered_grn) + { + if ($entered_grn->id == $myrow["id"]) + { + $grn_already_on_invoice = true; + } + } + if ($grn_already_on_invoice == false) + { + + alt_table_row_color($k); + + $n = $myrow["id"]; + label_cell(get_trans_view_str(25, $myrow["grn_batch_id"])); + label_cell($myrow["id"]. + hidden('qty_recd'.$n, $myrow["qty_recd"], false). + hidden('item_code'.$n, $myrow["item_code"], false). + hidden('item_description'.$n, $myrow["description"], false). + hidden('prev_quantity_inv'.$n, $myrow['quantity_inv'], false). + hidden('order_price'.$n, $myrow['unit_price'], false). + hidden('std_cost_unit'.$n, $myrow['std_cost_unit'], false). + hidden('po_detail_item'.$n, $myrow['po_detail_item'], false)); + label_cell(get_trans_view_str(systypes::po(), $myrow["purch_order_no"])); + label_cell($myrow["item_code"]); + label_cell($myrow["description"]); + label_cell(sql2date($myrow["delivery_date"])); + $dec = get_qty_dec($myrow["item_code"]); + qty_cell($myrow["qty_recd"], false, $dec); + qty_cell($myrow["quantity_inv"], false, $dec); + if ($supp_trans->is_invoice) + qty_cells(null, 'this_quantity_inv'.$n, number_format2($myrow["qty_recd"] - $myrow["quantity_inv"], $dec), + null, null, $dec); + else + qty_cells(null, 'This_QuantityCredited'.$n, number_format2(max($myrow["quantity_inv"], 0), $dec), + null, null, $dec); + $dec2 = 0; + amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2); + if ($supp_trans->is_invoice) + amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec())); + else + amount_cell(round2($myrow["unit_price"] * max($myrow['quantity_inv'], 0), user_price_dec())); + if ($supp_trans->is_invoice) + 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 + 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(); + } + } + return true; +} + +//------------------------------------------------------------------------------------ + +// $mode = 0 none at the moment +// = 1 display on invoice/credit page // = 2 display on view invoice // = 3 display on view credit @@ -265,43 +412,76 @@ function display_grn_items(&$supp_trans, $mode=0) { global $table_style, $path_to_root; - if ($mode == 0 && isset($_POST["InvGRN"])) - { - copy_to_trans($supp_trans); - if ($supp_trans->is_invoice) - meta_forward("$path_to_root/purchasing/supplier_invoice_grns.php"); - else - meta_forward("$path_to_root/purchasing/supplier_credit_grns.php"); - exit; - } - + $ret = true; // if displaying in form, and no items, exit if (($mode == 2 || $mode == 3) && count($supp_trans->grn_items) == 0) - return; - br(1); - start_table("width=95%"); - echo ""; // outertable + return 0; - if ($supp_trans->is_invoice) - $heading = _("Received Items Charged on this Invoice"); - else - $heading = _("Received Items Credited on this Note"); - echo ""; - echo ""; - if ($mode == 0) + start_outer_table("width=95%"); + + $heading2 = ""; + if ($mode == 1) { - submit_cells('InvGRN', _("Edit"), "align=right", - _('Moves to GRN selection page'), true); + if ($supp_trans->is_invoice) + { + $heading = _("Items Received Yet to be Invoiced"); + if ($_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs + $heading2 = _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"); + } + else + $heading = _("Delivery Item Selected For Adding To A Supplier Credit Note"); } - echo "
$heading
"; + else + { + if ($supp_trans->is_invoice) + $heading = _("Received Items Charged on this Invoice"); + else + $heading = _("Received Items Credited on this Note"); + } - echo ""; // outer table + start_outer_table("width=100%"); - div_start('grn_items'); - start_form(); - echo ""; - $th = array(_("Delivery Sequence #"), _("Item"), _("Description"), - _("Quantity"), _("Price"), _("Line Value")); + display_heading($heading); + + 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 ""; + submit('InvGRNAll', _("Add All Items"), true, false,true); + } + + end_outer_table(0, false); + + div_start('grn_items'); + start_table("$table_style width=100%"); + if ($mode == 1) + { + $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"), + _("Received On"), _("Quantity Received"), _("Quantity Invoiced"), + _("Qty Yet To Invoice"), _("Order Price"), _("Total"), ""); + if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs + $th[] = ""; + if (!$supp_trans->is_invoice) + { + $th[8] = _("Qty Yet To Credit"); + } + } + else + $th = array(_("Delivery"), _("Item"), _("Description"), + _("Quantity"), _("Price"), _("Line Value")); table_header($th); $total_grn_value = 0; @@ -315,20 +495,35 @@ function display_grn_items(&$supp_trans, $mode=0) alt_table_row_color($k); - label_cell(get_trans_view_str(25,$entered_grn->id)); + $grn_batch = get_grn_batch_from_item($entered_grn->id); + label_cell(get_trans_view_str(25,$grn_batch)); + if ($mode == 1) + { + label_cell($entered_grn->id); + label_cell(""); // PO + } label_cell($entered_grn->item_code); label_cell($entered_grn->item_description); - qty_cell(abs($entered_grn->this_quantity_inv), false, get_qty_dec($entered_grn->item_code)); - amount_cell($entered_grn->chg_price); - amount_cell( round($entered_grn->chg_price * abs($entered_grn->this_quantity_inv)), user_price_dec()); + $dec = get_qty_dec($entered_grn->item_code); + if ($mode == 1) + { + label_cell(""); + qty_cell($entered_grn->qty_recd, false, $dec); + qty_cell($entered_grn->prev_quantity_inv, false, $dec); + } + qty_cell(abs($entered_grn->this_quantity_inv), true, $dec); + amount_decimal_cell($entered_grn->chg_price); + amount_cell( round2($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), user_price_dec()), true); if ($mode == 1) - edit_button_cell("Delete" . $entered_grn->id, _("Delete"), - _('Remove item from document')); - + { + delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line')); + if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) + label_cell(""); + } end_row(); - $total_grn_value += round($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), + $total_grn_value += round2($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), user_price_dec()); $i++; @@ -339,15 +534,29 @@ function display_grn_items(&$supp_trans, $mode=0) } } } - + if ($mode == 1) + { + $ret = display_grn_items_for_selection($supp_trans, $k); + $colspan = 10; + } + else + $colspan = 5; label_row(_("Total"), price_format($total_grn_value), - "colspan=5 align=right", "nowrap align=right"); - echo "
"; - end_form(); - div_end(); - echo ""; + "colspan=$colspan align=right", "nowrap align=right"); + end_table(); + if (!$ret) + { + if ($supp_trans->is_invoice) + display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 1); + else + { + display_note(_("There are no received items for the selected supplier that have been invoiced.")); + display_note(_("Credits can only be applied to invoiced items."), 0, 1); + } + } + div_end(); - end_table(); // outertable + end_outer_table(0, false); // outertable return $total_grn_value; }