projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modifying Supplier Credit: reverted GL postings - fixed.
[fa-stable.git]
/
purchasing
/
includes
/
db
/
invoice_db.inc
diff --git
a/purchasing/includes/db/invoice_db.inc
b/purchasing/includes/db/invoice_db.inc
index 04909404a5ec6c6c5df946c8c5eab37dd5a28402..844994521b9dace304d612dc28e80f459596e5c5 100644
(file)
--- a/
purchasing/includes/db/invoice_db.inc
+++ b/
purchasing/includes/db/invoice_db.inc
@@
-124,7
+124,6
@@
function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amoun
return $diff;
}
//----------------------------------------------------------------------------------------
return $diff;
}
//----------------------------------------------------------------------------------------
-
function add_supp_invoice(&$supp_trans)
{
global $Refs;
function add_supp_invoice(&$supp_trans)
{
global $Refs;
@@
-166,7
+165,6
@@
function add_supp_invoice(&$supp_trans)
foreach ($taxes as $n => $taxitem)
$item_added_tax += isset($taxitem['Override']) ? $taxitem['Override'] : round2($taxitem['Value'], user_price_dec());
}
foreach ($taxes as $n => $taxitem)
$item_added_tax += isset($taxitem['Override']) ? $taxitem['Override'] : round2($taxitem['Value'], user_price_dec());
}
-
if ($trans_type == ST_SUPPCREDIT)
{
// let's negate everything because it's a credit note
if ($trans_type == ST_SUPPCREDIT)
{
// let's negate everything because it's a credit note
@@
-497,7
+495,7
@@
function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
$details_row["description"],
$details_row['qty_recd'],
$details_row['quantity_inv'],
$details_row["description"],
$details_row['qty_recd'],
$details_row['quantity_inv'],
- $details_row["quantity"], 0, $details_row["FullUnitPrice"],
+ ($trans_type == ST_SUPPCREDIT ? -1 : 1) * $details_row["quantity"], 0, $details_row["FullUnitPrice"], // SUPPCREDIT quantities are stored negative in database
0, 0);
}
else
0, 0);
}
else