Instruction in update.html should include switch to standard theme before upgrade

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

diff --git a/reporting/rep106.php b/reporting/rep106.php
index ae3ae54b45e956c4e66c69136d0bb14b6f291488..71fa3474d0a91f60aa2c616442054e87b1f3c669 100644 (file)
--- a/reporting/rep106.php
+++ b/reporting/rep106.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
@@ -7,13 +16,13 @@ $page_security = 2;
 // date_:      2005-05-19
 // Title:      Order Status List
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-include_once($path_to_root . "includes/date_functions.inc");
-include_once($path_to_root . "includes/data_checks.inc");
-include_once($path_to_root . "sales/includes/sales_db.inc");
-include_once($path_to_root . "inventory/includes/db/items_category_db.inc");
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/sales/includes/sales_db.inc");
+include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -51,17 +60,17 @@ function print_salesman_list()
 {
        global $path_to_root;
 
-       include_once($path_to_root . "reporting/includes/pdf_report.inc");
+       include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        $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 +86,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 +120,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 +136,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']);