projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into unstable
[fa-stable.git]
/
gl
/
includes
/
db
/
gl_journal.inc
diff --git
a/gl/includes/db/gl_journal.inc
b/gl/includes/db/gl_journal.inc
index f3f49533d8ba388b5d96c1dd521bacc0df7f2e0d..bb2dc5b90dd76e7ca12ea1b851b8b721f443c1d5 100644
(file)
--- a/
gl/includes/db/gl_journal.inc
+++ b/
gl/includes/db/gl_journal.inc
@@
-41,7
+41,7
@@
function update_journal($type, $trans_no, $amount, $tran_date, $currency, $refer
."`source_ref`=".db_escape($source_ref).","
."`tran_date`="."'".date2sql($tran_date)."',"
."`event_date`="."'".date2sql($event_date)."',"
."`source_ref`=".db_escape($source_ref).","
."`tran_date`="."'".date2sql($tran_date)."',"
."`event_date`="."'".date2sql($event_date)."',"
- ."`doc_date`="."'".date2sql($doc_date)."'
)
+ ."`doc_date`="."'".date2sql($doc_date)."'
WHERE `type`=".db_escape($type)." AND " ."`trans_no`=".db_escape($trans_no);
return db_query($sql, 'cannot update journal entry');
WHERE `type`=".db_escape($type)." AND " ."`trans_no`=".db_escape($trans_no);
return db_query($sql, 'cannot update journal entry');
@@
-151,15
+151,10
@@
function void_journal_trans($type, $type_no, $use_transaction=true)
$sql = "UPDATE ".TB_PREF."journal SET amount=0
WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
$sql = "UPDATE ".TB_PREF."journal SET amount=0
WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
-
$result =
db_query($sql, "could not void journal transaction for type=$type and trans_no=$type_no");
+ db_query($sql, "could not void journal transaction for type=$type and trans_no=$type_no");
void_bank_trans($type, $type_no, true);
void_bank_trans($type, $type_no, true);
-// void_gl_trans($type, $type_no, true); // this is done above
-// void_trans_tax_details($type, $type_no); // ditto
-// void_supp_allocations($type, $type_no); // ditto
-// void_cust_allocations($type, $type_no); // ditto
-
if ($use_transaction)
commit_transaction();
}
if ($use_transaction)
commit_transaction();
}