X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep303.php;h=19be2ee92030cfad74174ec82f216ba87c04c4f7;hb=e6b2ed7a578d4d1bc8187a71519f6c5d10b11be9;hp=4b87d6b286c7209f6a4c105719e7529b216b6217;hpb=53b88648000092f209fb590fe9a770f6470413a6;p=fa-stable.git diff --git a/reporting/rep303.php b/reporting/rep303.php index 4b87d6b2..19be2ee9 100644 --- a/reporting/rep303.php +++ b/reporting/rep303.php @@ -46,7 +46,7 @@ function getTransactions($category, $location) 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 IF(".TB_PREF."stock_moves.stock_id IS NULL, '1=1',".TB_PREF."stock_moves.loc_code = '$location')"; $sql .= " GROUP BY ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_category.description, ".TB_PREF."stock_master.stock_id, @@ -132,6 +132,10 @@ function print_stock_check() $catt = ''; while ($trans=db_fetch($res)) { + if ($location == 'all') + $loc_code = ""; + else + $loc_code = $location; $demandqty = get_demand_qty($trans['stock_id'], $loc_code); $demandqty += get_demand_asm_qty($trans['stock_id'], $loc_code); $onorder = get_on_porder_qty($trans['stock_id'], $loc_code); @@ -150,10 +154,6 @@ function print_stock_check() $catt = $trans['cat_description']; $rep->NewLine(); } - if ($location == 'all') - $loc_code = ""; - else - $loc_code = $trans['loc_code']; $rep->NewLine(); $dec = get_qty_dec($trans['stock_id']); $rep->TextCol(0, 1, $trans['stock_id']); @@ -192,4 +192,4 @@ function print_stock_check() $rep->End(); } -?> \ No newline at end of file +?>