X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=196db747f322249719b6716d1cfd413a82d9e63e;hb=eeb82d4707125d5d98916ec846d0d83b605af8b2;hp=da5c2ecd90d520db4dd11668a8bf27870d3f37e4;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index da5c2ecd..196db747 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -59,7 +59,7 @@ function invoice_header(&$supp_trans) supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true); - if ($supp_trans->supplier_id != $_POST['supplier_id']) + if ($supp_trans->supplier_id != $_POST['supplier_id']) { // supplier has changed // delete all the order items - drastic but necessary because of @@ -131,7 +131,7 @@ function invoice_totals(&$supp_trans) if ($supp_trans->is_invoice) label_row(_("Invoice Total:"), $display_total, "align=right", "align=right"); else - label_row("" . _("Credit Note Total:") . "", + label_row("" . _("Credit Note Total:") . "", "$display_total", "align=right", "nowrap align=right"); end_table(); @@ -176,16 +176,18 @@ function display_gl_items(&$supp_trans, $mode=0) echo ""; echo ""; - if ($mode == 0) + if ($mode == 0) { - submit_cells('InvGL', _("Edit"), "align=right"); + submit_cells('InvGL', _("Edit"), "align=right", + _('Moves to additional costs posting page'), true); } echo "
$heading
"; echo ""; // ouer table + div_start('gl_items'); echo ""; - + $dim = get_company_pref('use_dimension'); if ($dim == 2) $th = array(_("Account"), _("Name"), _("Dimension")." 1", _("Dimension")." 2", _("Amount"), _("Memo")); @@ -211,7 +213,7 @@ function display_gl_items(&$supp_trans, $mode=0) label_cell($entered_gl_code->gl_code); label_cell($entered_gl_code->gl_act_name); - + if ($dim >= 1) label_cell(get_dimension_string($entered_gl_code->gl_dim, true)); if ($dim > 1) @@ -221,7 +223,8 @@ function display_gl_items(&$supp_trans, $mode=0) label_cell($entered_gl_code->memo_); if ($mode == 1) - delete_link_cell(SID . "Delete=" . $entered_gl_code->Counter); + edit_button_cell("Delete" . $entered_gl_code->Counter, _("Delete"), + _('Remove line from document')); end_row(); @@ -230,22 +233,22 @@ function display_gl_items(&$supp_trans, $mode=0) $i++; if ($i > 15) { - $i = 0; - table_header($th); + $i = 0; + table_header($th); } } } $colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2)); - label_row(_("Total"), price_format($total_gl_value), + label_row(_("Total"), price_format($total_gl_value), "colspan=".$colspan." align=right", "nowrap align=right"); echo "
"; + div_end(); echo ""; - - end_table(); // outertable + end_table(); // outertable return $total_gl_value; } @@ -281,17 +284,18 @@ function display_grn_items(&$supp_trans, $mode=0) $heading = _("Received Items Charged on this Invoice"); else $heading = _("Received Items Credited on this Note"); - echo ""; echo ""; - if ($mode == 0) + if ($mode == 0) { - submit_cells('InvGRN', _("Edit"), "align=right"); + submit_cells('InvGRN', _("Edit"), "align=right", + _('Moves to GRN selection page'), true); } echo "
$heading
"; echo ""; // outer table + div_start('grn_items'); echo ""; $th = array(_("Delivery Sequence #"), _("Item"), _("Description"), _("Quantity"), _("Price"), _("Line Value")); @@ -311,12 +315,13 @@ function display_grn_items(&$supp_trans, $mode=0) label_cell(get_trans_view_str(25,$entered_grn->id)); label_cell($entered_grn->item_code); label_cell($entered_grn->item_description); - qty_cell(abs($entered_grn->this_quantity_inv)); + 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()); if ($mode == 1) - delete_link_cell(SID . "Delete=" . $entered_grn->id); + edit_button_cell("Delete" . $entered_grn->id, _("Delete"), + _('Remove item from document')); end_row(); @@ -335,26 +340,25 @@ function display_grn_items(&$supp_trans, $mode=0) label_row(_("Total"), price_format($total_grn_value), "colspan=5 align=right", "nowrap align=right"); echo "
"; - + div_end(); echo ""; - - end_table(); // outertable + end_table(); // outertable return $total_grn_value; } //-------------------------------------------------------------------------------------------------- function get_duedate_from_terms(&$supp_trans) { - if (!is_date($supp_trans->tran_date)) + if (!is_date($supp_trans->tran_date)) { $supp_trans->tran_date = Today(); } - if (substr( $supp_trans->terms, 0, 1) == "1") + if (substr( $supp_trans->terms, 0, 1) == "1") { /*Its a day in the following month when due */ $supp_trans->due_date = add_days(end_month($supp_trans->tran_date), (int) substr( $supp_trans->terms,1)); - } - else + } + else { /*Use the Days Before Due to add to the invoice date */ $supp_trans->due_date = add_days($supp_trans->tran_date, (int) substr( $supp_trans->terms,1)); }