X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=616a0ffa9364ee687855e31712240a75813ca413;hb=063c5f22068dbbd6adccacaf5bd0f66b2eda8e4f;hp=1e43fdf9738e9b1b4b6ee937a851a5df0c64d618;hpb=10dced7e75209f8158e4e1fa250bfbf91cfaa182;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 1e43fdf9..616a0ffa 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -14,46 +14,34 @@ include_once($path_to_root . "/includes/types.inc");
//--------------------------------------------------------------------------------------
-function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
- if ($type == systypes::po())
- $viewer = "view_po.php";
- elseif ($type == 20)
- $viewer = "view_supp_invoice.php";
- elseif ($type == 21)
- $viewer = "view_supp_credit.php";
- elseif ($type == 22)
- $viewer = "view_supp_payment.php";
- elseif ($type == 25)
- $viewer = "view_grn.php";
+ $viewer = "purchasing/view/";
+ if ($type == ST_PURCHORDER)
+ $viewer .= "view_po.php";
+ elseif ($type == ST_SUPPINVOICE)
+ $viewer .= "view_supp_invoice.php";
+ elseif ($type == ST_SUPPCREDIT)
+ $viewer .= "view_supp_credit.php";
+ elseif ($type == ST_SUPPAYMENT)
+ $viewer .= "view_supp_payment.php";
+ elseif ($type == ST_SUPPRECEIVE)
+ $viewer .= "view_grn.php";
else
return null;
+ $viewer .= "?trans_no=$trans_no";
if ($label == "")
$label = $trans_no;
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, $viewer, $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_gl_view_str($type, $trans_no, $label="", $force=false)
+function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $id='')
{
- global $path_to_root;
-
if (!$force && !user_show_gl_info())
return "";
@@ -63,12 +51,10 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false)
$label = _("GL");
$icon = ICON_GL;
}
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $gl_view = "$pars[0]";
- return $gl_view;
+ return viewer_link($label,
+ "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no",
+ $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
@@ -82,21 +68,21 @@ function get_gl_view_str_cell($type, $trans_no, $label="")
//--------------------------------------------------------------------------------------
-function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
- if ($type == 10)
- $viewer = "view_invoice.php";
- elseif ($type == 11)
- $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";
+ $viewer = "sales/view/";
+
+ if ($type == ST_SALESINVOICE)
+ $viewer .= "view_invoice.php";
+ elseif ($type == ST_CUSTCREDIT)
+ $viewer .= "view_credit.php";
+ elseif ($type == ST_CUSTPAYMENT)
+ $viewer .= "view_receipt.php";
+ elseif ($type == ST_CUSTDELIVERY)
+ $viewer .= "view_dispatch.php";
+ elseif ($type == ST_SALESORDER || $type == ST_SALESQUOTE)
+ $viewer .= "view_sales_order.php";
else
return null;
@@ -110,173 +96,154 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
$lbl = $trans;
if($preview_str!='') $preview_str .= ',';
- if ($viewer != "")
- {
- $pars = access_string($lbl);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str .= "$pars[0]";
- }
- else
- $preview_str .= $lbl;
- }
+ $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans&trans_type=$type",
+ $class, $id, $icon);
- return $preview_str;
+ }
+ return $preview_str;
}
//--------------------------------------------------------------------------------------
-function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_banking_trans_view_str($type, $trans_no, $label="",
+ $icon=false, $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
+ if ($label == "")
+ $label = $trans_no;
- if ($type == 4)
+ if ($type == ST_BANKTRANSFER)
$viewer = "bank_transfer_view.php";
- elseif ($type == 1)
+ elseif ($type == ST_BANKPAYMENT)
$viewer = "gl_payment_view.php";
- elseif ($type == 2)
+ elseif ($type == ST_BANKDEPOSIT)
$viewer = "gl_deposit_view.php";
- elseif ($type == 0)
- $viewer = "";
else
return null;
- if ($label == "")
- $label = $trans_no;
-
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, "gl/view/$viewer?trans_no=$trans_no",
+ $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_inventory_trans_view_str($type, $trans_no, $label="",
+ $icon=false, $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
+ $viewer = "inventory/view/";
- if ($type == systypes::inventory_adjustment())
- $viewer = "view_adjustment.php";
- elseif ($type == systypes::location_transfer())
- $viewer = "view_transfer.php";
+ if ($type == ST_INVADJUST)
+ $viewer .= "view_adjustment.php";
+ elseif ($type == ST_LOCTRANSFER)
+ $viewer .= "view_transfer.php";
else
return null;
+ $viewer .= "?trans_no=$trans_no";
if ($label == "")
$label = $trans_no;
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, $viewer, $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_manufacturing_trans_view_str($type, $trans_no, $label="",
+ $icon=false, $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
-
- if ($type == 28)
- $viewer = "wo_issue_view.php";
- elseif ($type == 29)
- $viewer = "wo_production_view.php";
- elseif ($type == systypes::work_order())
- $viewer = "work_order_view.php";
+ $viewer = "manufacturing/view/";
+
+ if ($type == ST_MANUISSUE)
+ $viewer .= "wo_issue_view.php";
+ elseif ($type == ST_MANURECEIVE)
+ $viewer .= "wo_production_view.php";
+ elseif ($type == ST_WORKORDER)
+ $viewer .= "work_order_view.php";
else
return null;
+ $viewer .= "?trans_no=$trans_no";
+
if ($label == "")
$label = $trans_no;
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, $viewer, $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
{
- global $path_to_root;
+ if ($type == ST_DIMENSION)
+ $viewer = "dimensions/view/view_dimension.php?trans_no=$trans_no";
+ else
+ return null;
- $viewer = "";
+ if ($label == "")
+ $label = $trans_no;
- if ($type == 40)
- $viewer = "view_dimension.php";
+ return viewer_link($label, $viewer, $class, $id, $icon);
+}
+/*
+ Journal entry or cost update postings link
+*/
+function get_journal_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
+{
+ if ($type == ST_JOURNAL || $type == ST_COSTUPDATE)
+ $viewer = "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no";
else
return null;
if ($label == "")
$label = $trans_no;
- if ($viewer != "")
+ return viewer_link($label, $viewer, $class, $id, $icon);
+}
+
+//--------------------------------------------------------------------------------------
+
+function get_package_view_str($pkg, $label="", $icon=false, $class='', $id='')
+{
+ if ($label == "")
{
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
+ $label = _("Info");
+// $icon = ICON_GL;
}
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, "includes/ui/view_package.php?id=$pkg", $class, $id, $icon);
}
+
//--------------------------------------------------------------------------------------
-function get_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
{
- $view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
+ if ($view_str != null)
+ return $view_str;
+
+ $view_str = get_journal_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
@@ -303,9 +270,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=
if ($date_ == Today()) {
$rate = get_date_exchange_rate($currency, $date_);
if (!$rate) {
- $rate = get_ecb_rate($currency);
- if ($rate)
- add_exchange_rate($currency, $date_, $rate, $rate);
+ $row = get_currency($currency);
+ if ($row['auto_update']) {
+ $rate = retrieve_exrate($currency, $date_);
+ if ($rate)
+ add_exchange_rate($currency, $date_, $rate, $rate);
+ }
}
}
if (!$rate)
@@ -317,7 +287,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=
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" );
+ label_row(_("Exchange Rate:"),"$rate $from_currency = 1 $to_currency" );
$Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
}
}
@@ -326,13 +296,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=
function is_voided_display($type, $id, $label)
{
- global $table_style;
$void_entry = get_voided_entry($type, $id);
if ($void_entry == null)
return false;
- start_table("width=50% $table_style");
+ start_table(TABLESTYLE, "width=50%");
echo "
$label ";
echo "" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . " ";
if (strlen($void_entry["memo_"]) > 0)
@@ -399,23 +368,18 @@ function view_stock_status_cell($stock_id, $description=null)
//--------------------------------------------------------------------------------------
-function display_debit_or_credit_cells($value)
+function display_debit_or_credit_cells($value, $bold=false)
{
- if ($value > 0)
+ $value = round2($value, user_price_dec());
+ if ($value >= 0)
{
- amount_cell($value);
+ amount_cell($value, $bold);
label_cell("");
}
elseif ($value < 0)
{
label_cell("");
- amount_cell(abs($value));
- }
- else
- {
- //label_cell("");
- amount_cell(0);
- label_cell("");
+ amount_cell(abs($value), $bold);
}
}
@@ -423,15 +387,34 @@ function display_debit_or_credit_cells($value)
function display_customer_trans_tax_details($tax_items, $columns)
{
+ global $alternative_tax_include_on_docs, $suppress_tax_rates;
+ $first = true;
while ($tax_item = db_fetch($tax_items))
{
+ if (!$tax_item['amount'])
+ continue;
+
$tax = number_format2($tax_item['amount'],user_price_dec());
+ if (isset($suppress_tax_rates) && $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'])
- label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " .
- _("Amount") . ": $tax", "", "colspan=$columns align=right", "align=right");
+ {
+ if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+ {
+ if ($first)
+ label_row(_("Total Tax Excluded"), number_format2($tax_item['net_amount'], user_price_dec()),
+ "colspan=$columns align=right", "align=right");
+ label_row($tax_type_name, $tax, "colspan=$columns align=right", "align=right");
+ $first = false;
+ }
+ else
+ label_row(_("Included") . " " . $tax_type_name
+ . ": $tax", "", "colspan=$columns align=right", "align=right");
+ }
else
- label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
- $tax, "colspan=$columns align=right", "align=right");
+ label_row($tax_type_name, $tax, "colspan=$columns align=right", "align=right");
}
}
@@ -441,10 +424,13 @@ function display_supp_trans_tax_details($tax_items, $columns)
{
while ($tax_item = db_fetch($tax_items))
{
+ if (!$tax_item['amount'])
+ continue;
+
$tax = number_format2(abs($tax_item['amount']),user_price_dec());
if ($tax_item['included_in_price'])
- label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " .
- _("Amount") . ": $tax", "colspan=$columns align=right", "align=right");
+ label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) "
+ . ": $tax", '', "colspan=$columns align=right", "align=right");
else
label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
$tax, "colspan=$columns align=right", "align=right");
@@ -459,16 +445,18 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
foreach ($taxes as $taxitem)
{
- 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",$leftspan);
- }
- else
- {
- label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)",
- number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
- $total += round2($taxitem['Value'], user_price_dec());
+ 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());
+ }
}
}
@@ -480,22 +468,22 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
function display_footer_exit()
{
br(2);
- end_page();
+ end_page(false, false, true);
exit;
}
//--------------------------------------------------------------------------------------
-function display_allocations($alloc_result, $total)
+function display_allocations($alloc_result, $total, $payments=false)
{
- global $table_style;
+ global $systypes_array;
if (!$alloc_result || db_num_rows($alloc_result) == 0)
return;
- display_heading2(_("Allocations"));
+ display_heading2(($payments ? _("Payments") : _("Allocations")));
- start_table("$table_style width=80%");
+ start_table(TABLESTYLE, "width=80%");
$th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
_("Left to Allocate"), _("This Allocation"));
@@ -507,14 +495,15 @@ function display_allocations($alloc_result, $total)
alt_table_row_color($k);
- label_cell(systypes::name($alloc_row['type']));
+ label_cell($systypes_array[$alloc_row['type']]);
label_cell(get_trans_view_str($alloc_row['type'],$alloc_row['trans_no']));
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))
+ $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();
@@ -539,17 +528,34 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
{
switch ($person_type)
{
- case payment_person_types::customer() :
+ case PT_CUSTOMER :
$alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
display_allocations($alloc_result, $total);
return;
- case payment_person_types::supplier() :
+ case PT_SUPPLIER :
$alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type);
display_allocations($alloc_result, $total);
return;
}
}
+//--------------------------------------------------------------------------------------
+
+function display_allocations_to($person_type, $person_id, $type, $type_no, $total)
+{
+ switch ($person_type)
+ {
+ case PT_CUSTOMER :
+ $alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type);
+ display_allocations($alloc_result, $total, true);
+ return;
+ case PT_SUPPLIER :
+ $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type);
+ display_allocations($alloc_result, $total, true);
+ return;
+ }
+}
+
//--------------------------------------------------------------------------------------
//
// Expands selected quick entry $id into GL posings and adds to cart.
@@ -571,9 +577,44 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
if ($type != QE_SUPPINV) // only one quick entry on journal/bank transaction
$cart->clear_items();
$qe = get_quick_entry($id);
+ if ($qe['bal_type'] == 1)
+ {
+ if ($qe['base_amount'] == 1.0) // monthly
+ $begin = begin_month($cart->tran_date);
+ else
+ {
+ if (is_account_balancesheet($qe['base_desc'])) // total
+ $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;
- $qe_lines = get_quick_entry_lines($id);
- while ($qe_line = db_fetch($qe_lines))
+ $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;
+ }
+ $totrate = 0;
+ while ($row = db_fetch($result))
+ {
+ $qe_lines[] = $row;
+
+ switch (strtolower($row['action'])) {
+ 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')
+ $totrate += get_tax_type_default_rate($row['dest_id']);
+ }
+ }
+ $first = true;
+ $taxbase = 0;
+ foreach($qe_lines as $qe_line)
{
switch (strtolower($qe_line['action'])) {
case "=": // post current base amount to GL account
@@ -602,34 +643,51 @@ 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
- $taxes = get_taxes_for_item_tax($qe_line['dest_id']);
- $tax_total = 0;
- foreach ($taxes as $index => $item_tax) {
- if(substr($qe_line['action'],0,1) != 'T')
- $tax = round2($base * $item_tax['rate']
- / ($item_tax['rate'] + 100), user_price_dec());
- else
- $tax = round2($base * $item_tax['rate'] / 100, user_price_dec());
-
- $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0))
- ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
- $tax_total += $tax;
- 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']);
- }
+ if ($first)
+ {
+ $taxbase = $base/($totrate+100);
+ $first = false;
+ }
+
+ if (substr($qe_line['action'],0,1) != 'T')
+ $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);
+ 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;
+ $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']);
}
if (strpos($qe_line['action'], '+'))
- $base += $tax_total;
+ $base += $tax;
elseif (strpos($qe_line['action'], '-'))
- $base -= $tax_total;
+ $base -= $tax;
continue 2;
}
if ($type != QE_SUPPINV)
@@ -647,6 +705,85 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
return $bank_amount;
}
+//--------------------------------------------------------------------------------------
+//
+// Simple English version of number to words conversion.
+//
+function _number_to_words($number)
+{
+ $Bn = floor($number / 1000000000); /* Billions (giga) */
+ $number -= $Bn * 1000000000;
+ $Gn = floor($number / 1000000); /* Millions (mega) */
+ $number -= $Gn * 1000000;
+ $kn = floor($number / 1000); /* Thousands (kilo) */
+ $number -= $kn * 1000;
+ $Hn = floor($number / 100); /* Hundreds (hecto) */
+ $number -= $Hn * 100;
+ $Dn = floor($number / 10); /* Tens (deca) */
+ $n = $number % 10; /* Ones */
+
+ $res = "";
+
+ if ($Bn)
+ $res .= _number_to_words($Bn) . " Billion";
+ if ($Gn)
+ $res .= (empty($res) ? "" : " ") . _number_to_words($Gn) . " Million";
+ if ($kn)
+ $res .= (empty($res) ? "" : " ") . _number_to_words($kn) . " Thousand";
+ if ($Hn)
+ $res .= (empty($res) ? "" : " ") . _number_to_words($Hn) . " Hundred";
+
+ $ones = array("", "One", "Two", "Three", "Four", "Five", "Six",
+ "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen",
+ "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen",
+ "Nineteen");
+ $tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty",
+ "Seventy", "Eighty", "Ninety");
+
+ if ($Dn || $n)
+ {
+ if (!empty($res))
+ $res .= " and ";
+ if ($Dn < 2)
+ $res .= $ones[$Dn * 10 + $n];
+ else
+ {
+ $res .= $tens[$Dn];
+ if ($n)
+ $res .= "-" . $ones[$n];
+ }
+ }
+
+ if (empty($res))
+ $res = "zero";
+ return $res;
+}
+
+function price_in_words($amount, $document=0)
+{
+ // use local price_in_words() if the hook is defined
+ $price = hook_price_in_words($amount, $document);
+ if ($price)
+ return $price;
+
+ // Only usefor Remittance and Receipts as default
+ if (!($document == ST_SUPPAYMENT || $document == ST_CUSTPAYMENT || $document == ST_CHEQUE))
+ return "";
+ if ($amount < 0 || $amount > 999999999999)
+ return "";
+ $dec = user_price_dec();
+ if ($dec > 0)
+ {
+ $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)
{
@@ -670,50 +807,37 @@ function set_focus($name, $form_no=0) {
}
//
// Set default focus on first field $name if not set yet
-//
-function default_focus($name, $form_no=0) {
+// Returns unique name if $name=null
+//
+function default_focus($name=null, $form_no=0) {
+ static $next;
+ if ($name==null)
+ $name = uniqid('_el',true);
if (!isset($_POST['_focus'])) {
set_focus($name);
}
+ return $name;
}
-
-function get_js_png_fix()
+/*
+ Reset focus to next control element (e.g. link).
+*/
+function reset_focus()
{
- $js = "function fixPNG(myImage)\n"
- . "{\n"
- . " var arVersion = navigator.appVersion.split(\"MSIE\")\n"
- . " var version = parseFloat(arVersion[1])\n"
- . " if ((version >= 5.5) && (version < 7) && (document.body.filters))\n"
- . " {\n"
- . " var imgID = (myImage.id) ? \"id='\" + myImage.id + \"' \" : \"\"\n"
- . " var imgClass = (myImage.className) ? \"class='\" + myImage.className + \"' \" : \"\"\n"
- . " var imgTitle = (myImage.title) ?\n"
- . " \"title='\" + myImage.title + \"' \" : \"title='\" + myImage.alt + \"' \"\n"
- . " var imgStyle = \"display:inline-block;\" + myImage.style.cssText\n"
- . " var strNewHTML = \"\"\n"
- . " myImage.outerHTML = strNewHTML\n"
- . " }\n"
- . "}\n";
- return $js;
+ unset($_POST['_focus']);
}
function get_js_date_picker()
{
- global $comp_path, $go_debug;
- $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
+ global $go_debug;
+ $fpath = company_path().'/js_cache/'.'date_picker.js';
if (!file_exists($fpath) || $go_debug) {
- global $dateseps, $date_system;
+ global $dateseps, $date_system, $tmonths;
$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) ? 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
@@ -796,6 +920,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;
@@ -898,7 +1023,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);
@@ -912,25 +1037,34 @@ 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)
+ else if ($how == 1 || $how == 4)
$js .= "
var dateString = day+'$sep'+month+'$sep'+year;
";
- else
+ else if ($how == 2 || $how == 5)
$js .= "
var dateString = year+'$sep'+month+'$sep'+day;
";
$js .= "
dateField.value = dateString;
setFocus(dateField.name);
+ if(dateField.getAttribute('aspect')=='cdate')
+ setElementProperty('color', (dateField.value==user.date ? 'black':'red'), dateField);
if (dateField.className=='searchbox')
dateField.onblur();
hide();
@@ -1008,7 +1142,7 @@ function CC() {
if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) {
css_class = 'current';
";
- if ($date_system == 1 || $date_system == 2)
+ if ($date_system == 1 || $date_system == 2 || $date_system == 3)
$js .= "
} else if (dayOfWeek == 5) {
";
@@ -1058,11 +1192,29 @@ function CC() {
selectedMonth = parseInt(dateParts[1],10);
selectedYear = parseInt(dateParts[2],10);
";
- else
+ else if ($how == 2)
$js .= "
selectedYear = parseInt(dateParts[0],10);
selectedMonth = parseInt(dateParts[1],10);
selectedDay = parseInt(dateParts[2],10);
+";
+ else if ($how == 3)
+ $js .= "
+ selectedDay = parseInt(dateParts[1],10);
+ selectedMonth = parseInt(tmonths.indexOf(dateParts[0]),10);
+ selectedYear = parseInt(dateParts[2],10);
+";
+ else if ($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) {}
@@ -1165,53 +1317,59 @@ if (!function_exists('_vd'))
{
function _vd($mixed, $title = '', $exit = false)
{
- // Only the site admin is able to proceed here.
$str = (!empty($title) ? ($title .':') : '') .'';
$str .= print_r($mixed, true); //var_dump($mixed);
$str .= " \n";
- display_error('');
+ display_notification('');
if ($exit)
exit;
}
}
-function display_backtrace($cond=true, $msg='') {
+function _vl($mixed, $title = '', $exit = false)
+{
+ error_log((!empty($title) ? ($title .':') : '') . var_export($mixed, true));
+ if ($exit)
+ exit;
+}
+function display_backtrace($cond=true, $msg='') {
if ($cond) {
if ($msg)
$str = "$msg\n";
else
$str = '';
- $str .= '';
- $trace = debug_backtrace();
- foreach($trace as $trn => $tr) {
- if (!$trn) continue;
- $str .= '';
- $str .= $tr['file'].':'.$tr['line'].': ';
- $str .= ' | ';
- if (isset($tr['type'])) {
- if($tr['type'] == '::') {
- $str .= $tr['class'].'::';
- } else if($tr['type'] == '->') {
- $str .= '('.$tr['class'].' Object)'.'->';
- }
- }
- foreach($tr['args'] as $n=>$a) {
- if (is_object($tr['args'][$n]))
- $tr['args'][$n] = "(".get_class($tr['args'][$n])." Object)";
- if (is_array($tr['args'][$n]))
- $tr['args'][$n] = "(Array[".count($tr['args'][$n])."])";
- else
- $tr['args'][$n] = "'".$tr['args'][$n]."'";
- }
- $str .= $tr['function'].'('. implode(',',$tr['args']).') | ';
-
- $str .= ' ';
- }
-
- $str .= ' ';
- display_error($str);
+ $str .= get_backtrace(true);
+ display_error($str);
}
}
+//
+// FIXME: $payment_services array will be moved to bank_accounts in 2.4.x
+//
+if (!isset($payment_services))
+{
+ $payment_services = array(
+ 'PayPal' => "https://www.paypal.com/xclick/business=&item_name=&amount=¤cy_code=",
+ );
+}
+/*
+* Payment link generation. Options provided during invoice generation:
+* company_email, comment, amount, currency
+*/
+function payment_link($name, $options)
+{
+ global $payment_services;
+
+ $link = @$payment_services[$name];
+
+ if (!$link) return null;
+
+ $patterns = array();
+ foreach ($options as $id => $option)
+ $patterns['<'.$id.'>'] = urlencode($options[$id]);
+
+ return strtr($link, $patterns);
+}
+
?>
\ No newline at end of file
|