Supplier Inquiry link in Supplier form.

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

diff --git a/reporting/rep304.php b/reporting/rep304.php
index d847b024fb3be57660aefc6989c340193cec4dfe..7a91a4a1ee9226bcf6ac38bf34d5628f409e64ec 100644 (file)
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -43,7 +43,7 @@ function getTransactions($category, $location, $fromcust, $from, $to)
                        ".TB_PREF."stock_moves.tran_date,
                        SUM(-".TB_PREF."stock_moves.qty) AS qty,
                        SUM(-".TB_PREF."stock_moves.qty*".TB_PREF."stock_moves.price*(1-".TB_PREF."stock_moves.discount_percent)) AS amt,
-                       SUM(-".TB_PREF."stock_moves.qty *(".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost)) AS cost
+                       SUM(-IF(".TB_PREF."stock_moves.standard_cost <> 0, ".TB_PREF."stock_moves.qty * ".TB_PREF."stock_moves.standard_cost, ".TB_PREF."stock_moves.qty *(".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost))) AS cost
                FROM ".TB_PREF."stock_master,
                        ".TB_PREF."stock_category,
                        ".TB_PREF."debtor_trans,
@@ -60,9 +60,9 @@ function getTransactions($category, $location, $fromcust, $from, $to)
                AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
                if ($category != 0)
                        $sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
-               if ($location != 'all')
+               if ($location != '')
                        $sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
-               if ($fromcust != -1)
+               if ($fromcust != '')
                        $sql .= " AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($fromcust);
                $sql .= " GROUP BY ".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name ORDER BY ".TB_PREF."stock_master.category_id,
                        ".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name";
@@ -97,14 +97,12 @@ function print_inventory_sales()
        else
                $cat = get_category_name($category);
 
-       if ($location == ALL_TEXT)
-               $location = 'all';
-       if ($location == 'all')
+       if ($location == '')
                $loc = _('All');
        else
                $loc = get_location_name($location);
 
-       if ($fromcust == ALL_NUMERIC)
+       if ($fromcust == '')
                $fromc = _('All');
        else
                $fromc = get_customer_name($fromcust);
@@ -112,8 +110,8 @@ function print_inventory_sales()
        $cols = array(0, 75, 175, 250, 300, 375, 450,   515);
 
        $headers = array(_('Category'), _('Description'), _('Customer'), _('Qty'), _('Sales'), _('Cost'), _('Contribution'));
-       if ($fromcust != ALL_NUMERIC)
-               $headers[2] = '';       
+       if ($fromcust != '')
+               $headers[2] = '';
 
        $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right');
 
@@ -127,7 +125,7 @@ function print_inventory_sales()
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
        $res = getTransactions($category, $location, $fromcust, $from, $to);
        $total = $grandtotal = 0.0;
@@ -161,9 +159,9 @@ function print_inventory_sales()
                $trans['amt'] *= $rate;
                $cb = $trans['amt'] - $trans['cost'];
                $rep->NewLine();
-               $rep->fontsize -= 2;
+               $rep->fontSize -= 2;
                $rep->TextCol(0, 1, $trans['stock_id']);
-               if ($fromcust == ALL_NUMERIC)
+               if ($fromcust == ALL_TEXT)
                {
                        $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
                        $rep->TextCol(2, 3, $trans['debtor_name']);
@@ -174,7 +172,7 @@ function print_inventory_sales()
                $rep->AmountCol(4, 5, $trans['amt'], $dec);
                $rep->AmountCol(5, 6, $trans['cost'], $dec);
                $rep->AmountCol(6, 7, $cb, $dec);
-               $rep->fontsize += 2;
+               $rep->fontSize += 2;
                $total += $trans['amt'];
                $total1 += $trans['cost'];
                $total2 += $cb;