projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New empty language empty.po file
[fa-stable.git]
/
sales
/
includes
/
db
/
cust_trans_db.inc
diff --git
a/sales/includes/db/cust_trans_db.inc
b/sales/includes/db/cust_trans_db.inc
index 710be16f4f395968577688fcb9611ac6943b70b0..e8ccbf6708fbec53c39cdfd1129b1be5400efa75 100644
(file)
--- a/
sales/includes/db/cust_trans_db.inc
+++ b/
sales/includes/db/cust_trans_db.inc
@@
-111,7
+111,7
@@
function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
}
db_query($sql, "The debtor transaction record could not be inserted");
}
db_query($sql, "The debtor transaction record could not be inserted");
- if ($trans_type != ST_JOURNAL) // skip for journal entries
+ if ($trans_type != ST_JOURNAL
&& $trans_type != ST_BANKDEPOSIT && $trans_type != ST_BANKPAYMENT
) // skip for journal entries
add_audit_trail($trans_type, $trans_no, $date_, $new ? '': _("Updated."));
return $trans_no;
add_audit_trail($trans_type, $trans_no, $date_, $new ? '': _("Updated."));
return $trans_no;
@@
-386,6
+386,10
@@
function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
{
$sql .= " AND trans.type = ".ST_CUSTDELIVERY." ";
}
{
$sql .= " AND trans.type = ".ST_CUSTDELIVERY." ";
}
+ elseif ($filter == '6')
+ {
+ $sql .= " AND trans.type = ".ST_JOURNAL." ";
+ }
if ($filter == '2')
{
if ($filter == '2')
{
@@
-396,7
+400,7
@@
function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
}
}
}
}
- $sql .= " GROUP BY trans.trans_no, trans.type";
+ $sql .= " GROUP BY trans.trans_no, trans.type
, trans.debtor_no
";
return $sql;
}
return $sql;
}