Dashboard Top 10 only show 1 record less than top. Fixed.

[fa-stable.git] / includes / dashboard.inc

diff --git a/includes/dashboard.inc b/includes/dashboard.inc
index 43eb29df02c6438eea9fd3d7512f5f3560b1075e..0a84a9569581795590e48fa6614daa8206c9f53f 100644 (file)
--- a/includes/dashboard.inc
+++ b/includes/dashboard.inc
@@ -11,15 +11,16 @@
 ***********************************************************************/
 //$colors = array('#008cc9','#4db625','#ef5500','#eef100','#05c6e6', '#5ee66a'); // Current in Use      
 $colors = Chart::$palette;
+$align = $_SESSION['language']->dir == 'rtl' ? 'right' : 'left';
 $style = "<style>
 div.square {
        display: inline-block;
        width: 200px;
        height:40px;
-       padding: 3px 0 0 5px;
+       padding: 3px 5px 0 5px;
        font-size:12px;
        font-weight:normal;
-       text-align: left;
+       text-align: $align;
        line-height: 1.2;
        color:#fff;
        border-radius:6px;
@@ -235,7 +236,7 @@ function display_supplier_topten()
        td('50%');
        source_graphic($today, $title[0], _("Supplier"), $pg);
        br(3);
-       echo "<div class='square square2'>"._('Purchable Total')."<p class='span1'>";
+       echo "<div class='square square2'>"._('Purchasable Total')."<p class='span1'>";
        echo number_format2($title[1])."</p></div>";
        br(3);
        echo "<div class='square square2'>"._('Aging Total')."<p class='span1'>";
@@ -445,25 +446,21 @@ function customer_top($today, $limit=10, $width='33', &$pg=null)
        headers($th);
        check_page_security('SA_SALESTRANSVIEW');
        $k = 0; //row colour counter
-       $i = 1;
        $names = $totals = array();
        $sales = 0;
        while ($myrow = db_fetch($result))
        {
                $sales += round($myrow['total']);
-               if ($i++ < $limit)
+               alt_table_row_color($k);
+               $name = $myrow["debtor_no"]." ".htmlspecialchars_decode($myrow["name"]);
+               label_cell($name);
+               amount_cell($myrow['total']);
+               if ($pg != null)
                {
-                       alt_table_row_color($k);
-                       $name = $myrow["debtor_no"]." ".htmlspecialchars_decode($myrow["name"]);
-                       label_cell($name);
-                       amount_cell($myrow['total']);
-                       if ($pg != null)
-                       {
-                               $names[] = $name;
-                               $totals[] = round($myrow['total']);
-                       }       
-                       end_row();
-               }
+                       $names[] = $name;
+                       $totals[] = round($myrow['total']);
+               }       
+               end_row();
        }
        if ($pg != null)
        {
@@ -491,25 +488,21 @@ function supplier_top($today, $limit=10, $width='33', &$pg=null)
        headers($th);
        check_page_security('SA_SUPPTRANSVIEW');
        $k = 0; //row colour counter
-       $i = 1;
        $names = $totals = array();
        $total = 0;
        while ($myrow = db_fetch($result))
        {
                $total += $myrow['total'];
-               if ($i++ < $limit)
+               alt_table_row_color($k);
+               $name = $myrow["supplier_id"]." ".htmlspecialchars_decode($myrow["supp_name"]);
+               label_cell($name);
+               amount_cell($myrow['total']);
+               if ($pg != null)
                {
-                       alt_table_row_color($k);
-                       $name = $myrow["supplier_id"]." ".htmlspecialchars_decode($myrow["supp_name"]);
-                       label_cell($name);
-                       amount_cell($myrow['total']);
-                       if ($pg != null)
-                       {
-                               $names[] = $name;
-                               $totals[] = round($myrow['total']);
-                       }       
-                       end_row();
-               }
+                       $names[] = $name;
+                       $totals[] = round($myrow['total']);
+               }       
+               end_row();
        }
        if ($pg != null)
        {
@@ -567,7 +560,6 @@ function stock_top($today, $limit=10, $width='33', $type=0, &$pg=null)
        headers($th);
        check_page_security($sec);
        $k = 0; //row colour counter
-       $i = 1;
        $names = $totals = $costs = $results = array();
        $sales = $cost = $res = 0;
        while ($myrow = db_fetch($result))
@@ -578,30 +570,27 @@ function stock_top($today, $limit=10, $width='33', $type=0, &$pg=null)
                        $cost += $myrow['costs'];
                        $res += ($myrow['total'] - $myrow['costs']);
                }
-               if ($i++ < $limit)
+               alt_table_row_color($k);
+               $name = $myrow["description"];
+               label_cell($name);
+               amount_cell($myrow['total']);
+               if ($type == 0)
                {
-                       alt_table_row_color($k);
-                       $name = $myrow["description"];
-                       label_cell($name);
-                       amount_cell($myrow['total']);
+                       amount_cell($myrow['costs']);
+                       amount_cell($myrow['total'] - $myrow['costs']);
+               }
+               qty_cell($myrow['qty']);
+               if ($pg != NULL)
+               {
+                       $names[] = $name;
+                       $totals[] = round($myrow['total']);     
                        if ($type == 0)
                        {
-                               amount_cell($myrow['costs']);
-                               amount_cell($myrow['total'] - $myrow['costs']);
+                               $costs[] = round($myrow['costs']);
+                               $results[] = round($myrow['total'] - $myrow['costs']);
                        }
-                       qty_cell($myrow['qty']);
-                       if ($pg != NULL)
-                       {
-                               $names[] = $name;
-                               $totals[] = round($myrow['total']);     
-                               if ($type == 0)
-                               {
-                                       $costs[] = round($myrow['costs']);
-                                       $results[] = round($myrow['total'] - $myrow['costs']);
-                               }
-                       }       
-                       end_row();
-               }
+               }       
+               end_row();
        }
        if ($pg != null)
        {