Forgot currency calculation

diff --git a/reporting/rep304.php b/reporting/rep304.php
index 11cf152e3b3767702548f89902e302627093722a..a53a9215e5b30bafac46955db4d48865e659c13f 100644 (file)
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -12,6 +12,7 @@ $path_to_root="../";
 include_once($path_to_root . "includes/session.inc");
 include_once($path_to_root . "includes/date_functions.inc");
 include_once($path_to_root . "includes/data_checks.inc");
+include_once($path_to_root . "includes/banking.inc");
 include_once($path_to_root . "gl/includes/gl_db.inc");
 include_once($path_to_root . "inventory/includes/db/items_category_db.inc");
 
@@ -24,6 +25,7 @@ function getTransactions($category, $location, $from, $to)
 {
        $from = date2sql($from);
        $to = date2sql($to);
+/*
        $sql = "SELECT ".TB_PREF."stock_master.category_id,
                        ".TB_PREF."stock_category.description AS cat_description,
                        ".TB_PREF."stock_master.stock_id,
@@ -55,7 +57,36 @@ function getTransactions($category, $location, $from, $to)
                        ".TB_PREF."stock_master.description
                ORDER BY ".TB_PREF."stock_master.category_id,
                        ".TB_PREF."stock_master.stock_id";
+*/
+       $sql = "SELECT ".TB_PREF."stock_master.category_id,
+                       ".TB_PREF."stock_category.description AS cat_description,
+                       ".TB_PREF."stock_master.stock_id,
+                       ".TB_PREF."stock_master.description,
+                       ".TB_PREF."stock_moves.loc_code,
+                       ".TB_PREF."debtor_trans.debtor_no,
+                       ".TB_PREF."stock_moves.tran_date,
+                       -".TB_PREF."stock_moves.qty*".TB_PREF."stock_moves.price*(1-".TB_PREF."stock_moves.discount_percent) AS amt,
+                       -".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,
+                       ".TB_PREF."stock_moves
+               WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id
+               AND ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
 
+               AND ".TB_PREF."stock_moves.type=".TB_PREF."debtor_trans.type
+               AND ".TB_PREF."stock_moves.trans_no=".TB_PREF."debtor_trans.trans_no
+               AND ".TB_PREF."stock_moves.tran_date>='$from'
+               AND ".TB_PREF."stock_moves.tran_date<='$to'
+               AND ((".TB_PREF."debtor_trans.type=13 AND ".TB_PREF."debtor_trans.version=1) OR ".TB_PREF."stock_moves.type=11)
+               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 = '$category'";
+               if ($location != 'all')
+                       $sql .= " AND ".TB_PREF."stock_moves.loc_code = '$location'";
+               //$sql .= " AND SUM(".TB_PREF."stock_moves.qty) != 0
+               $sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
+                       ".TB_PREF."stock_master.stock_id";
     return db_query($sql,"No transactions were returned");
 
 }
@@ -112,7 +143,8 @@ function print_inventory_sales()
        $total = $grandtotal = 0.0;
        $total1 = $grandtotal1 = 0.0;
        $total2 = $grandtotal2 = 0.0;
-       $catt = '';
+       $amt = $cost = $cb = 0;
+       $catt = $stock_id = $stock_desc = '';
        while ($trans=db_fetch($res))
        {
                if ($catt != $trans['cat_description'])
@@ -141,27 +173,51 @@ function print_inventory_sales()
                        if ($detail)
                                $rep->NewLine();
                }
-               $cb = $trans['amt'] - $trans['cost'];
-               if ($detail)
+               if ($stock_id != $trans['stock_id'])
                {
-                       $rep->NewLine();
-                       $rep->fontsize -= 2;
-                       $rep->TextCol(0, 1, $trans['stock_id']);
-                       $rep->TextCol(1, 2, $trans['description']);
-                       $rep->TextCol(2, 3, number_format2($trans['amt'], user_qty_dec()));
-                       $rep->TextCol(3, 4, number_format2($trans['cost'], $dec));
-                       $rep->TextCol(4, 5, number_format2($cb, $dec));
-                       $rep->fontsize += 2;
+                       if ($stock_id != '')
+                       {
+                               if ($detail)
+                               {
+                                       $rep->NewLine();
+                                       $rep->fontsize -= 2;
+                                       $rep->TextCol(0, 1, $stock_id);
+                                       $rep->TextCol(1, 2, $stock_desc);
+                                       $rep->TextCol(2, 3, number_format2($amt, $dec));
+                                       $rep->TextCol(3, 4, number_format2($cost, $dec));
+                                       $rep->TextCol(4, 5, number_format2($cb, $dec));
+                                       $rep->fontsize += 2;
+                               }
+                               $amt = $cost = $cb = 0;
+                       }
+                       $stock_id = $trans['stock_id'];
+                       $stock_desc = $trans['description'];
                }
+               $curr = get_customer_currency($trans['debtor_no']);
+               $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['tran_date']));
+               $trans['amt'] *= $rate;
+               $amt += $trans['amt'];
+               $cost += $trans['cost'];
+               $cb1 = $trans['amt'] - $trans['cost'];
+               $cb += $cb1;
                $total += $trans['amt'];
                $total1 += $trans['cost'];
-               $total2 += $cb;
+               $total2 += $cb1;
                $grandtotal += $trans['amt'];
                $grandtotal1 += $trans['cost'];
-               $grandtotal2 += $cb;
+               $grandtotal2 += $cb1;
        }
        if ($detail)
        {
+               $rep->NewLine();
+               $rep->fontsize -= 2;
+               $rep->TextCol(0, 1, $stock_id);
+               $rep->TextCol(1, 2, $stock_desc);
+               $rep->TextCol(2, 3, number_format2($amt, $dec));
+               $rep->TextCol(3, 4, number_format2($cost, $dec));
+               $rep->TextCol(4, 5, number_format2($cb, $dec));
+               $rep->fontsize += 2;
+
                $rep->NewLine(2, 3);
                $rep->TextCol(0, 2, _('Total'));
        }