X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=16da77e4ff5851fd06d7828abde4a33a0505ded2;hb=17b390efcf904072b02ec866b2a427490471a260;hp=cc003088d2595ec51e8815823189b0f6a0534f8e;hpb=22486f7826944e00937e7ccceab1a927c94d8f6a;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index cc003088..16da77e4 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -50,11 +50,11 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $
{
$label = _("GL");
$icon = ICON_GL;
- }
+ }
+ $url = ($type == ST_WORKORDER && !work_order_is_closed($trans_no)) ? "manufacturing/view/wo_costs_view.php?trans_no=$trans_no"
+ : "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no";
- return viewer_link($label,
- "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no",
- $class, $id, $icon);
+ return viewer_link($label, $url, $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
@@ -210,7 +210,7 @@ function get_package_view_str($pkg, $label="", $icon=false, $class='', $id='')
$label = _("Info");
// $icon = ICON_GL;
}
- return viewer_link($label, "includes/ui/view_package.php?id=$pkg", $class, $id, $icon);
+ return viewer_link($label, "admin/view/view_package.php?id=$pkg", $class, $id, $icon);
}
@@ -272,7 +272,7 @@ function check_ui_refresh($name=null)
//
function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false)
{
- global $Ajax, $xr_provider_authoritative;
+ global $Ajax, $SysPrefs;
$readonly = false;
@@ -299,7 +299,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit
$rate = retrieve_exrate($currency, $date_);
if (!$rate)
display_warning(sprintf(_("Cannot retrieve exchange rate for currency %s. Please adjust approximate rate if needed."), $currency));
- elseif ($xr_provider_authoritative) {
+ elseif ($SysPrefs->xr_provider_authoritative) {
// if the remote exrate is considered authoritative we can store the rate here,
// otherwise exrate will be stored during transaction write
$readonly = true;
@@ -386,10 +386,10 @@ function view_stock_status($stock_id, $description=null, $echo=true)
global $path_to_root;
if ($description)
//hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", (user_show_codes()?$stock_id . " - ":"") . $description, "stock_id=$stock_id");
- $preview_str = "". (user_show_codes()?$stock_id . " - ":"") . $description."";
+ $preview_str = "". (user_show_codes()?$stock_id . " - ":"") . $description."";
else
//hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", $stock_id, "stock_id=$stock_id");
- $preview_str = "$stock_id";
+ $preview_str = "$stock_id";
if($echo)
echo $preview_str;
return $preview_str;
@@ -423,7 +423,8 @@ function display_debit_or_credit_cells($value, $bold=false)
function display_customer_trans_tax_details($tax_items, $columns)
{
- global $alternative_tax_include_on_docs, $suppress_tax_rates;
+ global $SysPrefs;
+
$first = true;
while ($tax_item = db_fetch($tax_items))
{
@@ -431,13 +432,13 @@ function display_customer_trans_tax_details($tax_items, $columns)
continue;
$tax = number_format2($tax_item['amount'],user_price_dec());
- if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+ if ($SysPrefs->suppress_tax_rates() == 1)
$tax_type_name = $tax_item['tax_type_name'];
else
$tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
if ($tax_item['included_in_price'])
{
- if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+ if ($SysPrefs->alternative_tax_include_on_docs() == 1)
{
if ($first)
label_row(_("Total Tax Excluded"), number_format2($tax_item['net_amount'], user_price_dec()),
@@ -533,14 +534,14 @@ function display_footer_exit($space=2)
//--------------------------------------------------------------------------------------
-function display_allocations($alloc_result, $total, $payments=false)
+function display_allocations($alloc_result, $total, $title, $show_summary=true)
{
global $systypes_array;
if (!$alloc_result || db_num_rows($alloc_result) == 0)
return;
- display_heading2(($payments ? _("Payments") : _("Allocations")));
+ display_heading2($title);
start_table(TABLESTYLE, "width='80%'");
@@ -551,7 +552,6 @@ function display_allocations($alloc_result, $total, $payments=false)
while ($alloc_row = db_fetch($alloc_result))
{
-
alt_table_row_color($k);
label_cell($systypes_array[$alloc_row['type']]);
@@ -559,7 +559,7 @@ function display_allocations($alloc_result, $total, $payments=false)
label_cell(sql2date($alloc_row['tran_date']));
$alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
$alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
- if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT))
+ if ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT)
$alloc_row['Total'] = -$alloc_row['Total'];
amount_cell($alloc_row['Total']);
amount_cell($alloc_row['Total'] - $alloc_row['amt']);
@@ -572,12 +572,14 @@ function display_allocations($alloc_result, $total, $payments=false)
label_cell(_("Total Allocated:"), "align=right colspan=5");
amount_cell($total_allocated);
end_row();
- start_row();
- label_cell(_("Left to Allocate:"), "align=right colspan=5");
- $total = round2($total, user_price_dec());
- amount_cell($total - $total_allocated);
- end_row();
-
+ if ($show_summary)
+ {
+ start_row();
+ label_cell(_("Left to Allocate:"), "align=right colspan=5");
+ $total = round2($total, user_price_dec());
+ amount_cell($total - $total_allocated);
+ end_row();
+ }
end_table(1);
}
@@ -589,11 +591,11 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
{
case PT_CUSTOMER :
$alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
- display_allocations($alloc_result, $total);
+ display_allocations($alloc_result, $total, _("Allocations"));
return;
case PT_SUPPLIER :
$alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type);
- display_allocations($alloc_result, $total);
+ display_allocations($alloc_result, $total, _("Allocations"));
return;
}
}
@@ -606,11 +608,11 @@ function display_allocations_to($person_type, $person_id, $type, $type_no, $tota
{
case PT_CUSTOMER :
$alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type);
- display_allocations($alloc_result, $total, true);
+ display_allocations($alloc_result, $total, $type == ST_SALESORDER ? _("Pre-Payments") : _("Payments"), false);
return;
case PT_SUPPLIER :
$alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type);
- display_allocations($alloc_result, $total, true);
+ display_allocations($alloc_result, $total, $type == ST_PURCHORDER ? _("Pre-Payments") : _("Payments"), false);
return;
}
}
@@ -646,9 +648,9 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
$begin = "";
else
$begin = begin_fiscalyear(); // from fiscalyear begin
- }
+ }
$base = get_gl_trans_from_to($begin, $cart->tran_date, $qe['base_desc']);
-
+
}
if ($descr != '') $qe['description'] .= ': '.$descr;
$result = get_quick_entry_lines($id);
@@ -657,7 +659,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
display_error( _("No Quick Entry lines are defined."));
set_focus('totamount');
return 0;
- }
+ }
$totrate = 0;
while ($row = db_fetch($result))
{
@@ -668,7 +670,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
case "t+": // ditto & increase base amount
case "t-": // ditto & reduce base amount
if (substr($row['action'],0,1) != 'T')
- $totrate += get_tax_type_default_rate($row['dest_id']);
+ $totrate += get_tax_type_rate($row['dest_id']);
}
}
$first = true;
@@ -842,7 +844,7 @@ function price_in_words($amount, $document=0)
else
$frac = "";
return _number_to_words(intval($amount)) . $frac;
-}
+}
function get_js_open_window($width, $height)
{
@@ -887,13 +889,14 @@ function reset_focus()
function get_js_date_picker()
{
- global $go_debug;
- $fpath = company_path().'/js_cache/'.'date_picker.js';
+ global $SysPrefs, $tmonths;
- if (!file_exists($fpath) || $go_debug) {
+ $fpath = user_js_cache().'/'.'date_picker.js';
- global $dateseps, $date_system, $tmonths;
+ if (!file_exists($fpath) || $SysPrefs->go_debug) {
+ $date_system = $SysPrefs->date_system;
+ $dateseps = $SysPrefs->dateseps;
$how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
$sep = $dateseps[user_date_sep()]; // date separator
$wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 || $how == 3 ? 0 : 1)); // weekstart (sun = 0, mon = 1)
@@ -1431,4 +1434,36 @@ function payment_link($name, $options)
return strtr($link, $patterns);
}
-?>
\ No newline at end of file
+function trans_editor_link($type, $trans_no)
+{
+ global $path_to_root;
+
+ $editor_url = array(
+ ST_JOURNAL => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
+ ST_BANKPAYMENT => "/gl/gl_bank.php?ModifyPayment=Yes&trans_no=%d&trans_type=%d",
+ ST_BANKDEPOSIT => "/gl/gl_bank.php?ModifyDeposit=Yes&trans_no=%d&trans_type=%d",
+ ST_BANKTRANSFER => "/gl/bank_transfer.php?ModifyTransfer=Yes&trans_no=%d&trans_type=%d",
+ ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d",
+ ST_CUSTCREDIT => "/sales/credit_note_entry.php?ModifyCredit=%d", // only for free hand credit notes (debtors_trans.order_==0)
+ ST_CUSTPAYMENT => "/sales/customer_payments.php?trans_no=%d",
+ ST_CUSTDELIVERY => "/sales/customer_delivery.php?ModifyDelivery=%d",
+// 16=> Location Transfer,
+// 17=> Inventory Adjustment,
+ ST_SUPPINVOICE => "/purchasing/supplier_invoice.php?ModifyInvoice=%d",
+ ST_SUPPCREDIT => "/purchasing/supplier_credit.php?ModifyCredit=%d",
+// 21=> Supplier Credit Note,
+// 22=> Supplier Payment,
+// 25=> Purchase Order Delivery,
+ ST_PURCHORDER => "/purchasing/po_entry_items.php?ModifyOrderNumber=%d",
+// 28=> Work Order Issue,
+// 29=> Work Order Production",
+ ST_WORKORDER => "/manufacturing/work_order_entry.php?trans_no=%d",
+ ST_SALESORDER => "/sales/sales_order_entry.php?ModifyOrderNumber=%d",
+ ST_SALESQUOTE => "/sales/sales_order_entry.php?ModifyQuotationNumber=%d",
+ // 35=> Cost Update,
+ );
+
+ return !isset($editor_url[$type]) ? '' :
+ (is_closed_trans($type, $trans_no) ? set_icon(ICON_CLOSED, _('Closed')) :
+ pager_link(_("Edit"), sprintf($editor_url[$type], $trans_no, $type), ICON_EDIT));
+}