X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdashboard.inc;h=9a5a9f4b5ce57e024ebc5292ffecdcfde36c7e31;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=69654c88e39f9ba6e4624c6e55e1c663dead245d;hpb=cf776631b028241405a5b2c41d0c03da456880f7;p=fa-stable.git diff --git a/includes/dashboard.inc b/includes/dashboard.inc index 69654c88..9a5a9f4b 100644 --- a/includes/dashboard.inc +++ b/includes/dashboard.inc @@ -15,7 +15,7 @@ function dashboard($sel_app) $selected_app = $sel_app; - if (!$_SESSION["wa_current_user"]->check_application_access($selected_app)) + if (is_object($sel_app) && !$_SESSION["wa_current_user"]->check_application_access($selected_app)) return; // first have a look through the directory, // and remove old temporary pdfs and pngs @@ -157,12 +157,15 @@ function display_all() table_one(); $title = customer_top($today, 3, 66, $pg); source_graphic($today, $title, _("Customer"), $pg, _("Sales")); + $pg = new graph(); $title = supplier_top($today, 3, 66, $pg); source_graphic($today, $title, _("Supplier"), $pg, _("Purchases")); + $pg = new graph(); $title = stock_top($today, 3, 66, 0, $pg); - source_graphic($today, $title, _("Stock"), $pg, _("Sales")); + source_graphic($today, $title, _("Items"), $pg, _("Sales"), _("Costs")); table_two(); dimension_top($today, 3, 66); + $pg = new graph(); $title = gl_top($today, 66, $pg); source_graphic($today, $title, _("Class"), $pg, _("Amount"), null, 5); stock_top($today, 3, 66, 2); @@ -181,7 +184,7 @@ function customer_top($today, $limit=10, $width="33", &$pg=null) AND tran_date >= '$begin1' AND tran_date <= '$today1' GROUP by d.debtor_no ORDER BY total DESC, d.debtor_no LIMIT $limit"; $result = db_query($sql); - $title = _("Top $limit customers in fiscal year"); + $title = sprintf(_("Top %s customers in fiscal year"), $limit); display_title($title); $th = array(_("Customer"), _("Amount")); start_table(TABLESTYLE, "width='$width%'"); @@ -192,7 +195,7 @@ function customer_top($today, $limit=10, $width="33", &$pg=null) while ($myrow = db_fetch($result)) { alt_table_row_color($k); - $name = $myrow["debtor_no"]." ".$myrow["name"]; + $name = $myrow["debtor_no"]." ".htmlspecialchars_decode($myrow["name"]); label_cell($name); amount_cell($myrow['total']); if ($pg != null) @@ -218,7 +221,7 @@ function supplier_top($today, $limit=10, $width="33", &$pg=null) AND tran_date >= '$begin1' AND tran_date <= '$today1' GROUP by s.supplier_id ORDER BY total DESC, s.supplier_id LIMIT $limit"; $result = db_query($sql); - $title = _("Top $limit suppliers in fiscal year"); + $title = sprintf(_("Top %s suppliers in fiscal year"), $limit); display_title($title); $th = array(_("Supplier"), _("Amount")); start_table(TABLESTYLE, "width='$width%'"); @@ -229,7 +232,7 @@ function supplier_top($today, $limit=10, $width="33", &$pg=null) while ($myrow = db_fetch($result)) { alt_table_row_color($k); - $name = $myrow["supplier_id"]." ".$myrow["supp_name"]; + $name = $myrow["supplier_id"]." ".htmlspecialchars_decode($myrow["supp_name"]); label_cell($name); amount_cell($myrow['total']); if ($pg != null) @@ -269,19 +272,21 @@ function stock_top($today, $limit=10, $width="33", $type=0, &$pg=null) SUM(qty) AS qty FROM ".TB_PREF."stock_master AS s, ".TB_PREF."stock_moves AS m WHERE s.stock_id=m.stock_id "; if ($type == 1) - $sql .= "AND s.mb_flag='M' "; + $sql .= "AND s.mb_flag='M' AND m.type <> ".ST_CUSTDELIVERY." AND m.type <> ".ST_CUSTCREDIT." "; elseif ($type == 2) $sql .= "AND s.mb_flag='F' "; } - $sql .= "AND tran_date >= '$begin1' AND tran_date <= '$today1' GROUP by s.stock_id ORDER BY total DESC, s.stock_id + if ($type != 2) + $sql .= "AND tran_date >= '$begin1' "; + $sql .= "AND tran_date <= '$today1' GROUP by s.stock_id ORDER BY total DESC, s.stock_id LIMIT $limit"; $result = db_query($sql); if ($type == 1) - $title = _("Top $limit Manufactured Items in fiscal year"); + $title = sprintf(_("Top %s Manufactured Items in fiscal year"), $limit); elseif ($type == 2) - $title = _("Top $limit Fixed Assets in fiscal year"); + $title = sprintf(_("Top %s Fixed Assets"), $limit); else - $title = _("Top $limit Sold Items in fiscal year"); + $title = sprintf(_("Top %s Sold Items in fiscal year"), $limit); display_title($title); if ($type == 0) $th = array(_("Item"), _("Sales"), _("Costs"), _("Quantity")); @@ -326,7 +331,7 @@ function dimension_top($today, $limit=10, $width="33", &$pg=null) (t.dimension_id = d.id OR t.dimension2_id = d.id) AND t.tran_date >= '$begin1' AND t.tran_date <= '$today1' GROUP BY d.id ORDER BY total DESC LIMIT $limit"; $result = db_query($sql, "Transactions could not be calculated"); - $title = _("Top $limit Dimensions in fiscal year"); + $title = sprintf(_("Top %s Dimensions in fiscal year"), $limit); display_title($title); $th = array(_("Dimension"), _("Amount")); start_table(TABLESTYLE, "width='$width%'"); @@ -401,22 +406,23 @@ function gl_top($today, $width="33", &$pg=null) function gl_performance($today, $width="33", $weeks=5) { + global $SysPrefs; $pg = new graph(); $begin = begin_fiscalyear(); $begin1 = date2sql($begin); $today1 = date2sql($today); - $sql = "SELECT CONCAT(YEAR(tran_date), '/', WEEK(tran_date)) AS week_name, - SUM(IF (c.ctype = 4, amount * -1, 0)) AS sales, - SUM(IF (c.ctype = 6, amount, 0)) AS costs - FROM + $sep = $SysPrefs->dateseps[user_date_sep()]; + $sql = "SELECT week_name, sales, costs + FROM(SELECT DATE_FORMAT(tran_date, '%Y{$sep}%u') AS week_name, + SUM(IF(c.ctype = 4, amount * -1, 0)) AS sales, + SUM(IF(c.ctype = 6, amount, 0)) AS costs FROM ".TB_PREF."gl_trans, ".TB_PREF."chart_master AS a, ".TB_PREF."chart_types AS t, - ".TB_PREF."chart_class AS c WHERE (c.ctype = 4 OR c.ctype = 6) - AND account = a.account_code AND a.account_type = t.id AND t.class_id = c.cid - AND IF(c.ctype > 3, tran_date >= '$begin1', tran_date >= '0000-00-00') - AND tran_date <= '$today1' - GROUP BY week_name - ORDER BY YEAR(tran_date) DESC, WEEK(tran_date) DESC limit 0, $weeks"; + ".TB_PREF."chart_class AS c WHERE(c.ctype = 4 OR c.ctype = 6) + AND account = a.account_code AND a.account_type = t.id AND t.class_id = c.cid + AND tran_date >= '$begin1' AND tran_date <= '$today1' + GROUP BY week_name ORDER BY week_name DESC LIMIT 0, $weeks) b + GROUP BY week_name ORDER BY week_name ASC"; $result = db_query($sql, "Transactions could not be calculated"); $title = _("Last $weeks weeks Performance"); check_page_security('SA_GLANALYTIC'); @@ -428,9 +434,6 @@ function gl_performance($today, $width="33", $weeks=5) $pg->z[$i] = $myrow['costs']; $i++; } - $pg->x = array_reverse($pg->x); - $pg->y = array_reverse($pg->y); - $pg->z = array_reverse($pg->z); source_graphic($today, $title, _("Week"), $pg, _("Sales"), _("Costs"), 1); } @@ -449,7 +452,7 @@ function source_graphic($today, $title, $x_axis, $pg, $graphic1, $graphic2=null, $pg->type = $type; $pg->skin = 1; $pg->built_in = false; - $filename = company_path(). "/pdf_files/". uniqid("").".png"; + $filename = company_path(). "/pdf_files/". random_id().".png"; $pg->display($filename, true); start_table(TABLESTYLE); start_row(); @@ -591,7 +594,7 @@ function supplier_trans($today) function bank_balance($today, $width) { $today = date2sql($today); - $sql = "SELECT bank_act, bank_account_name, SUM(amount) balance FROM ".TB_PREF."bank_trans bt + $sql = "SELECT bank_act, bank_account_name, bank_curr_code, SUM(amount) balance FROM ".TB_PREF."bank_trans bt INNER JOIN ".TB_PREF."bank_accounts ba ON bt.bank_act = ba.id WHERE trans_date <= '$today' AND inactive <> 1 @@ -600,7 +603,7 @@ function bank_balance($today, $width) $result = db_query($sql); $title = _("Bank Account Balances"); display_title($title); - $th = array(_("Account"), _("Balance")); + $th = array(_("Account"), _("Currency"), _("Balance")); start_table(TABLESTYLE, "width='$width%'"); table_header($th); $k = 0; //row colour counter @@ -608,6 +611,7 @@ function bank_balance($today, $width) { alt_table_row_color($k); label_cell(viewer_link($myrow["bank_account_name"], 'gl/inquiry/bank_inquiry.php?bank_account='.$myrow["bank_act"])); + label_cell($myrow["bank_curr_code"]); amount_cell($myrow['balance']); end_row(); }