X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=e8278e60e13036c644e5742654c61c983c4b0a79;hb=31966256a900343308ce287a246fe3a52e9a613c;hp=4130124b83cfc81beeb2af111901c2632c58b4a9;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git diff --git a/reporting/rep209.php b/reporting/rep209.php index 4130124b..e8278e60 100644 --- a/reporting/rep209.php +++ b/reporting/rep209.php @@ -1,15 +1,17 @@ . + See the License here . ***********************************************************************/ -$page_security = 2; + +$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ? + 'SA_SUPPTRANSVIEW' : 'SA_SUPPBULKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -24,19 +26,18 @@ include_once($path_to_root . "/includes/data_checks.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_po(); //---------------------------------------------------------------------------------------------------- function get_po($order_no) { - $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name, + $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.supp_account_no, ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name, - ".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address + ".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id AND ".TB_PREF."locations.loc_code = into_stock_location - AND ".TB_PREF."purch_orders.order_no = " . $order_no; + AND ".TB_PREF."purch_orders.order_no = ".db_escape($order_no); $result = db_query($sql, "The order cannot be retrieved"); return db_fetch($result); } @@ -47,7 +48,7 @@ function get_po_details($order_no) FROM ".TB_PREF."purch_order_details LEFT JOIN ".TB_PREF."stock_master ON ".TB_PREF."purch_order_details.item_code=".TB_PREF."stock_master.stock_id - WHERE order_no =$order_no "; + WHERE order_no =".db_escape($order_no)." "; $sql .= " ORDER BY po_detail_item"; return db_query($sql, "Retreive order Line Items"); } @@ -61,9 +62,8 @@ function print_po() $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; - $bankaccount = $_POST['PARAM_3']; - $email = $_POST['PARAM_4']; - $comments = $_POST['PARAM_5']; + $email = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; if ($from == null) $from = 0; @@ -76,15 +76,13 @@ function print_po() // $headers in doctext.inc $aligns = array('left', 'left', 'left', 'right', 'left', 'right', 'right'); - $params = array('comments' => $comments, - 'bankaccount' => $bankaccount); + $params = array('comments' => $comments); - $baccount = get_bank_account($params['bankaccount']); $cur = get_company_Pref('curr_default'); if ($email == 0) { - $rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk.pdf", user_pagesize()); + $rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize()); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -93,6 +91,8 @@ function print_po() for ($i = $from; $i <= $to; $i++) { $myrow = get_po($i); + $baccount = get_default_bank_account($myrow['curr_code']); + $params['bankaccount'] = $baccount['id']; if ($email == 1) { @@ -105,7 +105,7 @@ function print_po() } else $rep->title = _('PURCHASE ORDER'); - $rep->Header2($myrow, null, $myrow, $baccount, 8); + $rep->Header2($myrow, null, $myrow, $baccount, ST_PURCHORDER); $result = get_po_details($i); $SubTotal = 0; @@ -120,14 +120,14 @@ function print_po() $myrow2['units'] = $data['suppliers_uom']; if ($data['conversion_factor'] != 1) { - $myrow2['unit_price'] = round($myrow2['unit_price'] / $data['conversion_factor'], user_price_dec()); - $myrow2['quantiry_ordered'] = round($myrow2['quantiry_ordered'] / $data['conversion_factor'], user_qty_dec()); + $myrow2['unit_price'] = round2($myrow2['unit_price'] * $data['conversion_factor'], user_price_dec()); + $myrow2['quantity_ordered'] = round2($myrow2['quantity_ordered'] / $data['conversion_factor'], user_qty_dec()); } } - $Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]), - user_price_dec()); + $Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]), user_price_dec()); $SubTotal += $Net; - $DisplayPrice = number_format2($myrow2["unit_price"],$dec); + $dec2 = 0; + $DisplayPrice = price_decimal_format($myrow2["unit_price"],$dec2); $DisplayQty = number_format2($myrow2["quantity_ordered"],get_qty_dec($myrow2['item_code'])); $DisplayNet = number_format2($Net,$dec); //$rep->TextCol(0, 1, $myrow2['item_code'], -2); @@ -139,7 +139,7 @@ function print_po() $rep->TextCol(6, 7, $DisplayNet, -2); $rep->NewLine(1); if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) - $rep->Header2($myrow, $branch, $myrow, $baccount, 8); + $rep->Header2($myrow, $branch, $myrow, $baccount, ST_PURCHORDER); } if ($myrow['comments'] != "") { @@ -150,7 +150,7 @@ function print_po() $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); $linetype = true; - $doctype = 8; + $doctype = ST_PURCHORDER; if ($rep->currency != $myrow['curr_code']) { include($path_to_root . "/reporting/includes/doctext2.inc"); @@ -172,6 +172,7 @@ function print_po() { $myrow['contact_email'] = $myrow['email']; $myrow['DebtorName'] = $myrow['supp_name']; + if ($myrow['contact'] != '') $myrow['DebtorName'] = $myrow['contact']; $myrow['reference'] = $myrow['order_no']; $rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow); }