New inventory sales report. Shows total sales - costs - contribution per category...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 213a98e148debb8405c6b97643a600c264536185..05037830aed18274e83c30d4476449a0a5e9846d 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+12-Jun-2008 Joe Hunt
++ New inventory sales report. Shows total sales - costs - contribution per category, location, detailed/summary and period.
+$ /reporting/reports_main.php
+  /reporting/rep304.php (new file)
+  
 ---------------------------------------Release Candidate 1-------------------------------
 10-Jun-2008 Janusz Dobrowolski
 # Some more fixes related to ajax combos usage

diff --git a/reporting/rep304.php b/reporting/rep304.php
new file mode 100644 (file)
index 0000000..11cf152
--- /dev/null
+++ b/reporting/rep304.php
@@ -0,0 +1,186 @@
+<?php
+
+$page_security = 2;
+// ----------------------------------------------------------------
+// $ Revision: 2.0 $
+// Creator:    Joe Hunt
+// date_:      2005-05-19
+// Title:      Inventory Planning
+// ----------------------------------------------------------------
+$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 . "gl/includes/gl_db.inc");
+include_once($path_to_root . "inventory/includes/db/items_category_db.inc");
+
+//----------------------------------------------------------------------------------------------------
+
+// trial_inquiry_controls();
+print_inventory_sales();
+
+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,
+                       ".TB_PREF."stock_master.description,
+                       ".TB_PREF."stock_moves.loc_code,
+                       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
+               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 .= " GROUP BY ".TB_PREF."stock_master.category_id,
+                       ".TB_PREF."stock_category.description,
+                       ".TB_PREF."stock_master.stock_id,
+                       ".TB_PREF."stock_master.description
+               ORDER BY ".TB_PREF."stock_master.category_id,
+                       ".TB_PREF."stock_master.stock_id";
+
+    return db_query($sql,"No transactions were returned");
+
+}
+
+//----------------------------------------------------------------------------------------------------
+
+function print_inventory_sales()
+{
+    global $path_to_root;
+
+    include_once($path_to_root . "reporting/includes/pdf_report.inc");
+
+       $from = $_POST['PARAM_0'];
+       $to = $_POST['PARAM_1'];
+    $category = $_POST['PARAM_2'];
+    $location = $_POST['PARAM_3'];
+    $detail = $_POST['PARAM_4'];
+       $comments = $_POST['PARAM_5'];
+
+    $dec = user_price_dec();
+
+       if ($category == reserved_words::get_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')
+               $loc = _('All');
+       else
+               $loc = get_location_name($location);
+
+       $cols = array(0, 100, 250, 350, 450,    515);
+
+       $headers = array(_('Category'), '', _('Sales'), _('Cost'), _('Contribution'));
+
+       $aligns = array('left', 'left', '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' => ''));
+
+    $rep = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport.pdf", user_pagesize());
+
+    $rep->Font();
+    $rep->Info($params, $cols, $headers, $aligns);
+    $rep->Header();
+
+       $res = getTransactions($category, $location, $from, $to);
+       $total = $grandtotal = 0.0;
+       $total1 = $grandtotal1 = 0.0;
+       $total2 = $grandtotal2 = 0.0;
+       $catt = '';
+       while ($trans=db_fetch($res))
+       {
+               if ($catt != $trans['cat_description'])
+               {
+                       if ($catt != '')
+                       {
+                               if ($detail)
+                               {
+                                       $rep->NewLine(2, 3);
+                                       $rep->TextCol(0, 2, _('Total'));
+                               }
+                               $rep->TextCol(2, 3, number_format2($total, $dec));
+                               $rep->TextCol(3, 4, number_format2($total1, $dec));
+                               $rep->Textcol(4, 5, number_format2($total2, $dec));
+                               if ($detail)
+                               {
+                                       $rep->Line($rep->row - 2);
+                                       $rep->NewLine();
+                               }
+                               $rep->NewLine();
+                               $total = $total1 = $total2 = 0.0;
+                       }
+                       $rep->TextCol(0, 1, $trans['category_id']);
+                       $rep->TextCol(1, 2, $trans['cat_description']);
+                       $catt = $trans['cat_description'];
+                       if ($detail)
+                               $rep->NewLine();
+               }
+               $cb = $trans['amt'] - $trans['cost'];
+               if ($detail)
+               {
+                       $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;
+               }
+               $total += $trans['amt'];
+               $total1 += $trans['cost'];
+               $total2 += $cb;
+               $grandtotal += $trans['amt'];
+               $grandtotal1 += $trans['cost'];
+               $grandtotal2 += $cb;
+       }
+       if ($detail)
+       {
+               $rep->NewLine(2, 3);
+               $rep->TextCol(0, 2, _('Total'));
+       }
+       $rep->TextCol(2, 3, number_format2($total, $dec));
+       $rep->TextCol(3, 4, number_format2($total1, $dec));
+       $rep->Textcol(4, 5, number_format2($total2, $dec));
+       if ($detail)
+       {
+               $rep->Line($rep->row - 2);
+               $rep->NewLine();
+       }
+       $rep->NewLine(2, 1);
+       $rep->TextCol(0, 2, _('Grand Total'));
+       $rep->TextCol(2, 3, number_format2($grandtotal, $dec));
+       $rep->TextCol(3, 4, number_format2($grandtotal1, $dec));
+       $rep->Textcol(4, 5, number_format2($grandtotal2, $dec));
+
+       $rep->Line($rep->row  - 4);
+    $rep->End();
+}
+
+?>
\ No newline at end of file

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index c2d340ed5f336ff9e92060769db3d1758d674e4d..d7bdb8cbec457c5bb144f31e9c0433fc8912eaba 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -124,6 +124,13 @@ $reports->addReport(_('Inventory'),303,_('Stock Check Sheets'),
                        new ReportParam(_('Location'),'LOCATIONS'),
                        new ReportParam(_('Show Pictures'),'YES_NO'),
                        new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('Inventory'),304,_('Inventory Sales Report'),
+       array(  new ReportParam(_('Start Date'),'DATEBEGINM'),
+                       new ReportParam(_('End Date'),'DATEENDM'),
+                       new ReportParam(_('Inventory Category'),'CATEGORIES'),
+                       new ReportParam(_('Location'),'LOCATIONS'),
+                       new ReportParam(_('Detailed Report'),'YES_NO'),
+                       new ReportParam(_('Comments'),'TEXTBOX')));
 
 $reports->addReportClass(_('Manufactoring'));
 $reports->addReport(_('Manufactoring'),401,_('Bill of Material Listing'),