X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep204.php;h=3dbe96fa6a7110f25463d6f61cd19d3931d966eb;hb=920edb84a73d62a960c1cbc9301290b687786258;hp=61034d3516ac1e86d3d20df493cc8c3f5f2eb04e;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/reporting/rep204.php b/reporting/rep204.php index 61034d35..3dbe96fa 100644 --- a/reporting/rep204.php +++ b/reporting/rep204.php @@ -49,7 +49,7 @@ function getTransactions($fromsupp) AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."purch_order_details.po_detail_item AND qty_recd-quantity_inv <>0 "; - if ($fromsupp != ALL_NUMERIC) + if ($fromsupp != ALL_TEXT) $sql .= "AND ".TB_PREF."grn_batch.supplier_id =".db_escape($fromsupp)." "; $sql .= "ORDER BY ".TB_PREF."grn_batch.supplier_id, ".TB_PREF."grn_batch.id"; @@ -65,13 +65,15 @@ function print_outstanding_GRN() $fromsupp = $_POST['PARAM_0']; $comments = $_POST['PARAM_1']; - $destination = $_POST['PARAM_2']; + $orientation = $_POST['PARAM_2']; + $destination = $_POST['PARAM_3']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($fromsupp == ALL_NUMERIC) + $orientation = ($orientation ? 'L' : 'P'); + if ($fromsupp == ALL_TEXT) $from = _('All'); else $from = get_supplier_name($fromsupp); @@ -87,7 +89,9 @@ function print_outstanding_GRN() $params = array( 0 => $comments, 1 => array('text' => _('Supplier'), 'from' => $from, 'to' => '')); - $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN", user_pagesize()); + $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns);