From fe86f0c842c0309b79c25ce86138e44a2effc926 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 11 Jul 2009 22:22:06 +0000 Subject: [PATCH] Rerun --- CHANGELOG.txt | 1 + reporting/rep304.php | 81 ++++++++++++++++++-------------------- reporting/reports_main.php | 2 +- 3 files changed, 41 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 09aa4c32..4ce7516c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -22,6 +22,7 @@ $ -> Affected files 11-Jul-2009 Joe Hunt ! Improved Inventory Sales Report. Now by Customer and quantities as well. $ /reporting/rep304.php + /reporting/reports_main.php 10-Jul-2009 Joe Hunt # [0000142] Purchase Order use the same header as Sales Order diff --git a/reporting/rep304.php b/reporting/rep304.php index 9c59b7bb..bb4006f1 100644 --- a/reporting/rep304.php +++ b/reporting/rep304.php @@ -29,7 +29,7 @@ include_once($path_to_root . "/inventory/includes/db/items_category_db.inc"); print_inventory_sales(); -function getTransactions($category, $location, $from, $to) +function getTransactions($category, $location, $fromcust, $from, $to) { $from = date2sql($from); $to = date2sql($to); @@ -52,7 +52,6 @@ function getTransactions($category, $location, $from, $to) 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."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no - 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' @@ -63,7 +62,8 @@ function getTransactions($category, $location, $from, $to) $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 + if ($fromcust != -1) + $sql .= " AND ".TB_PREF."debtors_master.debtor_no = $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"); @@ -80,7 +80,7 @@ function print_inventory_sales() $to = $_POST['PARAM_1']; $category = $_POST['PARAM_2']; $location = $_POST['PARAM_3']; - $detail = $_POST['PARAM_4']; + $fromcust = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; $destination = $_POST['PARAM_6']; if ($destination) @@ -104,16 +104,24 @@ function print_inventory_sales() else $loc = get_location_name($location); + if ($fromcust == reserved_words::get_all_numeric()) + $fromc = _('All'); + else + $fromc = get_customer_name($fromcust); + $cols = array(0, 75, 175, 250, 300, 375, 450, 515); - $headers = array(_('Category'), '', _('Customer'), _('Qty'), _('Sales'), _('Cost'), _('Contribution')); + $headers = array(_('Category'), _('Description'), _('Customer'), _('Qty'), _('Sales'), _('Cost'), _('Contribution')); + if ($fromcust != reserved_words::get_all_numeric()) + $headers[2] = ''; $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right'); $params = array( 0 => $comments, 1 => array('text' => _('Period'),'from' => $from, 'to' => $to), 2 => array('text' => _('Category'), 'from' => $cat, 'to' => ''), - 3 => array('text' => _('Location'), 'from' => $loc, 'to' => '')); + 3 => array('text' => _('Location'), 'from' => $loc, 'to' => ''), + 4 => array('text' => _('Customer'), 'from' => $fromc, 'to' => '')); $rep = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport", user_pagesize()); @@ -121,7 +129,7 @@ function print_inventory_sales() $rep->Info($params, $cols, $headers, $aligns); $rep->Header(); - $res = getTransactions($category, $location, $from, $to); + $res = getTransactions($category, $location, $fromcust, $from, $to); $total = $grandtotal = 0.0; $total1 = $grandtotal1 = 0.0; $total2 = $grandtotal2 = 0.0; @@ -132,66 +140,55 @@ function print_inventory_sales() { if ($catt != '') { - if ($detail) - { - $rep->NewLine(2, 3); - $rep->TextCol(0, 2, _('Total')); - } + $rep->NewLine(2, 3); + $rep->TextCol(0, 4, _('Total')); $rep->AmountCol(4, 5, $total, $dec); $rep->AmountCol(5, 6, $total1, $dec); $rep->AmountCol(6, 7, $total2, $dec); - if ($detail) - { - $rep->Line($rep->row - 2); - $rep->NewLine(); - } + $rep->Line($rep->row - 2); + $rep->NewLine(); $rep->NewLine(); $total = $total1 = $total2 = 0.0; } $rep->TextCol(0, 1, $trans['category_id']); $rep->TextCol(1, 6, $trans['cat_description']); $catt = $trans['cat_description']; - if ($detail) - $rep->NewLine(); + $rep->NewLine(); } $curr = get_customer_currency($trans['debtor_no']); $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['tran_date'])); $trans['amt'] *= $rate; - $cb1 = $trans['amt'] - $trans['cost']; - if ($detail) + $cb = $trans['amt'] - $trans['cost']; + $rep->NewLine(); + $rep->fontsize -= 2; + $rep->TextCol(0, 1, $trans['stock_id']); + if ($fromcust == reserved_words::get_all_numeric()) { - $rep->NewLine(); - $rep->fontsize -= 2; - $rep->TextCol(0, 1, $trans['stock_id']); $rep->TextCol(1, 2, $trans['description']); $rep->TextCol(2, 3, $trans['debtor_name']); - $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, $cb1, $dec); - $rep->fontsize += 2; - } + } + else + $rep->TextCol(1, 3, $trans['description']); + $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; $total += $trans['amt']; $total1 += $trans['cost']; - $total2 += $cb1; + $total2 += $cb; $grandtotal += $trans['amt']; $grandtotal1 += $trans['cost']; - $grandtotal2 += $cb1; - } - if ($detail) - { - $rep->NewLine(2, 3); - $rep->TextCol(0, 2, _('Total')); + $grandtotal2 += $cb; } + $rep->NewLine(2, 3); + $rep->TextCol(0, 4, _('Total')); $rep->AmountCol(4, 5, $total, $dec); $rep->AmountCol(5, 6, $total1, $dec); $rep->AmountCol(6, 7, $total2, $dec); - if ($detail) - { - $rep->Line($rep->row - 2); - $rep->NewLine(); - } + $rep->Line($rep->row - 2); + $rep->NewLine(); $rep->NewLine(2, 1); $rep->TextCol(0, 4, _('Grand Total')); $rep->AmountCol(4, 5, $grandtotal, $dec); diff --git a/reporting/reports_main.php b/reporting/reports_main.php index 8b1e87c4..d2b525cb 100644 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@ -157,7 +157,7 @@ $reports->addReport(_('Inventory'),304,_('Inventory &Sales Report'), new ReportParam(_('End Date'),'DATEENDM'), new ReportParam(_('Inventory Category'),'CATEGORIES'), new ReportParam(_('Location'),'LOCATIONS'), - new ReportParam(_('Detailed Report'),'YES_NO'), + new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'), new ReportParam(_('Comments'),'TEXTBOX'), new ReportParam(_('Destination'),'DESTINATION'))); -- 2.30.2