X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_view.inc;h=9f0e445092c0f99f8ad9eb1965788eed1fb705f3;hb=d415c4b31baaa6379a0c360a93a1f78f983df4e7;hp=f98970e6ceca016a7a07a556a94a7c38059a4a17;hpb=c7353ffde8fbcd970585936b006641dfaa1f7f77;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index f98970e6..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,48 +601,50 @@ 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()
{
- global $dateseps;
- //global $dateseps $path_to_root;
-
- //$encoding = "iso-8859-1"; // character encoding
- //$encoding = $_SESSION['language']->encoding; // character encoding
- //$dir = "ltr"; // left to right, right to left
- //$dir = $_SESSION['language']->dir; // left to right, right to left
+ global $dateseps, $date_system;
+
$how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
$sep = $dateseps[user_date_sep()]; // date separator
- $wstart = ($how == 0 ? 0 : 1); // weekstart (sun = 0, mon = 1)
+ $wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1)
+ $months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
+ $wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa"));
+ $back = _("Back");
+ if ($date_system == 1)
+ list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j"));
+ else if ($date_system == 2)
+ list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j"));
$js = " |