X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=14953a2fbaff67d984ff397c4b6f262e815b41db;hb=7618d9d62ee39a932f56565a4ce25d965bf53462;hp=1da839bbc1bab8fe48de5c3d881f7319c81ec802;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git
diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 1da839bb..14953a2f 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -63,7 +63,6 @@ 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) || $supp_trans->tax_included)
$supp_trans->ov_amount += $gl_line->amount;
}
@@ -86,11 +85,6 @@ function invoice_header(&$supp_trans)
if ($supp_trans->trans_type == ST_SUPPCREDIT && $supp_trans->src_docs)
{
-// $trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE);
-// $trans = get_supp_trans($supp_trans->supplier_id, 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));
@@ -115,9 +109,15 @@ function invoice_header(&$supp_trans)
$supp_trans->clear_items();
read_supplier_details_to_trans($supp_trans, $_POST['supplier_id']);
copy_from_trans($supp_trans);
+ $supp_trans->due_date = get_payment_due_date($supp_trans->terms, $supp_trans->tran_date);
+ $_POST['due_date'] = $supp_trans->due_date;
+ $Ajax->activate('due_date');
}
- ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type));
+ date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true);
+
+ 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)
{
@@ -125,39 +125,36 @@ function invoice_header(&$supp_trans)
}
text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 60);
- 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(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'];
- get_duedate_from_terms($supp_trans);
+ $supp_trans->due_date = get_payment_due_date($supp_trans->terms, $supp_trans->tran_date);
$_POST['due_date'] = $supp_trans->due_date;
$Ajax->activate('due_date');
}
+ label_row(_("Terms:"), $supp_trans->terms['description']);
+
date_row(_("Due Date") . ":", 'due_date');
- 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%");
set_global_supplier($_POST['supplier_id']);
- $supplier_currency = get_supplier_currency($supp_trans->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($company_currency, $supplier_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);
@@ -180,7 +177,7 @@ function invoice_totals(&$supp_trans)
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);
+ $taxes = $supp_trans->get_taxes();
$tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included, 0, true);
$display_total = price_format($supp_trans->ov_amount + $tax_total);
@@ -203,11 +200,12 @@ function invoice_totals(&$supp_trans)
function display_gl_controls(&$supp_trans, $k)
{
$accs = get_supplier_accounts($supp_trans->supplier_id);
- $_POST['gl_code'] = $accs['purchase_account'] ?
- $accs['purchase_account'] : get_company_pref('default_cogs_act');
+ 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);
@@ -216,7 +214,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);
@@ -280,7 +278,7 @@ function display_gl_items(&$supp_trans, $mode=0)
$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"));
@@ -297,7 +295,7 @@ function display_gl_items(&$supp_trans, $mode=0)
if (count($supp_trans->gl_codes) > 0)
{
- foreach ($supp_trans->gl_codes as $entered_gl_code)
+ foreach ($supp_trans->gl_codes as $n => $entered_gl_code)
{
alt_table_row_color($k);
@@ -318,12 +316,12 @@ function display_gl_items(&$supp_trans, $mode=0)
if ($mode == 1)
{
- delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"),
+ delete_button_cell("Delete2" . $n, _("Delete"),
_('Remove line from document'));
- label_cell("");
+ edit_button_cell("Edit" . $n, _("Edit"),
+ _('Edit line from document'));
}
end_row();
- /////////// 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;
@@ -362,18 +360,17 @@ function display_grn_items_for_selection(&$supp_trans, $k)
{ // 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 ($supp_trans->src_docs)
+ elseif ($supp_trans->src_docs)
$result = get_grn_items(0, $supp_trans->supplier_id, false, true, array_keys($supp_trans->src_docs));
- else
+ 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;
@@ -388,20 +385,11 @@ function display_grn_items_for_selection(&$supp_trans, $k)
if ($grn_already_on_invoice == false)
{
-
alt_table_row_color($k);
$n = $myrow["id"];
- label_cell(get_trans_view_str(ST_SUPPRECEIVE, $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'");
+ 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"]));
@@ -429,11 +417,6 @@ 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->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));
- }
end_row();
}
}
@@ -462,11 +445,7 @@ function display_grn_items(&$supp_trans, $mode=0)
if ($mode == 1)
{
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
- $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");
}
@@ -506,15 +485,13 @@ function display_grn_items(&$supp_trans, $mode=0)
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"), $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->trans_type == ST_SUPPCREDIT)
{
- $th[8] = _("Qty Yet To Credit");
+ $th[7] = _("Qty Yet To Credit");
}
}
else
@@ -534,12 +511,12 @@ 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($entered_grn->id);
$row = get_grn_batch($grn_batch);
- label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"])); // PO
+ 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);
@@ -557,8 +534,6 @@ 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->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
- label_cell("");
}
end_row();
@@ -576,7 +551,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;
@@ -601,26 +576,3 @@ function display_grn_items(&$supp_trans, $mode=0)
return $total_grn_value;
}
-
-//--------------------------------------------------------------------------------------------------
-function get_duedate_from_terms(&$trans)
-{
- $date = get_class($trans) == 'purch_order' ? $trans->orig_order_date : $trans->tran_date;
-
- if (!is_date($date))
- {
- $date = Today();
- }
- if ($trans->terms['day_in_following_month'])
- { /*Its a day in the following month when due */
- $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 */
- $trans->due_date = add_days($date, $trans->terms["days_before_due"]);
- }
-}
-
-//--------------------------------------------------------------------------------------------------
-