[0003240] Tax Report: duplicated lines were listed for edited transactions.

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

diff --git a/reporting/rep306.php b/reporting/rep306.php
index 44da654b0adccd91611a3992496bec1ec9c0a678..94bca60ab18f1515dd9143fa8860bef09cf574c5 100644 (file)
--- a/reporting/rep306.php
+++ b/reporting/rep306.php
@@ -104,12 +104,14 @@ function print_inventory_purchase()
     $fromsupp = $_POST['PARAM_4'];
     $item = $_POST['PARAM_5'];
        $comments = $_POST['PARAM_6'];
-       $destination = $_POST['PARAM_7'];
+       $orientation = $_POST['PARAM_7'];
+       $destination = $_POST['PARAM_8'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
     $dec = user_price_dec();
 
        if ($category == ALL_NUMERIC)
@@ -149,7 +151,9 @@ function print_inventory_purchase()
                                    4 => array('text' => _('Supplier'), 'from' => $froms, 'to' => ''),
                                    5 => array('text' => _('Item'), 'from' => $itm, 'to' => ''));
 
-    $rep = new FrontReport(_('Inventory Purchasing Report'), "InventoryPurchasingReport", user_pagesize());
+    $rep = new FrontReport(_('Inventory Purchasing Report'), "InventoryPurchasingReport", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -159,7 +163,7 @@ function print_inventory_purchase()
 
        $total = $total_supp = $grandtotal = 0.0;
        $total_qty = 0.0;
-       $catt = $stock_description = $supplier_name = '';
+       $catt = $stock_description = $stock_id = $supplier_name = '';
        while ($trans=db_fetch($res))
        {
                if ($stock_description != $trans['description'])
@@ -172,7 +176,7 @@ function print_inventory_purchase()
                                        $rep->TextCol(0, 1, _('Total'));
                                        $rep->TextCol(1, 4, $stock_description);
                                        $rep->TextCol(4, 5, $supplier_name);
-                                       $rep->TextCol(5, 7, $total_qty);
+                                       $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id));
                                        $rep->AmountCol(7, 8, $total_supp, $dec);
                                        $rep->Line($rep->row - 2);
                                        $rep->NewLine();
@@ -180,6 +184,7 @@ function print_inventory_purchase()
                                        $supplier_name = $trans['supplier_name'];
                                }       
                        }
+                       $stock_id = $trans['stock_id'];
                        $stock_description = $trans['description'];
                }
 
@@ -191,7 +196,7 @@ function print_inventory_purchase()
                                $rep->TextCol(0, 1, _('Total'));
                                $rep->TextCol(1, 4, $stock_description);
                                $rep->TextCol(4, 5, $supplier_name);
-                               $rep->TextCol(5, 7, $total_qty);
+                               $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id));
                                $rep->AmountCol(7, 8, $total_supp, $dec);
                                $rep->Line($rep->row - 2);
                                $rep->NewLine();
@@ -228,14 +233,14 @@ function print_inventory_purchase()
                if ($fromsupp == ALL_TEXT)
                {
                        $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
-                       $rep->TextCol(2, 3, $trans['tran_date']);
+                       $rep->TextCol(2, 3, sql2date($trans['tran_date']));
                        $rep->TextCol(3, 4, $trans['supp_reference']);
                        $rep->TextCol(4, 5, $trans['supplier_name']);
                }
                else
                {
                        $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
-                       $rep->TextCol(2, 3, $trans['tran_date']);
+                       $rep->TextCol(2, 3, sql2date($trans['tran_date']));
                        $rep->TextCol(3, 4, $trans['supp_reference']);
                }       
                $rep->AmountCol(5, 6, $trans['qty'], get_qty_dec($trans['stock_id']));
@@ -256,7 +261,7 @@ function print_inventory_purchase()
                        $rep->TextCol(0, 1, _('Total'));
                        $rep->TextCol(1, 4, $stock_description);
                        $rep->TextCol(4, 5, $supplier_name);
-                       $rep->TextCol(5, 7, $total_qty);
+                       $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id));
                        $rep->AmountCol(7, 8, $total_supp, $dec);
                        $rep->Line($rep->row - 2);
                        $rep->NewLine();
@@ -271,7 +276,7 @@ function print_inventory_purchase()
                $rep->TextCol(0, 1, _('Total'));
                $rep->TextCol(1, 4, $stock_description);
                $rep->TextCol(4, 5, $supplier_name);
-               $rep->TextCol(5, 7, $total_qty);
+               $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id));
                $rep->AmountCol(7, 8, $total_supp, $dec);
                $rep->Line($rep->row - 2);
                $rep->NewLine();