projects / fa-stable.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SalesDashboard Aging total =/= Aged Costumer Analisys. Fixed.
[fa-stable.git] / includes / dashboard.inc
diff --git a/includes/dashboard.inc b/includes/dashboard.inc
index 9c2f6d23d52fc31511dede3b945c97212524dfff..3272ac605769f82aa55d8c0fe0e481bef34aff70 100644 (file)
--- a/includes/dashboard.inc
+++ b/includes/dashboard.inc
@@ -236,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'>";
@@ -446,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)
        {
@@ -492,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)
        {
@@ -568,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))
@@ -579,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)
+               {
+                       amount_cell($myrow['costs']);
+                       amount_cell($myrow['total'] - $myrow['costs']);
+               }
+               qty_cell($myrow['qty']);
+               if ($pg != NULL)
                {
-                       alt_table_row_color($k);
-                       $name = $myrow["description"];
-                       label_cell($name);
-                       amount_cell($myrow['total']);
+                       $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)
        {
@@ -802,8 +790,7 @@ function customer_aging($today, $width="33")
        $past2 = 2 * $past1;
        // removed - debtor_trans.alloc from all summations
        $sign = "IF(`type` IN(".implode(',',  array(ST_CUSTCREDIT,ST_CUSTPAYMENT,ST_BANKDEPOSIT))."), -1, 1)";
-       $value = "IFNULL($sign*((trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount - 
-               trans.alloc)*trans.rate),0)";
+       $value = "IFNULL($sign*((trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount)*trans.rate),0)";
        $due = "IF (trans.type=".ST_SALESINVOICE.", trans.due_date, trans.tran_date)";
     $sql = "SELECT Sum($value) AS Balance,
                                Sum(IF ((TO_DAYS('$today1') - TO_DAYS($due)) > 0,$value,0)) AS Due,
@@ -816,7 +803,6 @@ function customer_aging($today, $width="33")
                        WHERE
                                        debtor.payment_terms = terms.terms_indicator
                                AND debtor.credit_status = credit_status.id";
-               $sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount - trans.alloc) > ".FLOAT_COMP_DELTA;
     $result = db_query($sql,"The customer details could not be retrieved");
 
     $row = db_fetch($result);
@@ -840,13 +826,12 @@ function customer_balance($today)
 {
        $today = date2sql($today);
        $sign = "IF(`type` IN(".implode(',',  array(ST_CUSTCREDIT,ST_CUSTPAYMENT,ST_BANKDEPOSIT))."), -1, 1)";
-       $value = "IFNULL($sign*((trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount - 
-               trans.alloc)*trans.rate),0)";
+       $value = "IFNULL($sign*((trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount)*trans.rate),0)";
        $due = "IF (trans.type=".ST_SALESINVOICE.", trans.due_date, trans.tran_date)";
     $sql = "SELECT Sum($value) AS Balance
                        FROM ".TB_PREF."debtors_master debtor
                                 LEFT JOIN ".TB_PREF."debtor_trans trans ON trans.tran_date <= '$today' AND debtor.debtor_no = trans.debtor_no AND trans.type <> ".ST_CUSTDELIVERY."
-                       WHERE ABS(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount - trans.alloc) > ".FLOAT_COMP_DELTA;
+                       WHERE ABS(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) > ".FLOAT_COMP_DELTA;
     $result = db_query($sql,"The customer details could not be retrieved");
     $row = db_fetch($result);
        return $row[0];
@@ -861,19 +846,14 @@ function supplier_aging($today, $width="33")
        $past1 = get_company_pref('past_due_days');
        $past2 = 2 * $past1;
        // removed - debtor_trans.alloc from all summations
-       $value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT.", 
-       (trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc) * trans.rate,
-       (trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc) * trans.rate)";
+       $value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)*trans.rate";
        $due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)";
     $sql = "SELECT Sum($value) AS Balance,
                                Sum(IF ((TO_DAYS('$today1') - TO_DAYS($due)) > 0,$value,0)) AS Due,
                                Sum(IF ((TO_DAYS('$today1') - TO_DAYS($due)) > $past1,$value,0)) AS Overdue1,
                                Sum(IF ((TO_DAYS('$today1') - TO_DAYS($due)) > $past2,$value,0)) AS Overdue2
-                       FROM ".TB_PREF."suppliers supplier, ".TB_PREF."supp_trans trans
-                               WHERE supplier.supplier_id = trans.supplier_id
-                       AND trans.tran_date <= '$today1'
-                       AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) > ".FLOAT_COMP_DELTA."
-                       AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc > ".FLOAT_COMP_DELTA;
+                       FROM ".TB_PREF."suppliers supp
+                        LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id AND trans.tran_date <= '$today1'";
     $result = db_query($sql,"The supplier details could not be retrieved");
 
     $row = db_fetch($result);
@@ -896,15 +876,12 @@ function supplier_aging($today, $width="33")
 function supplier_balance($today)
 {
        $today = date2sql($today);
-       $value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT.", 
-       (trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc) * trans.rate,
-       (trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc) * trans.rate)";
+       $value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount) * trans.rate";
     $sql = "SELECT Sum($value) AS Balance
                        FROM ".TB_PREF."suppliers supplier, ".TB_PREF."supp_trans trans
                                WHERE supplier.supplier_id = trans.supplier_id
                        AND trans.tran_date <= '$today'
-                       AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) > ".FLOAT_COMP_DELTA."
-                       AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc > ".FLOAT_COMP_DELTA;
+                       AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) > ".FLOAT_COMP_DELTA;
     $result = db_query($sql,"The supplier details could not be retrieved");
     $row = db_fetch($result);
        return $row[0];
FrontAccounting stable branch