[Frontaccounting-cvs_updates] frontaccount/reporting rep104.php, 1.1.2.2, 1.1.2.3 reports_main.php,
Brought to you by:
frontaccounting,
itronics
Menu
▾
▴
[Frontaccounting-cvs_updates] frontaccount/reporting rep104.php, 1.1.2.2, 1.1.2.3 reports_main.php, 1.4.2.7, 1.4.2.8
|
From: FrontAccounting <fro...@us...> - 2008-07-30 22:24:04
|
Update of /cvsroot/frontaccounting/frontaccount/reporting In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14296/reporting Modified Files: Tag: unstable rep104.php reports_main.php Log Message: Currency selection in Price Listing Report Index: reports_main.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/reporting/reports_main.php,v retrieving revision 1.4.2.7 retrieving revision 1.4.2.8 diff -C2 -d -r1.4.2.7 -r1.4.2.8 *** reports_main.php 20 Jul 2008 15:24:31 -0000 1.4.2.7 --- reports_main.php 30 Jul 2008 22:24:11 -0000 1.4.2.8 *************** *** 36,40 **** new ReportParam(_('Sales Folk'),'SALESMEN'), new ReportParam(_('Activity Greater Than'),'TEXT'), new ReportParam(_('Activity Less Than'),'TEXT'), new ReportParam(_('Comments'),'TEXTBOX'))); $reports->addReport(_('Customer'),104,_('Price Listing'), ! array( new ReportParam(_('Inventory Category'),'CATEGORIES'), new ReportParam(_('Sales Types'),'SALESTYPES'), new ReportParam(_('Show Pictures'),'YES_NO'), --- 36,41 ---- new ReportParam(_('Sales Folk'),'SALESMEN'), new ReportParam(_('Activity Greater Than'),'TEXT'), new ReportParam(_('Activity Less Than'),'TEXT'), new ReportParam(_('Comments'),'TEXTBOX'))); $reports->addReport(_('Customer'),104,_('Price Listing'), ! array( new ReportParam(_('Currency Filter'),'CURRENCY'), ! new ReportParam(_('Inventory Category'),'CATEGORIES'), new ReportParam(_('Sales Types'),'SALESTYPES'), new ReportParam(_('Show Pictures'),'YES_NO'), Index: rep104.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/reporting/rep104.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** rep104.php 4 Apr 2008 22:42:03 -0000 1.1.2.2 --- rep104.php 30 Jul 2008 22:24:11 -0000 1.1.2.3 *************** *** 12,15 **** --- 12,16 ---- 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"); *************** *** 22,54 **** print_price_listing(); ! function fetch_prices($category=0, $salestype=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, ".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 != 0) ! $sql .= " AND ".TB_PREF."sales_types.id = '$salestype'"; 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, ".TB_PREF."stock_master.stock_id"; return db_query($sql,"No transactions were returned"); } - //---------------------------------------------------------------------------------------------------- --- 23,42 ---- print_price_listing(); ! function fetch_items($category=0) { ! $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 ! 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."stock_master.category_id, ".TB_PREF."stock_master.stock_id"; return db_query($sql,"No transactions were returned"); } //---------------------------------------------------------------------------------------------------- *************** *** 59,70 **** 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']; $dec = user_price_dec(); if ($category == reserved_words::get_all_numeric()) $category = 0; --- 47,64 ---- include_once($path_to_root . "reporting/includes/pdf_report.inc"); ! $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; *************** *** 91,97 **** $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' => '')); if ($pictures) --- 85,92 ---- $params = array( 0 => $comments, ! 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) *************** *** 106,125 **** $rep->Header(); ! $result = fetch_prices($category, $salestype); - $currcode = ''; $catgor = ''; ! 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']) { --- 101,110 ---- $rep->Header(); ! $result = fetch_items($category); $catgor = ''; ! $_POST['sales_type_id'] = $salestype; while ($myrow=db_fetch($result)) { if ($catgor != $myrow['description']) { *************** *** 135,143 **** $rep->TextCol(0, 1, $myrow['stock_id']); $rep->TextCol(1, 2, $myrow['name']); ! $rep->TextCol(2, 3, number_format2($myrow['price'], $dec)); if ($showGP) { ! if ($myrow['price'] != 0.0) ! $disp = ($myrow['price'] - $myrow['Standardcost']) * 100 / $myrow['price']; else $disp = 0.0; --- 120,130 ---- $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)); if ($showGP) { ! $price2 = get_price($myrow['stock_id'], $home_curr, $salestype); ! if ($price2 != 0.0) ! $disp = ($price2 - $myrow['Standardcost']) * 100 / $price2; else $disp = 0.0; |