Credit note can be posted without customer selected when search customer List is...

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

diff --git a/reporting/rep111.php b/reporting/rep111.php
index 45c5ab999e4be66466387c6dc2a6c6786ade4d60..273e7c421d4b0c477f653bc78f39a0b144aea029 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -111,6 +111,8 @@ function print_sales_quotations()
                        $rep->TextCol(0, 1,     $myrow2['stk_code'], -2);
                        $oldrow = $rep->row;
                        $rep->TextColLines(1, 2, $myrow2['description'], -2);
+                       if (!empty($SysPrefs->prefs['long_description_invoice']) && !empty($myrow2['long_description']))
+                               $rep->TextColLines(1, 2, $myrow2['long_description'], -2);
                        $newrow = $rep->row;
                        $rep->row = $oldrow;
                        if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount())
@@ -128,7 +130,6 @@ function print_sales_quotations()
                                $image = company_path(). "/images/" . item_img_name($myrow2['stk_code']) . ".jpg";
                                if (file_exists($image))
                                {
-                                       //$rep->NewLine();
                                        if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
                                                $rep->NewPage();
                                        $rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
@@ -136,17 +137,15 @@ function print_sales_quotations()
                                        $rep->NewLine();
                                }
                        }
-                       //$rep->NewLine(1);
                        if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
                                $rep->NewPage();
                }
                if ($myrow['comments'] != "")
                {
                        $rep->NewLine();
-                       $rep->TextColLines(1, 5, $myrow['comments'], -2);
+                       $rep->TextColLines(1, 3, $myrow['comments'], -2);
                }
                $DisplaySubTot = number_format2($SubTotal,$dec);
-               $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                $doctype = ST_SALESQUOTE;
@@ -154,10 +153,13 @@ function print_sales_quotations()
                $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['freight_cost'] != 0.0)
+               {
+                       $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
+                       $rep->TextCol(3, 6, _("Shipping"), -2);
+                       $rep->TextCol(6, 7,     $DisplayFreight, -2);
+                       $rep->NewLine();
+               }       
                $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
                if ($myrow['tax_included'] == 0) {
                        $rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 2);
@@ -183,7 +185,7 @@ function print_sales_quotations()
                                        if ($first)
                                        {
                                                $rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
-                                               $rep->TextCol(6, 7,     number_format2($sign*$tax_item['net_amount'], $dec), -2);
+                                               $rep->TextCol(6, 7,     number_format2($tax_item['net_amount'], $dec), -2);
                                                $rep->NewLine();
                                        }
                                        $rep->TextCol(3, 6, $tax_type_name, -2);