X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep104.php;h=556603319738544e69ff4ae793586d86cb7ccffe;hb=4e657ee817bcaecc22780c26a29b87790f0cab04;hp=dd30a31625e93eab8174ac9b661ef3ea2991b150;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/reporting/rep104.php b/reporting/rep104.php index dd30a316..55660331 100644 --- a/reporting/rep104.php +++ b/reporting/rep104.php @@ -11,6 +11,7 @@ $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/ui/ui_input.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 . "sales/includes/db/sales_types_db.inc"); @@ -21,51 +22,44 @@ include_once($path_to_root . "inventory/includes/db/items_category_db.inc"); // trial_inquiry_controls(); print_price_listing(); -function get_prices($category=0, $salestype=0) +function fetch_items($category=0) { - $sql = "SELECT ".TB_PREF."prices.sales_type_id, - ".TB_PREF."prices.stock_id, - ".TB_PREF."stock_master.description AS name, - ".TB_PREF."prices.curr_abrev, - ".TB_PREF."prices.price, - ".TB_PREF."sales_types.sales_type, + $sql = "SELECT ".TB_PREF."stock_master.stock_id, ".TB_PREF."stock_master.description AS name, ".TB_PREF."stock_master.material_cost+".TB_PREF."stock_master.labour_cost+".TB_PREF."stock_master.overhead_cost AS Standardcost, ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_category.description - FROM ".TB_PREF."stock_master, - ".TB_PREF."stock_category, - ".TB_PREF."sales_types, - ".TB_PREF."prices - WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."prices.stock_id - AND ".TB_PREF."prices.sales_type_id=".TB_PREF."sales_types.id - AND ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id"; - if ($salestype != null) - $sql .= " AND ".TB_PREF."sales_types.id = '$salestype'"; - if ($category != null) + FROM ".TB_PREF."stock_master, + ".TB_PREF."stock_category + WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id"; + if ($category != 0) $sql .= " AND ".TB_PREF."stock_category.category_id = '$category'"; - $sql .= " ORDER BY ".TB_PREF."prices.curr_abrev, - ".TB_PREF."stock_master.category_id, + $sql .= " ORDER BY ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_master.stock_id"; return db_query($sql,"No transactions were returned"); } - //---------------------------------------------------------------------------------------------------- function print_price_listing() { - global $path_to_root, $pic_height, $pic_width; + global $comp_path, $path_to_root, $pic_height, $pic_width; include_once($path_to_root . "reporting/includes/pdf_report.inc"); - $category = $_POST['PARAM_0']; - $salestype = $_POST['PARAM_1']; - $pictures = $_POST['PARAM_2']; - $showGP = $_POST['PARAM_3']; - $comments = $_POST['PARAM_4']; - + $currency = $_POST['PARAM_0']; + $category = $_POST['PARAM_1']; + $salestype = $_POST['PARAM_2']; + $pictures = $_POST['PARAM_3']; + $showGP = $_POST['PARAM_4']; + $comments = $_POST['PARAM_5']; + $dec = user_price_dec(); + $home_curr = get_company_pref('curr_default'); + if ($currency == reserved_words::get_all()) + $currency = $home_curr; + $curr = get_currency($currency); + $curr_sel = $currency . " - " . $curr['currency']; if ($category == reserved_words::get_all_numeric()) $category = 0; if ($salestype == reserved_words::get_all_numeric()) @@ -84,43 +78,34 @@ function print_price_listing() $GP = _('Yes'); $cols = array(0, 100, 385, 450, 515); - + $headers = array(_('Category/Items'), _('Description'), _('Price'), _('GP %')); - + $aligns = array('left', 'left', 'right', 'right'); - + $params = array( 0 => $comments, - 1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''), - 2 => array('text' => _('Sales Type'), 'from' => $stype, 'to' => ''), - 3 => array( 'text' => _('Show GP %'),'from' => $GP,'to' => '')); + 1 => array('text' => _('Currency'), 'from' => $curr_sel, 'to' => ''), + 2 => array('text' => _('Category'), 'from' => $cat, 'to' => ''), + 3 => array('text' => _('Sales Type'), 'from' => $stype, 'to' => ''), + 4 => array( 'text' => _('Show GP %'),'from' => $GP,'to' => '')); if ($pictures) $user_comp = user_company(); else $user_comp = ""; - + $rep = new FrontReport(_('Price Listing'), "PriceListing.pdf", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); $rep->Header(); - $result = get_prices($category, $salestype); - - $currcode = ''; - $catgor = ''; + $result = fetch_items($category); - while ($myrow=db_fetch($result)) + $catgor = ''; + $_POST['sales_type_id'] = $salestype; + while ($myrow=db_fetch($result)) { - if ($currcode != $myrow['curr_abrev']) - { - $rep->NewLine(2); - $rep->fontSize += 2; - $rep->TextCol(0, 3, $myrow['curr_abrev'] . " " . _('Prices')); - $currcode = $myrow['curr_abrev']; - $rep->fontSize -= 2; - $rep->NewLine(); - } if ($catgor != $myrow['description']) { $rep->Line($rep->row - $rep->lineHeight); @@ -134,18 +119,20 @@ function print_price_listing() $rep->NewLine(); $rep->TextCol(0, 1, $myrow['stock_id']); $rep->TextCol(1, 2, $myrow['name']); - $rep->TextCol(2, 3, number_format2($myrow['price'], $dec)); + $price = get_price($myrow['stock_id'], $currency, $salestype); + $rep->TextCol(2, 3, number_format2($price, $dec)); if ($showGP) { - if ($myrow['price'] != 0.0) - $disp = ($myrow['price'] - $myrow['Standardcost']) * 100 / $myrow['price']; + $price2 = get_price($myrow['stock_id'], $home_curr, $salestype); + if ($price2 != 0.0) + $disp = ($price2 - $myrow['Standardcost']) * 100 / $price2; else $disp = 0.0; $rep->TextCol(3, 4, number_format2($disp, user_percent_dec()) . " %"); - } + } if ($pictures) { - $image = $path_to_root . "inventory/manage/image/" . $user_comp . "/" . $myrow['stock_id'] . ".jpg"; + $image = $comp_path . '/'. $user_comp . "/images/" . $myrow['stock_id'] . ".jpg"; if (file_exists($image)) { $rep->NewLine(); @@ -155,7 +142,7 @@ function print_price_listing() $rep->row -= $pic_height; $rep->NewLine(); } - } + } else $rep->NewLine(0, 1); }