X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_view.inc;h=9c2b594f242041460dd7c1cb8438b600c5281191;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=5b6de2fb7c6010334951272a30886e756ceb4243;hpb=4528afda32783ab1b4e5e88fe19e2136a3f060e1;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 5b6de2fb..9c2b594f 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);
}
@@ -250,45 +250,81 @@ function get_trans_view_str($type, $trans_no, $label="", $icon=false,
return null;
}
+/*
+ Helper for ui drawing functions.
+ Checks whether any of input function parameters has changed or page is called with GET method (first page display).
+ $name - context
+*/
+function check_ui_refresh($name=null)
+{
+ $bt = debug_backtrace();
+ if (!$name)
+ $name = $bt[1]['function'];
+ $old = @$_SESSION['ui_context'][$name];
+ $new = $_SESSION['ui_context'][$name] = $bt[1]['args'];
+ return ($new != $old);
+}
+
//--------------------------------------------------------------------------------------
// Displays currency exchange rate for given date.
// When there is no exrate for today,
// gets it form ECB and stores in local database.
//
-function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=false)
+function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false)
{
- global $Ajax;
+ global $Ajax, $SysPrefs;
+
+ $readonly = false;
if ($from_currency != $to_currency)
{
- $comp_currency = get_company_currency();
- if ($from_currency == $comp_currency)
- $currency = $to_currency;
- else
- $currency = $from_currency;
- $rate = 0;
- if ($date_ == Today()) {
- $rate = get_date_exchange_rate($currency, $date_);
- if (!$rate) {
+ $rate = get_post('_ex_rate');
+ if (check_ui_refresh() || !$rate) { // readonly or ui context changed
+ $comp_currency = get_company_currency();
+ if ($from_currency == $comp_currency)
+ $currency = $to_currency;
+ else
+ $currency = $from_currency;
+
+ $rate = get_date_exchange_rate($currency, $date_); // try local
+
+ if ($rate)
+ $readonly = true; // if we have already local exrate keep it unchanged
+
+ if (!$rate) { // retry from remote service
$row = get_currency($currency);
- if ($row['auto_update']) {
- $rate = retrieve_exrate($currency, $date_);
- if ($rate)
- add_exchange_rate($currency, $date_, $rate, $rate);
+
+ if ($row['auto_update']) // autoupdate means use remote service & store exrate on first transaction.
+ {
+ $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 ($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;
+ add_new_exchange_rate($currency, $date_, $rate);
+ }
}
}
+ if (!$rate) { // get and edit latest available
+ $rate = get_exchange_rate_from_home_currency($currency, $date_);
+ }
+ if ($from_currency != $comp_currency)
+ $rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_));
+ $Ajax->activate('_ex_rate_span');
}
- if (!$rate)
- $rate = get_exchange_rate_from_home_currency($currency, $date_);
- if ($from_currency != $comp_currency)
- $rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_));
$rate = number_format2($rate, user_exrate_dec());
- if ($edit_rate)
- text_row(_("Exchange Rate:"), '_ex_rate', $rate, 8, 8, null, "", " $from_currency = 1 $to_currency");
- else
- label_row(_("Exchange Rate:"),"$rate $from_currency = 1 $to_currency" );
- $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
+
+ if ($force_edit || !$readonly)
+ $ctrl = "";
+ else
+ $ctrl = "$rate";
+
+ label_row(_("Exchange Rate:"), $span = "$ctrl $from_currency = 1 $to_currency" );
+
+ $Ajax->addUpdate('_ex_rate_span', '_ex_rate_span', $span);
}
}
@@ -301,7 +337,7 @@ function is_voided_display($type, $id, $label)
if ($void_entry == null)
return false;
- start_table(TABLESTYLE, "width=50%");
+ start_table(TABLESTYLE, "width='50%'");
echo "
$label ";
echo "" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . " ";
if (strlen($void_entry["memo_"]) > 0)
@@ -322,7 +358,7 @@ function comments_display_row($type, $id)
echo " |
";
while ($comment = db_fetch($comments))
{
- echo $comment["memo_"] . " ";
+ echo nl2br($comment["memo_"]) . " ";
}
echo " |
";
}
@@ -350,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;
@@ -387,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))
{
@@ -395,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()),
@@ -439,51 +476,74 @@ function display_supp_trans_tax_details($tax_items, $columns)
//--------------------------------------------------------------------------------------
-function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
+function display_edit_tax_items($taxes, $columns, $tax_included, $rightspan=0, $editable=false)
{
$total = 0;
foreach ($taxes as $taxitem)
- {
- if ($taxitem['Value'] != 0) {
- if ($tax_included)
- {
- label_row(_("Included") . " " . $taxitem['tax_type_name']
- . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
- }
- else
- {
- label_row($taxitem['tax_type_name'],
- number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
- $total += round2($taxitem['Value'], user_price_dec());
- }
- }
- }
-
- return $total;
+ {
+ $amount = isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
+ if ($taxitem['Value'] != 0){
+ if ($editable) {
+ if (!isset($_POST['mantax['.$taxitem['tax_type_id'].']']))
+ $_POST['mantax['.$taxitem['tax_type_id'].']'] = price_format($amount);
+ start_row();
+ if ($tax_included) {
+ $colspan = $columns-1;
+ label_cell(_("Included") . " " . $taxitem['tax_type_name'].":",
+ "colspan={$colspan} align='right'");
+ amount_cells(null, 'mantax['.$taxitem['tax_type_id'].']',
+ null, "colspan=$columns align=right", ' | ', user_price_dec());
+ } else {
+ label_cell($taxitem['tax_type_name'], "colspan=$columns align='right'");
+ amount_cells(null, 'mantax['.$taxitem['tax_type_id'].']',
+ null, "colspan=$columns align=right", null, user_price_dec());
+ $total += round2($amount, user_price_dec());
+ }
+ if ($rightspan)
+ label_cell('', "colspan ='$rightspan'");
+ end_row();
+ } else {
+ $value = number_format2($taxitem['Value'],user_price_dec());
+ if ($tax_included)
+ {
+ label_row(_("Included") . " " . $taxitem['tax_type_name']
+ . " " . $value , "", "colspan=$columns align=right", "align=right", $rightspan);
+ }
+ else
+ {
+ label_row($taxitem['tax_type_name'],
+ $value, "colspan=$columns align=right", "align=right", $rightspan);
+ $total += round2($taxitem['Value'], user_price_dec());
+ }
+ }
+ }
+ }
+ return $total;
}
//--------------------------------------------------------------------------------------
-function display_footer_exit()
+function display_footer_exit($space=2)
{
- br(2);
+ if ($space)
+ br($space);
end_page(false, false, true);
exit;
}
//--------------------------------------------------------------------------------------
-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%");
+ start_table(TABLESTYLE, "width='80%'");
$th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
_("Left to Allocate"), _("This Allocation"));
@@ -492,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']]);
@@ -500,9 +559,10 @@ 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 ($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['PrevAllocs'] - $alloc_row['amt']);
- amount_cell($alloc_row['Total'] - $alloc_row['amt']);
+ amount_cell($alloc_row['Total'] - $alloc_row['amt']);
amount_cell($alloc_row['amt']);
end_row();
@@ -512,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);
}
@@ -529,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;
}
}
@@ -546,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;
}
}
@@ -563,7 +625,7 @@ function display_allocations_to($person_type, $person_id, $type, $type_no, $tota
function display_quick_entries(&$cart, $id, $base, $type, $descr='')
{
$bank_amount = 0;
-
+
if (!isset($id) || $id == null || $id == "")
{
display_error( _("No Quick Entries are defined."));
@@ -573,31 +635,79 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
{
if ($type == QE_DEPOSIT)
$base = -$base;
- if ($type != QE_SUPPINV) // only one quick entry on journal/bank transaction
+ if ($type != QE_SUPPINV && $type != QE_JOURNAL) // only one quick entry on journal/bank transaction
$cart->clear_items();
+
+ // as for now tax_group is passed only in QE_SUPPINV
+ $qe_lines = quickentry_calculate($base, $id, @$cart->tax_group_id, $cart->tran_date);
+
+ if ($qe_lines === 0)
+ {
+ display_error( _("No Quick Entry lines are defined."));
+ set_focus('totamount');
+ return 0;
+ } elseif ($qe_lines === -1)
+ {
+ display_error(_("Cannot post to GL account used by more than one tax type."));
+ return 0;
+ }
+ foreach($qe_lines as $qe_line)
+ {
+ if ($descr != '') $qe_line['descr'] .= ': '.$descr;
+ if ($type != QE_SUPPINV)
+ $cart->add_gl_item($qe_line['code'], $qe_line['dim1'],
+ $qe_line['dim2'], $qe_line['amount'], $qe_line['descr']);
+ else
+ {
+ $acc_name = get_gl_account_name($qe_line['code']);
+ $cart->add_gl_codes_to_trans($qe_line['code'],
+ $acc_name, $qe_line['dim1'],
+ $qe_line['dim2'], $qe_line['amount'], $qe_line['descr']);
+ }
+ }
+ }
+ return $bank_amount;
+}
+
+//--------------------------------------------------------------------------------------
+
+function quickentry_calculate($base, $id, $taxgroup=null, $date=null)
+{
+ $gl_entries = array();
$qe = get_quick_entry($id);
- if ($qe['bal_type'] == 1)
+ $type = $qe['type'];
+ $total = $base;
+ // quick entry made on account balance is special case.
+ if ($qe['bal_type'] == 1) // if this is quick entry based on balance - calculate it
{
- if ($qe['base_amount'] == 1.0) // monthly
- $begin = begin_month($cart->tran_date);
+ // Note, that this is ugly hack overriding standard field usage
+ // just to make the feature available between major FA releases!
+ $gl_code = $qe['base_desc'];
+ $monthly = $qe['base_amount'] == 1.0;
+
+ if (!isset($date))
+ $date = Today();
+
+ if ($monthly) // marked as monthly
+ $begin = begin_month($date);
else
{
- if (is_account_balancesheet($qe['base_desc'])) // total
+ if (is_account_balancesheet($gl_code)) // total
$begin = "";
else
$begin = begin_fiscalyear(); // from fiscalyear begin
- }
- $base = get_gl_trans_from_to($begin, $cart->tran_date, $qe['base_desc']);
-
+ }
+ $base = get_gl_trans_from_to($begin, $date, $gl_code);
+
}
- if ($descr != '') $qe['description'] .= ': '.$descr;
+
$result = get_quick_entry_lines($id);
if (db_num_rows($result) == 0)
{
- display_error( _("No Quick Entry lines are defined."));
- set_focus('totamount');
return 0;
- }
+ }
+
+ // first calculate total rate in case more than one tax is used
$totrate = 0;
while ($row = db_fetch($result))
{
@@ -607,7 +717,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
case "t": // post taxes calculated on base amount
case "t+": // ditto & increase base amount
case "t-": // ditto & reduce base amount
- if (substr($row['action'],0,1) != 'T')
+ if (substr($row['action'], 0, 1) != 'T')
$totrate += get_tax_type_default_rate($row['dest_id']);
}
}
@@ -615,6 +725,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
$taxbase = 0;
foreach($qe_lines as $qe_line)
{
+ $gl_code = $qe_line['dest_id'];
switch (strtolower($qe_line['action'])) {
case "=": // post current base amount to GL account
$part = $base;
@@ -652,58 +763,45 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
$part = $taxbase;
else
$part = $base/100;
+
$item_tax = get_tax_type($qe_line['dest_id']);
//if ($type == QE_SUPPINV && substr($qe_line['action'],0,1) != 'T')
if ($type == QE_SUPPINV)
{
- $taxgroup = $cart->tax_group_id;
$rates = 0;
- $res = get_tax_group_rates($cart->tax_group_id);
+ $res = get_tax_group_rates($taxgroup);
while ($row = db_fetch($res))
$rates += $row['rate'];
if ($rates == 0)
continue 2;
}
$tax = round2($part * $item_tax['rate'], user_price_dec());
- if ($tax==0) continue 2;
+ if ($tax == 0) continue 2;
$gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0))
? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
if (!is_tax_gl_unique($gl_code)) {
- display_error(_("Cannot post to GL account used by more than one tax type."));
- break 2;
- }
- if ($type != QE_SUPPINV)
- $cart->add_gl_item($gl_code,
- $qe_line['dimension_id'], $qe_line['dimension2_id'],
- $tax, $qe['description']);
- else
- {
- $acc_name = get_gl_account_name($gl_code);
- $cart->add_gl_codes_to_trans($gl_code,
- $acc_name, $qe_line['dimension_id'],
- $qe_line['dimension2_id'], $tax, $qe['description']);
+ return -1; // more than one taxtype used with this GL account
}
+
+ $part = $tax;
if (strpos($qe_line['action'], '+'))
$base += $tax;
elseif (strpos($qe_line['action'], '-'))
$base -= $tax;
- continue 2;
- }
- if ($type != QE_SUPPINV)
- $cart->add_gl_item($qe_line['dest_id'], $qe_line['dimension_id'],
- $qe_line['dimension2_id'], $part, $qe['description']);
- else
- {
- $acc_name = get_gl_account_name($qe_line['dest_id']);
- $cart->add_gl_codes_to_trans($qe_line['dest_id'],
- $acc_name, $qe_line['dimension_id'],
- $qe_line['dimension2_id'], $part, $qe['description']);
+ }
+ $gl_entries[] = array(
+ 'code' => $gl_code,
+ 'name' => get_gl_account_name($gl_code),
+ 'dim1' => $qe_line['dimension_id'],
+ 'dim2' => $qe_line['dimension2_id'],
+ 'amount' => $part,
+ 'descr' => $qe_line['memo']
+ );
}
- }
- }
- return $bank_amount;
+ return $gl_entries;
}
+
//--------------------------------------------------------------------------------------
//
// Simple English version of number to words conversion.
@@ -734,10 +832,10 @@ function _number_to_words($number)
$ones = array("", "One", "Two", "Three", "Four", "Five", "Six",
"Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen",
- "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eightteen",
+ "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen",
"Nineteen");
$tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty",
- "Seventy", "Eigthy", "Ninety");
+ "Seventy", "Eighty", "Ninety");
if ($Dn || $n)
{
@@ -773,16 +871,16 @@ function price_in_words($amount, $document=0)
$dec = user_price_dec();
if ($dec > 0)
{
- $divisor = pow(10, $dec);
- $frac = round2($amount - floor($amount), $dec) * $divisor;
- $frac = sprintf("%0{$dec}d", $frac);
+ $divisor = pow(10, $dec);
+ $frac = round2($amount - floor($amount), $dec) * $divisor;
+ $frac = sprintf("%0{$dec}d", round2($frac, 0));
$and = _("and");
$frac = " $and $frac/$divisor";
}
else
$frac = "";
return _number_to_words(intval($amount)) . $frac;
-}
+}
function get_js_open_window($width, $height)
{
@@ -827,23 +925,24 @@ 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;
+ 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 ? 0 : 1)); // weekstart (sun = 0, mon = 1)
+ $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 || $how == 3 ? 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"));
$wno = _("W"); // week no
$back = _("Back");
if ($date_system == 1)
list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j"));
- else if ($date_system == 2)
+ elseif ($date_system == 2)
list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j"));
@@ -919,6 +1018,7 @@ function CC() {
var selectedDay = 0;
var months = ['$months[0]','$months[1]','$months[2]','$months[3]','$months[4]','$months[5]','$months[6]','$months[7]','$months[8]','$months[9]','$months[10]','$months[11]'];
var wdays = ['$wdays[0]', '$wdays[1]', '$wdays[2]', '$wdays[3]', '$wdays[4]', '$wdays[5]', '$wdays[6]'];
+ var tmonths = ['$tmonths[0]','$tmonths[1]','$tmonths[2]','$tmonths[3]','$tmonths[4]','$tmonths[5]','$tmonths[6]','$tmonths[7]','$tmonths[8]','$tmonths[9]','$tmonths[10]','$tmonths[11]','$tmonths[12]'];
var dateField = null;
function getProperty(p_property){
var p_elm = calendarId;
@@ -963,7 +1063,7 @@ function CC() {
$js .= "
return [31,31,31,31,31,31,30,30,30,30,30,(((((((year - ((year > 0) ? 474 : 473)) % 2820) + 474) + 38) * 682) % 2816) < 682 ? 30 : 29)][month-1];
";
- else if ($date_system == 2)
+ elseif ($date_system == 2)
$js .= "
return [30,29,30,29,30,29,30,29,30,29,30,(((((11 * year) + 14) % 30) < 11) ? 30 : 29)][month-1];
";
@@ -996,7 +1096,7 @@ function CC() {
Math.floor(((epyear * 682) - 110) / 2816) + (epyear - 1) * 365 +
Math.floor(epbase / 2820) * 1029983 + (1948320.5 - 1);
";
- else if ($date_system == 2)
+ elseif ($date_system == 2)
$js .= "
var t;
t = Math.floor((11 * year + 3) / 30) + 354 * year + 30 * month -
@@ -1021,7 +1121,7 @@ function CC() {
this.getWeek = getWeek;
function getWeek(year, month, day) {
";
- if ($how == 0)
+ if ($how == 0 || $how == 3)
$js .= " day++;";
$js .= "
var date = new Date(year,month-1,day);
@@ -1035,19 +1135,26 @@ function CC() {
}
this.setDate = setDate;
function setDate(year, month, day) {
- if (dateField) {
+ if (dateField){
+";
+ if ($how < 3)
+ $js .= "
if (month < 10) {month = '0' + month;}
if (day < 10) {day = '0' + day;}
";
- if ($how == 0)
+ else
+ $js .= "
+ month = tmonths[month];
+";
+ if ($how == 0 || $how == 3)
$js .= "
var dateString = month+'$sep'+day+'$sep'+year;
";
- else if ($how == 1)
+ elseif ($how == 1 || $how == 4)
$js .= "
var dateString = day+'$sep'+month+'$sep'+year;
";
- else
+ elseif ($how == 2 || $how == 5)
$js .= "
var dateString = year+'$sep'+month+'$sep'+day;
";
@@ -1177,17 +1284,35 @@ function CC() {
selectedDay = parseInt(dateParts[1],10);
selectedYear = parseInt(dateParts[2],10);
";
- else if ($how == 1)
+ elseif ($how == 1)
$js .= "
selectedDay = parseInt(dateParts[0],10);
selectedMonth = parseInt(dateParts[1],10);
selectedYear = parseInt(dateParts[2],10);
";
- else
+ elseif ($how == 2)
$js .= "
selectedYear = parseInt(dateParts[0],10);
selectedMonth = parseInt(dateParts[1],10);
selectedDay = parseInt(dateParts[2],10);
+";
+ elseif ($how == 3)
+ $js .= "
+ selectedDay = parseInt(dateParts[1],10);
+ selectedMonth = parseInt(tmonths.indexOf(dateParts[0]),10);
+ selectedYear = parseInt(dateParts[2],10);
+";
+ elseif ($how == 4)
+ $js .= "
+ selectedDay = parseInt(dateParts[0],10);
+ selectedMonth = parseInt(tmonths.indexOf(dateParts[1]),10);
+ selectedYear = parseInt(dateParts[2],10);
+";
+ else
+ $js .= "
+ selectedYear = parseInt(dateParts[0],10);
+ selectedMonth = parseInt(tmonths.indexOf(dateParts[1]),10);
+ selectedDay = parseInt(dateParts[2],10);
";
$js .= "
} catch(e) {}
@@ -1323,7 +1448,7 @@ function display_backtrace($cond=true, $msg='') {
if (!isset($payment_services))
{
$payment_services = array(
- 'PayPal' => "https://www.paypal.com/xclick/business=&item_name=&amount=¤cy_code=",
+ 'PayPal' => "https://www.paypal.com/xclick?business=&item_name=&amount=¤cy_code=",
);
}
/*
@@ -1345,4 +1470,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));
+}