projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the text Manifactoring => Manifacturing
[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 35e93db48334a2d3181b052ee88708a1a807fdd5..c44c8140b2b6a50e31ebb3b856e1fb940e3dc006 100644
(file)
--- a/
purchasing/includes/db/supp_payment_db.inc
+++ b/
purchasing/includes/db/supp_payment_db.inc
@@
-10,7
+10,7
@@
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
)
{
begin_transaction();
{
begin_transaction();
@@
-22,11
+22,13
@@
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());
}
}
@@
-51,10
+53,17
@@
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 */
@@
-62,13
+71,13
@@
function add_supp_payment($supplier_id, $date_, $bank_account,
/*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
), payment_person_types::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
_last($ref, $trans_type
);
+ references::save
($trans_type, $payment_id, $ref
);
commit_transaction();
commit_transaction();