X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=fafe4c5d79159ab9152b65d058b2d000b4eb6ae3;hb=a8b5d60413ff06dd098b58ae6119f085d3c9ea8b;hp=c89bfb4d52a77f7bd513cb98a137368162eba991;hpb=e8f380e7b04eee2576bcbb4eb2f3f8e53d1c1d71;p=fa-stable.git diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index c89bfb4d..fafe4c5d 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) @@ -10,6 +19,10 @@ function copy_from_trans(&$supp_trans) $_POST['supp_reference'] = $supp_trans->supp_reference; $_POST['reference'] = $supp_trans->reference; $_POST['supplier_id'] = $supp_trans->supplier_id; + $_POST['_ex_rate'] = $supp_trans->ex_rate; + if (isset($supp_trans->tax_overrides)) + foreach($supp_trans->tax_overrides as $id => $value) + $_POST['mantax'][$id] = price_format($value); } //-------------------------------------------------------------------------------------------------- @@ -21,13 +34,22 @@ function copy_to_trans(&$supp_trans) $supp_trans->due_date = $_POST['due_date']; $supp_trans->supp_reference = $_POST['supp_reference']; $supp_trans->reference = $_POST['reference']; + $supp_trans->ex_rate = input_num('_ex_rate', null); + + $supp_trans->ov_amount = $supp_trans->ov_discount = 0; /* for starters */ + if (isset($_POST['mantax'])) { + foreach($_POST['mantax'] as $id => $tax) { + $supp_trans->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); + } + } + else + unset($supp_trans->tax_overrides); - $supp_trans->ov_amount = 0; /* for starters */ if (count($supp_trans->grn_items) > 0) { 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 +57,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->tax_included) + $supp_trans->ov_amount += $gl_line->amount; } } } @@ -44,23 +68,30 @@ function copy_to_trans(&$supp_trans) function invoice_header(&$supp_trans) { - global $Ajax; + global $Ajax, $Refs; // 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 + start_outer_table(TABLESTYLE2, "width='95%'"); - echo ""; + 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'], ST_SUPPINVOICE); + $_POST['supplier_id'] = $trans['supplier_id']; + $supp = $trans['supplier_name'] . " - " . $trans['curr_code']; + label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false)); + } + else + { + if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT)) + $_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 @@ -71,20 +102,18 @@ function invoice_header(&$supp_trans) copy_from_trans($supp_trans); } - if ($supp_trans->is_invoice) - ref_row(_("Reference:"), 'reference', '', references::get_next(20)); - else - ref_row(_("Reference:"), 'reference', '', references::get_next(21)); - - text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20); - - echo "
"; + ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type)); - 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, 60); - 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']; @@ -95,13 +124,11 @@ function invoice_header(&$supp_trans) date_row(_("Due Date") . ":", 'due_date'); - label_row(_("Terms:"), $supp_trans->terms_description); - - echo "
"; + label_row(_("Terms:"), $supp_trans->terms['description']); - echo ""; // outer + table_section(3, "33%"); - echo ""; + set_global_supplier($_POST['supplier_id']); $supplier_currency = get_supplier_currency($supp_trans->supplier_id); @@ -110,57 +137,53 @@ function invoice_header(&$supp_trans) if ($supplier_currency != $company_currency) { label_row(_("Supplier's Currency:"), "" . $supplier_currency . ""); - exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']); + exchange_rate_display($company_currency, $supplier_currency, $_POST['tran_date']); } - label_row(_("Tax Group:"), $supp_trans->tax_description); - echo "
"; + label_row(_("Tax Group:"), $supp_trans->tax_description); + supplier_credit_row($supp_trans->supplier_id, $supp_trans->credit); - echo ""; - end_row(); - end_table(); // outer + end_outer_table(1); } //-------------------------------------------------------------------------------------------------- function invoice_totals(&$supp_trans) { - global $table_style, $table_style2; - copy_to_trans($supp_trans); - start_table("$table_style width=95%"); - label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "align=right", "align=right"); + $dim = get_company_pref('use_dimension'); + $colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5)); + start_table(TABLESTYLE, "width='95%'"); + label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right"); $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id); - $tax_total = display_edit_tax_items($taxes, 1, 0); // tax_included==0 (we are the company) + $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included, 0, true); $display_total = price_format($supp_trans->ov_amount + $tax_total); - if ($supp_trans->is_invoice) - label_row(_("Invoice Total:"), $display_total, "align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'"); + if ($supp_trans->trans_type == ST_SUPPINVOICE) + label_row(_("Invoice Total:"), + $display_total, "colspan=$colspan align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'"); else label_row(_("Credit Note Total"), - $display_total, "align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'"); + $display_total, "colspan=$colspan align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'"); - end_table(); - br(1); - start_table($table_style2); + end_table(1); + start_table(TABLESTYLE2); 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']; + $_POST['gl_code'] = $accs['purchase_account'] ? + $accs['purchase_account'] : get_company_pref('default_cogs_act'); alt_table_row_color($k); - gl_all_accounts_list('gl_code', null, true, false, true); + echo 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 +210,48 @@ function display_gl_controls(&$supp_trans, $k) function display_gl_items(&$supp_trans, $mode=0) { - global $table_style, $path_to_root; + global $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 - - if ($supp_trans->is_invoice) + if ($supp_trans->trans_type == ST_SUPPINVOICE) $heading = _("GL Items for this Invoice"); else $heading = _("GL Items for this Credit Note"); - echo ""; - echo ""; - echo "
$heading
"; + start_outer_table(TABLESTYLE, "width='95%'"); - echo ""; // ouer table + if ($mode == 1) + { + $qes = has_quick_entries(QE_SUPPINV); + if ($qes !== false) + { + echo "
"; + echo _("Quick Entry:")." "; + echo 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); div_start('gl_items'); - echo ""; + start_table(TABLESTYLE, "width='95%'"); $dim = get_company_pref('use_dimension'); if ($dim == 2) @@ -226,7 +267,7 @@ function display_gl_items(&$supp_trans, $mode=0) $th[] = ""; } table_header($th); - $total_gl_value=0; + $total_gl_value=$total = 0; $i = $k = 0; if (count($supp_trans->gl_codes) > 0) @@ -253,14 +294,19 @@ 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(""); } end_row(); - - $total_gl_value += $entered_gl_code->amount; - + /////////// 2009-08-18 Joe Hunt + if ($mode > 1) { + if ($supp_trans->tax_included || !is_tax_account($entered_gl_code->gl_code)) + $total_gl_value += $entered_gl_code->amount; + } + else + $total_gl_value += $entered_gl_code->amount; + $total += $entered_gl_code->amount; $i++; if ($i > 15) { @@ -273,15 +319,12 @@ 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"); + label_row(_("Total"), price_format($total), + "colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1)); - echo "
"; + end_table(1); div_end(); - echo ""; - - end_table(); // outertable return $total_gl_value; } @@ -289,13 +332,18 @@ function display_gl_items(&$supp_trans, $mode=0) function display_grn_items_for_selection(&$supp_trans, $k) { - global $table_style; - if ($supp_trans->is_invoice) + if ($supp_trans->trans_type == ST_SUPPINVOICE) $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; @@ -320,39 +368,48 @@ function display_grn_items_for_selection(&$supp_trans, $k) 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(get_trans_view_str(25, $myrow["grn_batch_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). + hidden('location'.$n, $myrow["loc_code"], false)); + label_cell(get_trans_view_str(ST_PURCHORDER, $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) + if ($supp_trans->trans_type == ST_SUPPINVOICE) 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); - amount_cells(null, 'ChgPrice'.$n, price_format($myrow["unit_price"])); - if ($supp_trans->is_invoice) - amount_cell(round($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec())); - else - amount_cell(round($myrow["unit_price"] * max($myrow['quantity_inv'], 0), user_price_dec())); - if ($supp_trans->is_invoice) + $dec2 = 0; + if ($supp_trans->trans_type == ST_SUPPINVOICE) + { + amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2); + amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec())); + } + else + { + amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["act_price"], $dec2), null, null, $dec2); + amount_cell(round2($myrow["act_price"] * max($myrow['quantity_inv'], 0), user_price_dec())); + } + if ($supp_trans->trans_type == ST_SUPPINVOICE) 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->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) { // Added 2008-10-18 by Joe Hunt. Special access rights needed. 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, + _('You are about to remove all yet non-invoiced items from selected delivery line. This operation also irreversibly changes related order line. Do you want to continue ?')); + } end_row(); } } @@ -368,22 +425,22 @@ function display_grn_items_for_selection(&$supp_trans, $k) function display_grn_items(&$supp_trans, $mode=0) { - global $table_style, $path_to_root; + global $path_to_root; $ret = true; // 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("style='border:1px solid #cccccc;' width='95%'"); + $heading2 = ""; if ($mode == 1) { - if ($supp_trans->is_invoice) + if ($supp_trans->trans_type == ST_SUPPINVOICE) { $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 + if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) // 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 @@ -391,37 +448,46 @@ function display_grn_items(&$supp_trans, $mode=0) } else { - if ($supp_trans->is_invoice) + if ($supp_trans->trans_type == ST_SUPPINVOICE) $heading = _("Received Items Charged on this Invoice"); else $heading = _("Received Items Credited on this Note"); } - echo ""; - echo ""; + + display_heading($heading); + if ($mode == 1) { - submit_cells('InvGRNAll', _("Add All Items"), "align=right"); + if ($supp_trans->trans_type == ST_SUPPCREDIT && !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 "\n"; - } + } + echo "
$heading"; + } + if ($heading2 != "") { - echo "
"; 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(TABLESTYLE, "width='95%'"); if ($mode == 1) { - $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"), + $th = array(_("Delivery"), _("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 + _("Qty Yet To Invoice"), $supp_trans->tax_included ? _("Price after Tax") : _("Price before Tax"), + _("Total"), ""); + if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs $th[] = ""; - if (!$supp_trans->is_invoice) + if ($supp_trans->trans_type == ST_SUPPCREDIT) { $th[8] = _("Qty Yet To Credit"); } @@ -443,35 +509,34 @@ function display_grn_items(&$supp_trans, $mode=0) alt_table_row_color($k); $grn_batch = get_grn_batch_from_item($entered_grn->id); - label_cell(get_trans_view_str(25,$grn_batch)); + label_cell(get_trans_view_str(ST_SUPPRECEIVE,$grn_batch)); if ($mode == 1) { - label_cell($entered_grn->id); - label_cell(""); // PO - } + $row = get_grn_batch($grn_batch); + label_cell($row['purch_order_no']); // PO + } label_cell($entered_grn->item_code); label_cell($entered_grn->item_description); $dec = get_qty_dec($entered_grn->item_code); if ($mode == 1) { - label_cell(""); - qty_cell($entered_grn->qty_recd, false, $dec); + label_cell(sql2date($row['delivery_date'])); + 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_cell($entered_grn->chg_price); - amount_cell( round($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), user_price_dec()), true); + 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')); - if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) + delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line')); + if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) 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++; @@ -491,38 +556,43 @@ 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 "
"; 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); + start_row(); + echo ""; + if ($supp_trans->trans_type == ST_SUPPINVOICE) + display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 0); 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); + display_note(_("Credits can only be applied to invoiced items."), 0, 0); } + echo ""; + end_row(); } + end_table(1); div_end(); - echo ""; - end_table(); // outertable return $total_grn_value; } //-------------------------------------------------------------------------------------------------- -function get_duedate_from_terms(&$supp_trans) +function get_duedate_from_terms(&$trans) { - if (!is_date($supp_trans->tran_date)) + $date = get_class($trans) == 'purch_order' ? $trans->orig_order_date : $trans->tran_date; + + if (!is_date($date)) { - $supp_trans->tran_date = Today(); + $date = Today(); } - if (substr( $supp_trans->terms, 0, 1) == "1") + if ($trans->terms['day_in_following_month']) { /*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)); + $trans->due_date = + add_days(end_month($date), $trans->terms["day_in_following_month"]); } 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)); + $trans->due_date = add_days($date, $trans->terms["days_before_due"]); } }