X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=4630ca55833c920be48d6c01d0b96b145692c39f;hb=1c502501a16dbb08e3f031e3c3a3038540c8b296;hp=bc03ee82100b9a932e2775fd6fa2a01b7eedac25;hpb=953b3605810699962454b624e19bd0779b17e7f7;p=fa-stable.git diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index bc03ee82..4630ca55 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -19,6 +19,13 @@ 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['dimension'] = $supp_trans->dimension; + $_POST['dimension2'] = $supp_trans->dimension2; + + $_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); } //-------------------------------------------------------------------------------------------------- @@ -30,8 +37,20 @@ 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->dimension = @$_POST['dimension']; + $supp_trans->dimension2 = @$_POST['dimension2']; + + $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) @@ -44,8 +63,7 @@ function copy_to_trans(&$supp_trans) { foreach ( $supp_trans->gl_codes as $gl_line) { - ////////// 2009-08-18 Joe Hunt - if (!is_tax_account($gl_line->gl_code)) + if (!is_tax_account($gl_line->gl_code) || $supp_trans->tax_included) $supp_trans->ov_amount += $gl_line->amount; } } @@ -55,32 +73,37 @@ function copy_to_trans(&$supp_trans) function invoice_header(&$supp_trans) { - global $Ajax, $table_style2, $Refs; + global $Ajax, $Refs; // if vars have been lost, recopy if (!isset($_POST['tran_date'])) copy_from_trans($supp_trans); - start_outer_table("width=95% $table_style2"); + start_outer_table(TABLESTYLE2, "width='95%'"); table_section(1); - if (isset($_POST['invoice_no'])) + if ($supp_trans->trans_type == ST_SUPPCREDIT && $supp_trans->src_docs) { - $trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE); - $_POST['supplier_id'] = $trans['supplier_id']; - $supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode']; + $_POST['supplier_id'] = $supp_trans->supplier_id; + $supp = $supp_trans->supplier_name." - ".$supp_trans->currency; 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->trans_no) + supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true); + else + label_row(_("Supplier:"), $supp_trans->supplier_name + .($supp_trans->currency ? ' - '.$supp_trans->currency : '') + .hidden('supplier_id', $_POST['supplier_id'], false)); } if ($supp_trans->supplier_id != $_POST['supplier_id']) { + copy_to_trans($supp_trans); // supplier has changed // delete all the order items - drastic but necessary because of // change of currency, etc @@ -89,21 +112,19 @@ function invoice_header(&$supp_trans) copy_from_trans($supp_trans); } - if ($supp_trans->is_invoice) - ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPINVOICE)); - else - ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPCREDIT)); + date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true); - if (isset($_POST['invoice_no'])) + ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type, null, + array('supplier' => get_post('supplier_id'), 'date' => get_post('tran_date'))), false, $supp_trans->trans_type); + + if ($supp_trans->trans_type == ST_SUPPCREDIT) { - 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); + label_row(_("Source Invoices:"), implode(',' , $supp_trans->src_docs),'','','src_docs'); + } + text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 60); table_section(2, "33%"); - 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,21 +135,28 @@ function invoice_header(&$supp_trans) date_row(_("Due Date") . ":", 'due_date'); - label_row(_("Terms:"), $supp_trans->terms_description); + label_row(_("Terms:"), $supp_trans->terms['description']); + + if (get_company_pref('use_dimension')) + dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1); + + if (get_company_pref('use_dimension') == 2) + dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2); table_section(3, "33%"); - $supplier_currency = get_supplier_currency($supp_trans->supplier_id); + set_global_supplier($_POST['supplier_id']); $company_currency = get_company_currency(); - if ($supplier_currency != $company_currency) + if ($supp_trans->currency != $company_currency) { - label_row(_("Supplier's Currency:"), "" . $supplier_currency . ""); - exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']); + label_row(_("Supplier's Currency:"), "" . $supp_trans->currency . ""); + exchange_rate_display($company_currency, $supp_trans->currency, $_POST['tran_date']); } label_row(_("Tax Group:"), $supp_trans->tax_description); + supplier_credit_row($supp_trans->supplier_id, $supp_trans->credit); end_outer_table(1); } @@ -137,42 +165,45 @@ function invoice_header(&$supp_trans) function invoice_totals(&$supp_trans) { - global $table_style, $table_style2; + global $Ajax; copy_to_trans($supp_trans); $dim = get_company_pref('use_dimension'); $colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5)); - start_table("$table_style width=95%"); + div_start('tax_table'); + 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, $colspan, 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, "colspan=$colspan 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, "colspan=$colspan align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'"); end_table(1); - start_table($table_style2); + start_table(TABLESTYLE2); textarea_row(_("Memo:"), "Comments", null, 50, 3); end_table(1); + div_end(); } //-------------------------------------------------------------------------------------------------- function display_gl_controls(&$supp_trans, $k) { - global $table_style, $table_style2; - $accs = get_supplier_accounts($supp_trans->supplier_id); - $_POST['gl_code'] = $accs['purchase_account']; + if (!isset($_POST['gl_code'])) + $_POST['gl_code'] = $accs['purchase_account'] ? + $accs['purchase_account'] : get_company_pref('default_cogs_act'); alt_table_row_color($k); - echo gl_all_accounts_list('gl_code', null, true, true); + echo gl_all_accounts_list('gl_code', null, false, true); $dim = get_company_pref('use_dimension'); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); @@ -181,7 +212,7 @@ function display_gl_controls(&$supp_trans, $k) 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) + elseif ($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); @@ -199,18 +230,18 @@ function display_gl_controls(&$supp_trans, $k) function display_gl_items(&$supp_trans, $mode=0) { - global $table_style, $table_style2, $path_to_root, $Ajax; + 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; - 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"); - start_outer_table("$table_style width=95%"); + start_outer_table(TABLESTYLE, "width='95%'"); if ($mode == 1) { @@ -240,12 +271,12 @@ function display_gl_items(&$supp_trans, $mode=0) end_outer_table(0, false); div_start('gl_items'); - start_table("$table_style width=95%"); + start_table(TABLESTYLE, "width='95%'"); $dim = get_company_pref('use_dimension'); if ($dim == 2) $th = array(_("Account"), _("Name"), _("Dimension")." 1", _("Dimension")." 2", _("Amount"), _("Memo")); - else if ($dim == 1) + elseif ($dim == 1) $th = array(_("Account"), _("Name"), _("Dimension"), _("Amount"), _("Memo")); else $th = array(_("Account"), _("Name"), _("Amount"), _("Memo")); @@ -256,7 +287,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) @@ -285,14 +316,17 @@ function display_gl_items(&$supp_trans, $mode=0) { delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"), _('Remove line from document')); - label_cell(""); + edit_button_cell("Edit" . $entered_gl_code->Counter, _("Edit"), + _('Edit line from document')); } end_row(); - /////////// 2009-08-18 Joe Hunt - if ($mode > 1 && !is_tax_account($entered_gl_code->gl_code)) - $total_gl_value += $entered_gl_code->amount; + 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) { @@ -305,7 +339,7 @@ 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), + label_row(_("Total"), price_format($total), "colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1)); end_table(1); @@ -318,26 +352,23 @@ 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) - $result = get_grn_items(0, $supp_trans->supplier_id, true); + if ($supp_trans->trans_type == ST_SUPPINVOICE) // outstanding grns and eventually for selected invoice + $result = get_grn_items(0, $supp_trans->supplier_id, true, false, $supp_trans->trans_no); else - { + { // only invoiced 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 + elseif ($supp_trans->src_docs) + $result = get_grn_items(0, $supp_trans->supplier_id, false, true, array_keys($supp_trans->src_docs)); + 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 */ + /*Set up a table to show the outstanding GRN items for selection */ while ($myrow = db_fetch($result)) { $grn_already_on_invoice = false; @@ -349,45 +380,48 @@ function display_grn_items_for_selection(&$supp_trans, $k) $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(ST_PURCHORDER, $myrow["purch_order_no"])); + label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]), "nowrap align='right'"); + hidden('qty_recd'.$n, $myrow["qty_recd"]); + hidden('item_code'.$n, $myrow["item_code"]); + hidden('item_description'.$n, $myrow["description"]); + hidden('prev_quantity_inv'.$n, $myrow['quantity_inv']); + hidden('order_price'.$n, $myrow['unit_price']); + hidden('po_detail_item'.$n, $myrow['po_detail_item']); + label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]), "nowrap align='right'"); 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 + 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) + $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_cell(round2($myrow["unit_price"] * max($myrow['quantity_inv'], 0), user_price_dec())); - if ($supp_trans->is_invoice) + } + 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"]->can_access('SA_GRNDELETE')) { // Added 2008-10-18 by Joe Hunt. Special access rights needed. + 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, 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)); @@ -407,19 +441,19 @@ 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; - start_outer_table("style='border:1px solid #cccccc;' width=95%"); + 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"]->can_access('SA_GRNDELETE')) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs @@ -430,47 +464,49 @@ 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"); - } + } display_heading($heading); if ($mode == 1) { - if (!$supp_trans->is_invoice && !isset($_POST['invoice_no'])) + if ($supp_trans->trans_type == ST_SUPPCREDIT) { echo ""; - date_cells(_("Received between"), 'receive_begin', "", null, -30, 0, 0, "valign=middle"); + date_cells(_("Received between"), 'receive_begin', "", null, + -user_transaction_days(), 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 != "") { display_note($heading2, 0, 0, "class='overduefg'"); - } - echo ""; + } + echo ""; submit('InvGRNAll', _("Add All Items"), true, false,true); - } + } end_outer_table(0, false); div_start('grn_items'); - start_table("$table_style width=95%"); + 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"]->can_access('SA_GRNDELETE')) // 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"); + $th[7] = _("Qty Yet To Credit"); } } else @@ -490,19 +526,20 @@ 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(ST_SUPPRECEIVE,$grn_batch)); + label_cell(get_trans_view_str(ST_SUPPRECEIVE, $grn_batch), "nowrap align='right'"); if ($mode == 1) { - label_cell($entered_grn->id); - label_cell(""); // PO +// label_cell($entered_grn->id); + $row = get_grn_batch($grn_batch); + label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"]), "nowrap align='right'"); // 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); @@ -512,7 +549,7 @@ function display_grn_items(&$supp_trans, $mode=0) if ($mode == 1) { delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line')); - if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) + if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) label_cell(""); } end_row(); @@ -531,7 +568,7 @@ function display_grn_items(&$supp_trans, $mode=0) if ($mode == 1) { $ret = display_grn_items_for_selection($supp_trans, $k); - $colspan = 10; + $colspan = 9; } else $colspan = 5; @@ -541,7 +578,7 @@ function display_grn_items(&$supp_trans, $mode=0) { start_row(); echo ""; - if ($supp_trans->is_invoice) + 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 { @@ -558,22 +595,24 @@ function display_grn_items(&$supp_trans, $mode=0) } //-------------------------------------------------------------------------------------------------- -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"]); } } //-------------------------------------------------------------------------------------------------- -?> \ No newline at end of file