X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep104.php;h=eabb5956881d0af33c9eba004ef1af0f3d1bb4b2;hb=380ae03e2df9602d07d156ae93b87cbe59b01b3a;hp=e34e5937c8a35ee7a47e302d72ace4ef385bd5f8;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git diff --git a/reporting/rep104.php b/reporting/rep104.php index e34e5937..eabb5956 100644 --- a/reporting/rep104.php +++ b/reporting/rep104.php @@ -1,15 +1,15 @@ . + See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_PRICEREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -24,11 +24,10 @@ 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"); -include_once($path_to_root . "/inventory/includes/db/items_category_db.inc"); +include_once($path_to_root . "/inventory/includes/inventory_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_price_listing(); function fetch_items($category=0) @@ -39,21 +38,35 @@ function fetch_items($category=0) ".TB_PREF."stock_category.description FROM ".TB_PREF."stock_master, ".TB_PREF."stock_category - WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id"; + WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id AND NOT ".TB_PREF."stock_master.inactive"; if ($category != 0) - $sql .= " AND ".TB_PREF."stock_category.category_id = '$category'"; + $sql .= " AND ".TB_PREF."stock_category.category_id = ".db_escape($category); $sql .= " ORDER BY ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_master.stock_id"; return db_query($sql,"No transactions were returned"); } + +function get_kits($category=0) +{ + $sql = "SELECT i.item_code AS kit_code, i.description AS kit_name, c.category_id AS cat_id, c.description AS cat_name, count(*)>1 AS kit + FROM + ".TB_PREF."item_codes i + LEFT JOIN + ".TB_PREF."stock_category c + ON i.category_id=c.category_id"; + $sql .= " WHERE !i.is_foreign AND i.item_code!=i.stock_id"; + if ($category != 0) + $sql .= " AND c.category_id = ".db_escape($category); + $sql .= " GROUP BY i.item_code"; + return db_query($sql,"No kits were returned"); +} + //---------------------------------------------------------------------------------------------------- function print_price_listing() { - global $comp_path, $path_to_root, $pic_height, $pic_width; - - include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + global $path_to_root, $pic_height, $pic_width; $currency = $_POST['PARAM_0']; $category = $_POST['PARAM_1']; @@ -61,17 +74,22 @@ function print_price_listing() $pictures = $_POST['PARAM_3']; $showGP = $_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(); $home_curr = get_company_pref('curr_default'); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) $currency = $home_curr; $curr = get_currency($currency); $curr_sel = $currency . " - " . $curr['currency']; - if ($category == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; - if ($salestype == reserved_words::get_all_numeric()) + if ($salestype == ALL_NUMERIC) $salestype = 0; if ($category == 0) $cat = _('All'); @@ -103,11 +121,11 @@ function print_price_listing() else $user_comp = ""; - $rep = new FrontReport(_('Price Listing'), "PriceListing.pdf", user_pagesize()); + $rep = new FrontReport(_('Price Listing'), "PriceListing", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $result = fetch_items($category); @@ -129,7 +147,7 @@ function print_price_listing() $rep->TextCol(0, 1, $myrow['stock_id']); $rep->TextCol(1, 2, $myrow['name']); $price = get_price($myrow['stock_id'], $currency, $salestype); - $rep->TextCol(2, 3, number_format2($price, $dec)); + $rep->AmountCol(2, 3, $price, $dec); if ($showGP) { $price2 = get_price($myrow['stock_id'], $home_curr, $salestype); @@ -141,13 +159,14 @@ function print_price_listing() } if ($pictures) { - $image = $comp_path . '/'. $user_comp . "/images/" . $myrow['stock_id'] . ".jpg"; + $image = company_path(). "/images/" + . item_img_name($myrow['stock_id']) . ".jpg"; if (file_exists($image)) { $rep->NewLine(); if ($rep->row - $pic_height < $rep->bottomMargin) - $rep->Header(); - $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, $pic_width, $pic_height); + $rep->NewPage(); + $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height); $rep->row -= $pic_height; $rep->NewLine(); } @@ -156,6 +175,38 @@ function print_price_listing() $rep->NewLine(0, 1); } $rep->Line($rep->row - 4); + + $result = get_kits($category); + + $catgor = ''; + while ($myrow=db_fetch($result)) + { + if ($catgor != $myrow['cat_name']) + { + if ($catgor == '') + { + $rep->NewLine(2); + $rep->fontSize += 2; + $rep->TextCol(0, 3, _("Sales Kits")); + $rep->fontSize -= 2; + } + $rep->Line($rep->row - $rep->lineHeight); + $rep->NewLine(2); + $rep->fontSize += 2; + $rep->TextCol(0, 3, $myrow['cat_id'] . " - " . $myrow['cat_name']); + $catgor = $myrow['cat_name']; + $rep->fontSize -= 2; + $rep->NewLine(); + } + $rep->NewLine(); + $rep->TextCol(0, 1, $myrow['kit_code']); + $rep->TextCol(1, 2, $myrow['kit_name']); + $price = get_kit_price($myrow['kit_code'], $currency, $salestype); + $rep->AmountCol(2, 3, $price, $dec); + $rep->NewLine(0, 1); + } + $rep->Line($rep->row - 4); + $rep->NewLine(); $rep->End(); }