[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index f1d5f9fe0b90a8a4be1cf7c7e6a0c8a3ee479e9d..580e3abe4359b1d5280fb0fa61b55bc518567247 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -36,8 +36,7 @@ function get_invoice_range($from, $to)
                        LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id
                WHERE trans.type=".ST_SALESINVOICE
                        ." AND ISNULL(voided.id)"
-                       ." AND trans.reference>=".db_escape(get_reference(ST_SALESINVOICE, $from))
-                       ." AND trans.reference<=".db_escape(get_reference(ST_SALESINVOICE, $to))
+                       ." AND trans.trans_no BETWEEN ".db_escape($from)." AND ".db_escape($to)                 
                ." ORDER BY trans.tran_date, trans.$ref";
 
        return db_query($sql, "Cant retrieve invoice range");
@@ -97,7 +96,10 @@ function print_invoices()
                        $sign = 1;
                        $myrow = get_customer_trans($row['trans_no'], ST_SALESINVOICE);
 
-                       if($customer && $myrow['debtor_no'] != $customer) {
+                       if ($customer && $myrow['debtor_no'] != $customer) {
+                               continue;
+                       }
+                       if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
                                continue;
                        }
                        $baccount = get_default_bank_account($myrow['curr_code']);
@@ -111,7 +113,6 @@ function print_invoices()
                                $rep->title = _('INVOICE');
                                $rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
                        }       
-                       $rep->SetHeaderType('Header2');
                        $rep->currency = $cur;
                        $rep->Font();
                        $rep->Info($params, $cols, null, $aligns);
@@ -119,6 +120,7 @@ function print_invoices()
                        $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], true);
                        $baccount['payment_service'] = $pay_service;
                        $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts);
+                       $rep->SetHeaderType('Header2');
                        $rep->NewPage();
                        // calculate summary start row for later use
                        $summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight);
@@ -181,18 +183,16 @@ function print_invoices()
                        if ($memo != "")
                        {
                                $rep->NewLine();
-                               $rep->TextColLines(1, 5, $memo, -2);
+                               $rep->TextColLines(1, 3, $memo, -2);
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);
-                       $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
                        // set to start of summary line:
                $rep->row = $summary_start_row;
                        if (isset($prepayments))
                        {
                                // Partial invoices table
-                               //$rep->NewLine();
                                $rep->TextCol(0, 3,_("Prepayments invoiced to this order up to day:"));
                                $rep->TextCol(0, 3,     str_pad('', 150, '_'));
                                $rep->cols[2] -= 20;
@@ -231,9 +231,13 @@ function print_invoices()
                        $rep->TextCol(3, 6, _("Sub-total"), -2);
                        $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                        $rep->NewLine();
-                       $rep->TextCol(3, 6, _("Shipping"), -2);
-                       $rep->TextCol(6, 7,     $DisplayFreight, -2);
-                       $rep->NewLine();
+                       if ($myrow['ov_freight'] != 0.0)
+                       {
+                               $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
+                               $rep->TextCol(3, 6, _("Shipping"), -2);
+                               $rep->TextCol(6, 7,     $DisplayFreight, -2);
+                               $rep->NewLine();
+                       }       
                        $tax_items = get_trans_tax_details(ST_SALESINVOICE, $row['trans_no']);
                        $first = true;
                while ($tax_item = db_fetch($tax_items))
@@ -262,7 +266,7 @@ function print_invoices()
                                                $first = false;
                                }
                                else
-                                               $rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
+                                               $rep->TextCol(3, 6, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
                                }
                        else
                        {
@@ -303,4 +307,3 @@ function print_invoices()
                $rep->End();
 }
 
-?>