*** empty log message ***

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

diff --git a/reporting/rep106.php b/reporting/rep106.php
index ae3ae54b45e956c4e66c69136d0bb14b6f291488..ad26d7dd4ff177c9d1df5b6997448e1ae4d1da6c 100644 (file)
--- a/reporting/rep106.php
+++ b/reporting/rep106.php
@@ -55,13 +55,13 @@ function print_salesman_list()
 
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
-       $detailed = $_POST['PARAM_2'];
+       $summary = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
 
-       if ($detailed == 0)
-               $det = _("No");
+       if ($summary == 0)
+               $sum = _("No");
        else
-               $det = _("Yes");
+               $sum = _("Yes");
 
        $dec = user_qty_dec();
 
@@ -77,7 +77,7 @@ function print_salesman_list()
 
     $params =   array(         0 => $comments,
                                        1 => array(  'text' => _('Period'), 'from' => $from, 'to' => $to),
-                                       2 => array(  'text' => _('Detailed'),'from' => $det,'to' => ''));
+                                       2 => array(  'text' => _('Summary Only'),'from' => $sum,'to' => ''));
 
        $cols2 = $cols;
        $aligns2 = $aligns;
@@ -111,7 +111,7 @@ function print_salesman_list()
                                $rep->TextCol(6, 7, number_format2($subprov, $dec));
                        $rep->Line($rep->row  - 4);
                        $rep->NewLine(2);
-                               $rep->Line($rep->row);
+                               //$rep->Line($rep->row);
                        }
                        $rep->TextCol(0, 2,     $myrow['salesman_code']." ".$myrow['salesman_name']);
                        $rep->TextCol(2, 3,     $myrow['salesman_phone']);
@@ -127,13 +127,13 @@ function print_salesman_list()
                        $subprov = 0;
                }
                $date = sql2date($myrow['tran_date']);
-               $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $date);
+               $rate = $myrow['rate'];
                $amt = $myrow['InvoiceTotal'] * $rate;
                if ($subprov > $myrow['break_pt'] && $myrow['provision2'] != 0)
                        $prov = $myrow['provision2'] * $amt / 100;
                else
                        $prov = $myrow['provision'] * $amt / 100;
-               if ($detailed)
+               if (!$summary)
                {
                        $rep->TextCol(0, 1,     $myrow['trans_no']);
                        $rep->TextCol(1, 2,     $myrow['DebtorName']);