X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep304.php;h=63c6fc2eb5aa2872ef3021adeb16e2456d27c6c4;hb=a53ada1fa7eac32d429456e08f5ac7fb753ebc0d;hp=40b875844a912dfe883d8c92e640ce0d8b5655d2;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git diff --git a/reporting/rep304.php b/reporting/rep304.php index 40b87584..63c6fc2e 100644 --- a/reporting/rep304.php +++ b/reporting/rep304.php @@ -36,14 +36,14 @@ function getTransactions($category, $location, $fromcust, $from, $to) $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_master.description, ".TB_PREF."stock_master.inactive, ".TB_PREF."stock_moves.loc_code, ".TB_PREF."debtor_trans.debtor_no, ".TB_PREF."debtors_master.name AS debtor_name, ".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, @@ -56,14 +56,14 @@ function getTransactions($category, $location, $fromcust, $from, $to) 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."debtor_trans.type=".ST_CUSTDELIVERY." OR ".TB_PREF."stock_moves.type=".ST_CUSTCREDIT.") 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'"; - if ($fromcust != -1) - $sql .= " AND ".TB_PREF."debtors_master.debtor_no = $fromcust"; + $sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category); + if ($location != '') + $sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location); + 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"; return db_query($sql,"No transactions were returned"); @@ -82,29 +82,29 @@ function print_inventory_sales() $location = $_POST['PARAM_3']; $fromcust = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; - $destination = $_POST['PARAM_6']; + $orientation = $_POST['PARAM_6']; + $destination = $_POST['PARAM_7']; 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 == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; if ($category == 0) $cat = _('All'); else $cat = get_category_name($category); - if ($location == reserved_words::get_all()) - $location = 'all'; - if ($location == 'all') + if ($location == '') $loc = _('All'); else $loc = get_location_name($location); - if ($fromcust == reserved_words::get_all_numeric()) + if ($fromcust == '') $fromc = _('All'); else $fromc = get_customer_name($fromcust); @@ -112,8 +112,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 != reserved_words::get_all_numeric()) - $headers[2] = ''; + if ($fromcust != '') + $headers[2] = ''; $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right'); @@ -123,11 +123,13 @@ function print_inventory_sales() 3 => array('text' => _('Location'), 'from' => $loc, 'to' => ''), 4 => array('text' => _('Customer'), 'from' => $fromc, 'to' => '')); - $rep = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport", user_pagesize()); + $rep = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $res = getTransactions($category, $location, $fromcust, $from, $to); $total = $grandtotal = 0.0; @@ -161,20 +163,20 @@ 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 == reserved_words::get_all_numeric()) + if ($fromcust == ALL_TEXT) { - $rep->TextCol(1, 2, $trans['description']); + $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); $rep->TextCol(2, 3, $trans['debtor_name']); } else - $rep->TextCol(1, 3, $trans['description']); + $rep->TextCol(1, 3, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); $rep->AmountCol(3, 4, $trans['qty'], get_qty_dec($trans['stock_id'])); $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; @@ -199,5 +201,3 @@ function print_inventory_sales() $rep->NewLine(); $rep->End(); } - -?> \ No newline at end of file