X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=9f0e445092c0f99f8ad9eb1965788eed1fb705f3;hb=3c4482206218de2faceeb2f6563c92f28e57db50;hp=a2e965644097b62df4fdd80ecac206d5c7b410e5;hpb=37f4a02e0f4bea58e5b2097d583bf9395ffc515f;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index a2e96564..9f0e4450 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -29,9 +29,9 @@ function get_supplier_trans_view_str($type, $trans_no, $label="")
{
if ($use_popup_windows)
$preview_str = "$label";
- else
+ else
$preview_str = "$label";
- }
+ }
else
$preview_str = $label;
@@ -79,23 +79,33 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
$viewer = "view_credit.php";
elseif ($type == 12)
$viewer = "view_receipt.php";
+ elseif ($type == 13)
+ $viewer = "view_dispatch.php";
elseif ($type == 30)
$viewer = "view_sales_order.php";
else
return null;
+ if(!is_array($trans_no)) $trans_no = array($trans_no);
+
+ $lbl = $label;
+ $preview_str = '';
+ foreach($trans_no as $trans) {
if ($label == "")
- $label = $trans_no;
+ $lbl = $trans;
+
+ if($preview_str!='') $preview_str .= ',';
if ($viewer != "")
{
if ($use_popup_windows)
- $preview_str = "$label";
+ $preview_str .= "$lbl";
else
- $preview_str = "$label";
- }
+ $preview_str .= "$lbl";
+ }
else
- $preview_str = $label;
+ $preview_str .= $lbl;
+ }
return $preview_str;
}
@@ -126,9 +136,9 @@ function get_banking_trans_view_str($type, $trans_no, $label="")
{
if ($use_popup_windows)
$preview_str = "$label";
- else
+ else
$preview_str = "$label";
- }
+ }
else
$preview_str = $label;
@@ -157,9 +167,9 @@ function get_inventory_trans_view_str($type, $trans_no, $label="")
{
if ($use_popup_windows)
$preview_str = "$label";
- else
+ else
$preview_str = "$label";
- }
+ }
else
$preview_str = $label;
@@ -190,7 +200,7 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="")
{
if ($use_popup_windows)
$preview_str = "$label";
- else
+ else
$preview_str = "$label";
}
else
@@ -219,9 +229,9 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="")
{
if ($use_popup_windows)
$preview_str = "$label";
- else
+ else
$preview_str = "$label";
- }
+ }
else
$preview_str = $label;
@@ -265,7 +275,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=tr
{
if ($from_currency != $to_currency)
{
- if ($buttons && isset($_POST['get_rate']))
+ if ($buttons && isset($_POST['get_rate']))
{
$comp_currency = get_company_currency();
if ($from_currency == $comp_currency)
@@ -275,11 +285,11 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=tr
$rate = get_ecb_rate($currency);
if (get_date_exchange_rate($currency, $date_))
update_exchange_rate($currency, $date_, $rate, $rate);
- else
+ else
add_exchange_rate($currency, $date_, $rate, $rate);
if ($from_currency == $comp_currency)
$rate = 1 / $rate;
- }
+ }
else
$rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_);
$rate = number_format2($rate, user_exrate_dec());
@@ -314,10 +324,10 @@ function is_voided_display($type, $id, $label)
function comments_display_row($type, $id)
{
$comments = get_comments($type, $id);
- if ($comments and db_num_rows($comments))
+ if ($comments and db_num_rows($comments))
{
echo "
";
- while ($comment = db_fetch($comments))
+ while ($comment = db_fetch($comments))
{
echo $comment["memo_"] . " ";
}
@@ -331,7 +341,7 @@ function get_comments_string($type, $type_no)
{
$str_return = "";
$result = get_comments($type, $type_no);
- while ($comment = db_fetch($result))
+ while ($comment = db_fetch($result))
{
if (strlen($str_return))
$str_return = $str_return . " \n";
@@ -351,7 +361,7 @@ function view_stock_status($stock_id, $description=null)
else
//hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", $stock_id, "stock_id=$stock_id");
$preview_str = "$stock_id";
- echo $preview_str;
+ echo $preview_str;
}
function view_stock_status_cell($stock_id, $description=null)
@@ -369,12 +379,12 @@ function display_debit_or_credit_cells($value)
{
amount_cell($value);
label_cell("");
- }
+ }
elseif ($value < 0)
{
label_cell("");
amount_cell(abs($value));
- }
+ }
else
{
//label_cell("");
@@ -387,7 +397,7 @@ function display_debit_or_credit_cells($value)
function display_customer_trans_tax_details($tax_items, $columns)
{
- while ($tax_item = db_fetch($tax_items))
+ while ($tax_item = db_fetch($tax_items))
{
$tax = number_format2($tax_item['amount'],user_price_dec());
if ($tax_item['included_in_price'])
@@ -403,7 +413,7 @@ function display_customer_trans_tax_details($tax_items, $columns)
function display_supp_trans_tax_details($tax_items, $columns)
{
- while ($tax_item = db_fetch($tax_items))
+ while ($tax_item = db_fetch($tax_items))
{
$tax = number_format2(abs($tax_item['amount']),user_price_dec());
if ($tax_item['included_in_price'])
@@ -417,21 +427,21 @@ function display_supp_trans_tax_details($tax_items, $columns)
//--------------------------------------------------------------------------------------
-function display_edit_tax_items($taxes, $columns)
+function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
{
$total = 0;
- foreach ($taxes as $taxitem)
+ foreach ($taxes as $taxitem)
{
- if ($taxitem['included_in_price'])
+ if ($tax_included)
{
label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) " .
- _("Amount:") . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right");
- }
- else
+ _("Amount:") . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
+ }
+ else
{
label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)",
- number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right");
+ number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
$total += $taxitem['Value'];
}
}
@@ -461,7 +471,7 @@ function display_allocations($alloc_result, $total)
display_heading2(_("Allocations"));
start_table("$table_style width=80%");
-
+
$th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
_("Left to Allocate"), _("This Allocation"));
table_header($th);
@@ -499,7 +509,7 @@ function display_allocations($alloc_result, $total)
function display_allocations_from($person_type, $person_id, $type, $type_no, $total)
{
- switch ($person_type)
+ switch ($person_type)
{
case payment_person_types::customer() :
$alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
@@ -520,13 +530,13 @@ function get_js_go_back()
. "{\n"
. " if (window.history.length <= 1)\n"
. " window.close();\n"
- . " else\n"
- . " window.history.go(-1);\n"
+ . " else\n"
+ . " window.history.go(-1);\n"
. "}\n"
. "-->\n"
. "\n";
return $js;
-}
+}
function get_js_open_window($width, $height)
{
@@ -578,7 +588,7 @@ function get_js_form_entry($edit_name, $sel_name, $next_name)
. "}\n"
. "-->\n"
. "\n";
- return $js;
+ return $js;
}
function get_js_set_focus($name)
@@ -591,35 +601,35 @@ function get_js_set_focus($name)
. "}\n"
. "-->\n"
. "\n";
- return $js;
+ return $js;
}
function get_js_png_fix()
{
$js = "\n";
return $js;
-}
+}
function get_js_date_picker()
{
@@ -804,17 +814,17 @@ function CC() {
epbase = year - ((year >= 0) ? 474 : 473);
epyear = 474 + mod(epbase, 2820);
t = day + ((month <= 7) ? ((month - 1) * 31) : (((month - 1) * 30) + 6)) +
- Math.floor(((epyear * 682) - 110) / 2816) + (epyear - 1) * 365 +
+ Math.floor(((epyear * 682) - 110) / 2816) + (epyear - 1) * 365 +
Math.floor(epbase / 2820) * 1029983 + (1948320.5 - 1);
";
else if ($date_system == 2)
$js .= "
- var t;
- t = Math.floor((11 * year + 3) / 30) + 354 * year + 30 * month -
+ var t;
+ t = Math.floor((11 * year + 3) / 30) + 354 * year + 30 * month -
Math.floor((month - 1) / 2) + day + 1948440 - 385;
";
$js .= "
- return jwday(t);
+ return jwday(t);
";
}
else
@@ -839,7 +849,7 @@ function CC() {
$js .= "
var dateString = month+'$sep'+day+'$sep'+year;
";
- else if ($how == 1)
+ else if ($how == 1)
$js .= "
var dateString = day+'$sep'+month+'$sep'+year;
";
@@ -881,7 +891,7 @@ function CC() {
}
function getCurrentMonth() {
return new Date().getMonth() + 1;
- }
+ }
function getCurrentDay() {
return new Date().getDate();
}
@@ -1054,9 +1064,77 @@ document.write(\"\");
-->
";
- return $js;
+ return $js;
}
-
+//
+// Javascript conversions to/from user numeric format.
+//
+function add_js_user_num() {
+ global $thoseps, $decseps;
+ $ts = $thoseps[user_tho_sep()];
+ $ds = $decseps[user_dec_sep()];
+
+ $js =
+ "";
+ add_js_source($js);
+}
+
+function add_js_allocate() {
+ $source =
+ "";
+ add_js_user_num();
+ add_js_source($source);
+}
+
function alert($msg)
{
echo "\n\n";
-}
+}
-if (!function_exists('_vd'))
+if (!function_exists('_vd'))
{
- function _vd($mixed, $title = '', $exit = false)
+ function _vd($mixed, $title = '', $exit = false)
{
// Only the site admin is able to proceed here.
echo (!empty($title) ? ($title .':') : '') .'';
var_dump($mixed);
echo " \n";
- if ($exit)
+ if ($exit)
exit;
}
}
|