Another rerun. Not translatable string in rep108. Fixed and improved. New empty.po.

[fa-stable.git] / reporting / rep108.php

diff --git a/reporting/rep108.php b/reporting/rep108.php
index 970d57248eba52ef220c04df93dfb21ae1759d5e..9a12e40ad94b6eb94564f6919ba3635d2197500f 100644 (file)
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -38,7 +38,8 @@ function getTransactions($debtorno, $date, $show_also_allocated)
         trans.reference,
         trans.tran_date,
         trans.due_date,
-        (ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) AS TotalAmount, alloc AS Allocated,
+        IF(prep_amount, prep_amount, ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) AS TotalAmount,
+        alloc AS Allocated,
                ((trans.type = ".ST_SALESINVOICE.") AND due_date < '$date') AS OverDue
                FROM ".TB_PREF."debtor_trans trans
                LEFT JOIN ".TB_PREF."voided as v
@@ -48,7 +49,7 @@ function getTransactions($debtorno, $date, $show_also_allocated)
                        AND ABS(ABS(ov_amount) + ov_gst + ov_freight + ov_freight_tax + ov_discount) > ". FLOAT_COMP_DELTA;
        
        if (!$show_also_allocated)
-               $sql .= " AND ABS(ABS(ov_amount) + ov_gst + ov_freight +        ov_freight_tax + ov_discount - alloc) > ". FLOAT_COMP_DELTA;
+               $sql .= " AND ABS(IF(prep_amount, prep_amount, ABS(ov_amount) + ov_gst + ov_freight + ov_freight_tax + ov_discount) - alloc) > ". FLOAT_COMP_DELTA;
        $sql .= " ORDER BY tran_date";
 
     return db_query($sql,"No transactions were returned");
@@ -174,12 +175,16 @@ function print_statements()
                for ($i = 0; $i < 5; $i++)
                        $rep->TextWrap($col[$i], $rep->row, $col[$i + 1] - $col[$i], $str2[$i], 'right');
                if ($email == 1)
-                       $rep->End($email, _("Statement") . " " . _("as of") . " " . sql2date($date));
-
+               {
+            if (($CustomerRecord["Balance"]) != ($CustomerRecord["Balance"] - $CustomerRecord["Due"]))
+                $rep->End($email, _("Statement") . " " . _("as of") . " " . sql2date($date) . " " . _("from") . " " . get_company_pref('coy_name'));
+            else
+                display_notification(sprintf(_("Customer %s has no overdue debs. No e-mail is send."), $myrow["DebtorName"]));       
+        }
        }
 
     if (!isset($rep))
-        display_notification("No customers with outstanding balances found");
+        display_notification(_("No customers with outstanding balances found"));
        else if ($email == 0)
                $rep->End();
 }