projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged last changes from stable.
[fa-stable.git]
/
reporting
/
rep305.php
diff --git
a/reporting/rep305.php
b/reporting/rep305.php
index 8ce820d8faf9d3d9ea0ecd1dc1d9d9931f98cda8..2c75640b85f40ce2f69517a8fb7cb5f6cb629f38 100644
(file)
--- a/
reporting/rep305.php
+++ b/
reporting/rep305.php
@@
-33,7
+33,7
@@
function getTransactions($from, $to)
{
$from = date2sql($from);
$to = date2sql($to);
{
$from = date2sql($from);
$to = date2sql($to);
-
+
$sql = "SELECT ".TB_PREF."grn_batch.id batch_no,
".TB_PREF."grn_batch.supplier_id,
".TB_PREF."purch_order_details.*,
$sql = "SELECT ".TB_PREF."grn_batch.id batch_no,
".TB_PREF."grn_batch.supplier_id,
".TB_PREF."purch_order_details.*,
@@
-53,7
+53,7
@@
function getTransactions($from, $to)
AND ".TB_PREF."grn_batch.delivery_date>='$from'
AND ".TB_PREF."grn_batch.delivery_date<='$to'
ORDER BY ".TB_PREF."stock_master.stock_id, ".TB_PREF."grn_batch.delivery_date";
AND ".TB_PREF."grn_batch.delivery_date>='$from'
AND ".TB_PREF."grn_batch.delivery_date<='$to'
ORDER BY ".TB_PREF."stock_master.stock_id, ".TB_PREF."grn_batch.delivery_date";
-
+
return db_query($sql,"No transactions were returned");
}
return db_query($sql,"No transactions were returned");
}
@@
-139,7
+139,7
@@
function print_grn_valuation()
$rep->TextCol(2, 3, $trans['order_no']);
$qdec = get_qty_dec($trans['item_code']);
$rep->TextCol(3, 4, $trans['batch_no']);
$rep->TextCol(2, 3, $trans['order_no']);
$qdec = get_qty_dec($trans['item_code']);
$rep->TextCol(3, 4, $trans['batch_no']);
-
+
if ($trans['quantity_inv'])
{
$suppinv = getSuppInvDetails($trans['grn_item_id']);
if ($trans['quantity_inv'])
{
$suppinv = getSuppInvDetails($trans['grn_item_id']);