projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional fixes to upgrade scripts.
[fa-stable.git]
/
reporting
/
rep209.php
diff --git
a/reporting/rep209.php
b/reporting/rep209.php
index b9a8a049509fd75b3252f9abc339b2bced951cd1..b6b88a4572ee85b310b3493d5109b019c5594441 100644
(file)
--- a/
reporting/rep209.php
+++ b/
reporting/rep209.php
@@
-9,7
+9,9
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security = 2;
+
+$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
+ 'SA_SUPPTRANSVIEW' : 'SA_SUPPBULKREP';
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-35,7
+37,7
@@
function get_po($order_no)
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
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);
}
$result = db_query($sql, "The order cannot be retrieved");
return db_fetch($result);
}
@@
-46,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
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");
}
$sql .= " ORDER BY po_detail_item";
return db_query($sql, "Retreive order Line Items");
}
@@
-60,9
+62,8
@@
function print_po()
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
$currency = $_POST['PARAM_2'];
$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;
if ($from == null)
$from = 0;
@@
-75,10
+76,8
@@
function print_po()
// $headers in doctext.inc
$aligns = array('left', 'left', 'left', 'right', 'left', 'right', 'right');
// $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)
$cur = get_company_Pref('curr_default');
if ($email == 0)
@@
-92,6
+91,8
@@
function print_po()
for ($i = $from; $i <= $to; $i++)
{
$myrow = get_po($i);
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)
{
if ($email == 1)
{