Merged latest changes from stable branch.

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 5a5a61052533358f94f7b85ec1fe948d7c6b014a..69b95c97054df1d1c7b2138eee301284e382f396 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -86,11 +86,12 @@ function print_invoices()
 
        if ($email == 0)
                $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
+       if ($orientation == 'L')
+               recalculate_cols($cols);
 
        $range = get_invoice_range($from, $to);
        while($row = db_fetch($range))
        {
-                       $i = $row['trans_no'];
                        if (!exists_customer_trans(ST_SALESINVOICE, $i))
                                continue;
                        $sign = 1;
@@ -105,20 +106,22 @@ function print_invoices()
                        $branch = get_branch($myrow["branch_code"]);
                        $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
                        if ($email == 1)
-                               $rep = new FrontReport("", "", user_pagesize());
-                   $rep->SetHeaderType('Header2');
+                       {
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+                               $rep->title = _('INVOICE');
+                               $rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
+                       }       
+                       $rep->SetHeaderType('Header2');
                        $rep->currency = $cur;
                        $rep->Font();
-                       $rep->title = _('INVOICE');
-                       $rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
                        $rep->Info($params, $cols, null, $aligns);
 
-                       $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], false);
+                       $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->NewPage();
                        // calculate summary start row for later use
-                       $summary_start_row = $rep->bottomMargin + (20 * $rep->lineHeight);
+                       $summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight);
 
                        if ($rep->formData['prepaid'])
                        {
@@ -132,7 +135,7 @@ function print_invoices()
                                }
 
                                if (count($prepayments) > ($show_this_payment ? 0 : 1))
-                                       $summary_start_row += (count($prepayments)+3) * $rep->lineHeight;
+                                       $summary_start_row += (count($prepayments)) * $rep->lineHeight;
                                else
                                        unset($prepayments);
                        }
@@ -189,13 +192,13 @@ function print_invoices()
                        if (isset($prepayments))
                        {
                                // Partial invoices table
-                               $rep->NewLine();
-                               $rep->TextCol(1, 4,_("Prepayments invoiced to this order up to day:"));
-                               $rep->TextCol(1, 4,     str_pad('', 150, '_'));
-                               $rep->cols[3] -= 20;
-                               $rep->aligns[3] = 'right';
-                               $rep->NewLine(); $c = 1; $tot_pym=0;
-                               $rep->TextCol(1, 4,     str_pad('', 150, '_'));
+                               //$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;
+                               $rep->aligns[2] = 'right';
+                               $rep->NewLine(); $c = 0; $tot_pym=0;
+                               $rep->TextCol(0, 3,     str_pad('', 150, '_'));
                                $rep->TextCol($c++, $c, _("Date"));
                                $rep->TextCol($c++, $c, _("Invoice reference"));
                                $rep->TextCol($c++, $c, _("Amount"));
@@ -205,21 +208,25 @@ function print_invoices()
                                        if ($show_this_payment || ($invoice['reference'] != $myrow['reference']))
                                        {
                                                $rep->NewLine();
-                                               $c = 1; $tot_pym += $invoice['prep_amount'];
+                                               $c = 0; $tot_pym += $invoice['prep_amount'];
                                                $rep->TextCol($c++, $c, sql2date($invoice['tran_date']));
                                                $rep->TextCol($c++, $c, $invoice['reference']);
                                                $rep->TextCol($c++, $c, number_format2($invoice['prep_amount'], $dec));
                                        }
                                        if ($invoice['reference']==$myrow['reference']) break;
                                }
-                               $rep->TextCol(1, 4,     str_pad('', 150, '_'));
+                               $rep->TextCol(0, 3,     str_pad('', 150, '_'));
                                $rep->NewLine();
-                               $rep->TextCol(2, 3,     _("Total payments:"));
-                               $rep->TextCol(3, 4,     number_format2($tot_pym, $dec));
+                               $rep->TextCol(1, 2,     _("Total payments:"));
+                               $rep->TextCol(2, 3,     number_format2($tot_pym, $dec));
                        }
 
 
                        $doctype = ST_SALESINVOICE;
+               $rep->row = $summary_start_row;
+                       $rep->cols[2] += 20;
+                       $rep->cols[3] += 20;
+                       $rep->aligns[3] = 'left';
 
                        $rep->TextCol(3, 6, _("Sub-total"), -2);
                        $rep->TextCol(6, 7,     $DisplaySubTot, -2);