projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing due date on direct invoice entry.
[fa-stable.git]
/
purchasing
/
includes
/
db
/
supp_payment_db.inc
diff --git
a/purchasing/includes/db/supp_payment_db.inc
b/purchasing/includes/db/supp_payment_db.inc
index 516dfba1df0afade211ae4c1bebd8238b4417e79..32b35041b90bbf799802d0372b1fedaf1443f925 100644
(file)
--- a/
purchasing/includes/db/supp_payment_db.inc
+++ b/
purchasing/includes/db/supp_payment_db.inc
@@
-10,8
+10,10
@@
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
function add_supp_payment($supplier_id, $date_, $bank_account,
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
function add_supp_payment($supplier_id, $date_, $bank_account,
- $amount, $discount, $ref, $memo_, $rate=0)
+ $amount, $discount, $ref, $memo_, $rate=0
, $charge=0
)
{
{
+ global $Refs;
+
begin_transaction();
$supplier_currency = get_supplier_currency($supplier_id);
begin_transaction();
$supplier_currency = get_supplier_currency($supplier_id);
@@
-22,19
+24,21
@@
function add_supp_payment($supplier_id, $date_, $bank_account,
{
$supp_amount = exchange_from_to($amount, $bank_account_currency, $supplier_currency, $date_);
$supp_discount = exchange_from_to($discount, $bank_account_currency, $supplier_currency, $date_);
{
$supp_amount = exchange_from_to($amount, $bank_account_currency, $supplier_currency, $date_);
$supp_discount = exchange_from_to($discount, $bank_account_currency, $supplier_currency, $date_);
+ $supp_charge = exchange_from_to($charge, $bank_account_currency, $supplier_currency, $date_);
}
else
{
$supp_amount = round($amount / $rate, user_price_dec());
$supp_discount = round($discount / $rate, user_price_dec());
}
else
{
$supp_amount = round($amount / $rate, user_price_dec());
$supp_discount = round($discount / $rate, user_price_dec());
+ $supp_charge = round($charge / $rate, user_price_dec());
}
// it's a supplier payment
}
// it's a supplier payment
- $trans_type =
22
;
+ $trans_type =
ST_SUPPAYMENT
;
/* Create a supp_trans entry for the supplier payment */
/* Create a supp_trans entry for the supplier payment */
- $payment_id =
add_supp_trans($trans_type
, $supplier_id, $date_, $date_,
+ $payment_id =
write_supp_trans($trans_type, 0
, $supplier_id, $date_, $date_,
$ref, "", -$supp_amount, 0, -$supp_discount, "", $rate);
// Now debit creditors account with payment + discount
$ref, "", -$supp_amount, 0, -$supp_discount, "", $rate);
// Now debit creditors account with payment + discount
@@
-51,24
+55,31
@@
function add_supp_payment($supplier_id, $date_, $bank_account,
-$supp_discount, $supplier_id, "", $rate);
}
-$supp_discount, $supplier_id, "", $rate);
}
+ if ($supp_charge != 0)
+ {
+ $charge_act = get_company_pref('bank_charge_act');
+ $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $charge_act, 0, 0,
+ $supp_charge, $supplier_id, "", $rate);
+ }
+
if ($supp_amount != 0)
{
$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0,
if ($supp_amount != 0)
{
$total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0,
- -
$supp_amount
, $supplier_id, "", $rate);
+ -
($supp_amount + $supp_charge)
, $supplier_id, "", $rate);
}
/*Post a balance post if $total != 0 */
}
/*Post a balance post if $total != 0 */
- add_gl_balance($trans_type, $payment_id, $date_, -$total,
payment_person_types::supplier(), $supplier_id);
+ add_gl_balance($trans_type, $payment_id, $date_, -$total,
PT_SUPPLIER, $supplier_id);
/*now enter the bank_trans entry */
add_bank_trans($trans_type, $payment_id, $bank_account, $ref,
/*now enter the bank_trans entry */
add_bank_trans($trans_type, $payment_id, $bank_account, $ref,
- $date_, -($amount
), payment_person_types::supplier()
,
+ $date_, -($amount
+ $supp_charge), PT_SUPPLIER
,
$supplier_id, $bank_account_currency,
"Could not add the supplier payment bank transaction");
add_comments($trans_type, $payment_id, $date_, $memo_);
$supplier_id, $bank_account_currency,
"Could not add the supplier payment bank transaction");
add_comments($trans_type, $payment_id, $date_, $memo_);
-
references::
save($trans_type, $payment_id, $ref);
+
$Refs->
save($trans_type, $payment_id, $ref);
commit_transaction();
commit_transaction();