Incorrect Journal Balance (sales invoice) when many decimals in tax and price.

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

diff --git a/reporting/rep111.php b/reporting/rep111.php
index 11284eda20f273f0b6a7181c90a44a7fad919ef6..273e7c421d4b0c477f653bc78f39a0b144aea029 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -31,7 +31,7 @@ print_sales_quotations();
 
 function print_sales_quotations()
 {
-       global $path_to_root, $print_as_quote, $SysPrefs, $pic_height;
+       global $path_to_root, $SysPrefs;
 
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -48,8 +48,8 @@ function print_sales_quotations()
        $dec = user_price_dec();
 
        $pictures = $SysPrefs->print_item_images_on_quote();
-       // If you want a larger image, then increase $pic_height f.i.
-       // $pic_height += 25;
+       // If you want a larger image, then increase pic_height f.i.
+       // $SysPrefs->pic_height += 25;
        
        $cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
@@ -68,6 +68,9 @@ function print_sales_quotations()
        for ($i = $from; $i <= $to; $i++)
        {
                $myrow = get_sales_order_header($i, ST_SALESQUOTE);
+               if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+                       continue;
+               }
                $baccount = get_default_bank_account($myrow['curr_code']);
                $params['bankaccount'] = $baccount['id'];
                $branch = get_branch($myrow["branch_code"]);
@@ -79,14 +82,13 @@ function print_sales_quotations()
                        else    
                                $rep->filename = "SalesQuotation" . $myrow['reference'] . ".pdf";
                }
-               $rep->SetHeaderType('Header2');
                $rep->currency = $cur;
                $rep->Font();
                $rep->Info($params, $cols, null, $aligns);
 
                $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], true);
                $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts);
-               //$rep->headerFunc = 'Header2';
+               $rep->SetHeaderType('Header2');
                $rep->NewPage();
 
                $result = get_sales_order_details($i, ST_SALESQUOTE);
@@ -109,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())
@@ -126,25 +130,22 @@ function print_sales_quotations()
                                $image = company_path(). "/images/" . item_img_name($myrow2['stk_code']) . ".jpg";
                                if (file_exists($image))
                                {
-                                       //$rep->NewLine();
-                                       if ($rep->row - $pic_height < $rep->bottomMargin)
+                                       if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
                                                $rep->NewPage();
-                                       $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
-                                       $rep->row -= $pic_height;
+                                       $rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+                                       $rep->row -= $SysPrefs->pic_height;
                                        $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;
@@ -152,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);
@@ -181,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);