projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...
[fa-stable.git]
/
purchasing
/
includes
/
db
/
suppalloc_db.inc
diff --git
a/purchasing/includes/db/suppalloc_db.inc
b/purchasing/includes/db/suppalloc_db.inc
index 4e634d107dcca97ab54853a6eb31cd1b9494451a..6091e42e9092901d9ba2b50ffd990be80c126281 100644
(file)
--- a/
purchasing/includes/db/suppalloc_db.inc
+++ b/
purchasing/includes/db/suppalloc_db.inc
@@
-124,7
+124,7
@@
function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_t
if ($extra_conditions)
$sql .= " AND $extra_conditions";
if ($extra_conditions)
$sql .= " AND $extra_conditions";
-
+
return $sql;
}
return $sql;
}
@@
-195,6
+195,7
@@
function get_allocatable_from_supp_transactions($supplier_id, $trans_no=null, $t
return db_query($sql." ORDER BY due_date", "Cannot retreive alloc to transactions");
}
return db_query($sql." ORDER BY due_date", "Cannot retreive alloc to transactions");
}
+
function get_sql_for_supplier_allocation_inquiry()
{
$date_after = date2sql($_POST['TransAfterDate']);
function get_sql_for_supplier_allocation_inquiry()
{
$date_after = date2sql($_POST['TransAfterDate']);
@@
-211,7
+212,8
@@
function get_sql_for_supplier_allocation_inquiry()
supplier.curr_code,
(trans.ov_amount + trans.ov_gst + trans.ov_discount) AS TotalAmount,
trans.alloc AS Allocated,
supplier.curr_code,
(trans.ov_amount + trans.ov_gst + trans.ov_discount) AS TotalAmount,
trans.alloc AS Allocated,
- ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+ ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
+ trans.supplier_id
FROM "
.TB_PREF."supp_trans as trans, "
.TB_PREF."suppliers as supplier
FROM "
.TB_PREF."supp_trans as trans, "
.TB_PREF."suppliers as supplier