X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep304.php;h=8929b1e6f3410a95f89c5500ba30ffa88dd499ec;hb=f3b8f779e700711cf786386d71e7cde766398ba6;hp=a53a9215e5b30bafac46955db4d48865e659c13f;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git diff --git a/reporting/rep304.php b/reporting/rep304.php index a53a9215..8929b1e6 100644 --- a/reporting/rep304.php +++ b/reporting/rep304.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 2; // ---------------------------------------------------------------- // $ Revision: 2.0 $ @@ -7,57 +16,23 @@ $page_security = 2; // date_: 2005-05-19 // Title: Inventory Planning // ---------------------------------------------------------------- -$path_to_root="../"; +$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"); +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"); //---------------------------------------------------------------------------------------------------- -// 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"; -*/ $sql = "SELECT ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_category.description AS cat_description, ".TB_PREF."stock_master.stock_id, @@ -97,14 +72,17 @@ 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']; + $destination = $_POST['PARAM_6']; + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); $dec = user_price_dec(); @@ -133,7 +111,7 @@ function print_inventory_sales() 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 = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -156,9 +134,9 @@ function print_inventory_sales() $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)); + $rep->AmountCol(2, 3, $total, $dec); + $rep->AmountCol(3, 4, $total1, $dec); + $rep->AmountCol(4, 5, $total2, $dec); if ($detail) { $rep->Line($rep->row - 2); @@ -183,9 +161,9 @@ function print_inventory_sales() $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->AmountCol(2, 3, $amt, $dec); + $rep->AmountCol(3, 4, $cost, $dec); + $rep->AmountCol(4, 5, $cb, $dec); $rep->fontsize += 2; } $amt = $cost = $cb = 0; @@ -213,17 +191,17 @@ function print_inventory_sales() $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->AmountCol(2, 3, $amt, $dec); + $rep->AmountCol(3, 4, $cost, $dec); + $rep->AmountCol(4, 5, $cb, $dec); $rep->fontsize += 2; $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)); + $rep->AmountCol(2, 3, $total, $dec); + $rep->AmountCol(3, 4, $total1, $dec); + $rep->AmountCol(4, 5, $total2, $dec); if ($detail) { $rep->Line($rep->row - 2); @@ -231,11 +209,12 @@ function print_inventory_sales() } $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->AmountCol(2, 3, $grandtotal, $dec); + $rep->AmountCol(3, 4, $grandtotal1, $dec); + $rep->AmountCol(4, 5, $grandtotal2, $dec); $rep->Line($rep->row - 4); + $rep->NewLine(); $rep->End(); }