X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep202.php;h=4f13042e9c21b09026a306a844431a74f8121690;hb=af03975abbd624d17cc6c4f61b71808a0a5c82ea;hp=4b788eb62fe46f4e0ad6521c6e00afaafb067957;hpb=107a22ab168c1102f3f534a22cd5b8290331f17d;p=fa-stable.git

diff --git a/reporting/rep202.php b/reporting/rep202.php
index 4b788eb6..4f13042e 100644
--- a/reporting/rep202.php
+++ b/reporting/rep202.php
@@ -32,38 +32,35 @@ print_aged_supplier_analysis();
 function get_invoices($supplier_id, $to, $all=true)
 {
 	$todate = date2sql($to);
-	$current = 1;
-	$PastDueDays1 = get_company_pref('past_due_days') + $current;
-	$PastDueDays2 = 2 * $PastDueDays1 + $current;
+	$PastDueDays1 = get_company_pref('past_due_days');
+	$PastDueDays2 = 2 * $PastDueDays1;
 
 	// Revomed allocated from sql
 	if ($all)
-    	$value = "(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)";
-    else	
-    	$value = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_BANKDEPOSIT.", 
-    	(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc),
-    	(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount + ".TB_PREF."supp_trans.alloc))";
-	$due = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_SUPPCREDIT.",".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)";
-	$sql = "SELECT ".TB_PREF."supp_trans.type,
-		".TB_PREF."supp_trans.reference,
-		".TB_PREF."supp_trans.tran_date,
+    	$value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)";
+    else
+    	$value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT." OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0),  
+    		(trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc),
+    		(trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))";
+	$due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)";
+	$sql = "SELECT trans.type,
+		trans.reference,
+		trans.tran_date,
 		$value as Balance,
-		IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $current,$value,0) AS Due,
-		IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays1,$value,0) AS Overdue1,
-		IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays2,$value,0) AS Overdue2
-
-		FROM ".TB_PREF."suppliers,
-			".TB_PREF."payment_terms,
-			".TB_PREF."supp_trans
-
-	   	WHERE ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
-			AND ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id
-			AND ".TB_PREF."supp_trans.supplier_id = $supplier_id
-			AND ".TB_PREF."supp_trans.tran_date <= '$todate'
-			AND ABS(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) > ".FLOAT_COMP_DELTA." ";
+		IF ((TO_DAYS('$todate') - TO_DAYS($due)) > 0,$value,0) AS Due,
+		IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $PastDueDays1,$value,0) AS Overdue1,
+		IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $PastDueDays2,$value,0) AS Overdue2
+
+		FROM ".TB_PREF."suppliers supplier,
+			".TB_PREF."supp_trans trans
+
+	   	WHERE supplier.supplier_id = trans.supplier_id
+			AND trans.supplier_id = $supplier_id
+			AND trans.tran_date <= '$todate'
+			AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) > ".FLOAT_COMP_DELTA;
 	if (!$all)
-		$sql .= "AND ABS(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) - ".TB_PREF."supp_trans.alloc > ".FLOAT_COMP_DELTA." ";  
-	$sql .= "ORDER BY ".TB_PREF."supp_trans.tran_date";
+		$sql .= "AND $value <> 0 ";
+	$sql .= " ORDER BY trans.tran_date";
 
 
 	return db_query($sql, "The supplier details could not be retrieved");
@@ -73,7 +70,7 @@ function get_invoices($supplier_id, $to, $all=true)
 
 function print_aged_supplier_analysis()
 {
-    global $path_to_root, $systypes_array;
+    global $path_to_root, $systypes_array, $SysPrefs;
 
     $to = $_POST['PARAM_0'];
     $fromsupp = $_POST['PARAM_1'];
@@ -94,7 +91,8 @@ function print_aged_supplier_analysis()
 	if ($graphics)
 	{
 		include_once($path_to_root . "/reporting/includes/class.graphic.inc");
-		$pg = new graph();
+		$pg = new chart($graphics);
+		$serie = array();
 	}
 
 	if ($fromsupp == ALL_TEXT)
@@ -160,7 +158,7 @@ function print_aged_supplier_analysis()
 	$pastdue1 = $PastDueDays1 + 1 . "-" . $PastDueDays2 . " " . _('Days');
 	$pastdue2 = _('Over') . " " . $PastDueDays2 . " " . _('Days');
 
-	$sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers";
+	$sql = "SELECT supplier_id, supp_name AS name, curr_code, inactive FROM ".TB_PREF."suppliers";
 	if ($fromsupp != ALL_TEXT)
 		$sql .= " WHERE supplier_id=".db_escape($fromsupp);
 	$sql .= " ORDER BY supp_name";
@@ -190,7 +188,7 @@ function print_aged_supplier_analysis()
 		if ($no_zeros && floatcmp(array_sum($str), 0) == 0) continue;
 
 		$rep->fontSize += 2;
-		$rep->TextCol(0, 2,	$myrow['name']);
+		$rep->TextCol(0, 2,	$myrow['name'].($myrow['inactive']==1 ? " ("._("Inactive").")" : ""));
 		if ($convert) $rep->TextCol(2, 3,	$myrow['curr_code']);
 		$rep->fontSize -= 2;
 		$total[0] += ($supprec["Balance"] - $supprec["Due"]);
@@ -214,7 +212,7 @@ function print_aged_supplier_analysis()
 				$rep->TextCol(1, 2,	$trans['reference'], -2);
 				$rep->TextCol(2, 3,	sql2date($trans['tran_date']), -2);
 				foreach ($trans as $i => $value)
-					$trans[$i] *= $rate;
+					$trans[$i] = (float)$trans[$i] * $rate;
 				$str = array($trans["Balance"] - $trans["Due"],
 					$trans["Due"]-$trans["Overdue1"],
 					$trans["Overdue1"]-$trans["Overdue2"],
@@ -240,24 +238,23 @@ function print_aged_supplier_analysis()
 		$rep->AmountCol($i + 3, $i + 4, $total[$i], $dec);
 		if ($graphics && $i < count($total) - 1)
 		{
-			$pg->y[$i] = abs($total[$i]);
+			$serie[$i] = abs($total[$i]);
 		}
 	}
    	$rep->Line($rep->row  - 8);
    	$rep->NewLine();
    	if ($graphics)
    	{
-   		global $decseps, $graph_skin;
-		$pg->x = array(_('Current'), $nowdue, $pastdue1, $pastdue2);
-		$pg->title     = $rep->title;
-		$pg->axis_x    = _("Days");
-		$pg->axis_y    = _("Amount");
-		$pg->graphic_1 = $to;
-		$pg->type      = $graphics;
-		$pg->skin      = $graph_skin;
-		$pg->built_in  = false;
-		$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
-		$filename = company_path(). "/pdf_files/". uniqid("").".png";
+		$pg->setStream('png');
+		$pg->setLabels(array(_('Current'), $nowdue, $pastdue1, $pastdue2));
+		$pg->addSerie(_("Balances"), $serie);
+		$pg->setTitle($rep->title);
+		$pg->setXTitle(_("Days"));
+		$pg->setYTitle(_("Amount"));
+		$pg->setDTitle(number_format2($total[4]));
+		$pg->setValues(true);
+		$pg->latin_notation = ($SysPrefs->decseps[user_dec_sep()] != ".");
+		$filename = company_path(). "/pdf_files/". random_id().".png";
 		$pg->display($filename, true);
 		$w = $pg->width / 1.5;
 		$h = $pg->height / 1.5;
@@ -270,4 +267,3 @@ function print_aged_supplier_analysis()
     $rep->End();
 }
 
-?>