Bug 5722: Canceled Sales Orders Show Up In Sales Order Inquiry. Fixed.

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

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 9fc2780af48212e6296128f4fe362e38ed5e1a6b..5924f88075c9652b5f3b58ba2beadb8ad5b061de 100644 (file)
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -92,7 +92,7 @@ function print_deliveries()
                                        $rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf";
                                }
                        }
-                       $rep->currency = $cur;
+                       $rep->currency = ($cur == null ? "USD" : $cur);
                        $rep->Font();
                        $rep->Info($params, $cols, null, $aligns);
 
@@ -144,11 +144,10 @@ function print_deliveries()
                        if ($memo != "")
                        {
                                $rep->NewLine();
-                               $rep->TextColLines(1, 5, $memo, -2);
+                               $rep->TextColLines(1, 3, $memo, -2);
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);
-                       $DisplayFreight = number_format2($myrow["ov_freight"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                        $doctype=ST_CUSTDELIVERY;
@@ -157,9 +156,13 @@ function print_deliveries()
                                $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($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_CUSTDELIVERY, $i);
                                $first = true;
                        while ($tax_item = db_fetch($tax_items))