Update from usntable branch.

[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 ea9430cac98a0cb17e282833186d82ce53f138bb..3d848ed639b6eabc755d18ee9d0de2c7ae32908c 100644 (file)
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -1,27 +1,41 @@
 <?php
-
-function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
-       $amount, $discount, $ref, $memo_, $rate=0)
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    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, $charge=0)
 {
+       global $Refs;
+
        begin_transaction();
 
        $supplier_currency = get_supplier_currency($supplier_id);
     $bank_account_currency = get_bank_account_currency($bank_account);
+       $bank_gl_account = get_bank_gl_account($bank_account);
 
        if ($rate == 0)
        {
                $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());
+               $supp_charge = round($charge / $rate, user_price_dec());
        }
        
 
        // it's a supplier payment
-       $trans_type = 22;
+       $trans_type = ST_SUPPAYMENT;
 
        /* Create a supp_trans entry for the supplier payment */
        $payment_id = add_supp_trans($trans_type, $supplier_id, $date_, $date_,
@@ -31,6 +45,8 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
 
        $total = 0;
     $supplier_accounts = get_supplier_accounts($supplier_id);
+       $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
+               $supp_amount + $supp_discount, $supplier_id, "", $rate);
 
        // Now credit discount received account with discounts
        if ($supp_discount != 0)
@@ -39,28 +55,31 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account,
                        -$supp_discount, $supplier_id, "", $rate);
        }
 
-       if ($supp_amount != 0)
+       if ($supp_charge != 0)
        {
-               $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_account, 0, 0,
-                       -$supp_amount, $supplier_id, "", $rate);
+               $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);
        }
 
-       $total += add_gl_trans($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0, "", 
-               -$total, null, payment_person_types::supplier(), $supplier_id, 
-               "The general ledger transaction for the control total could not be added");
+       if ($supp_amount != 0)
+       {
+               $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0,
+                       -($supp_amount + $supp_charge), $supplier_id, "", $rate);
+       }
 
        /*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,
-               $date_, $payment_type, -($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_);
 
-       references::save_last($ref, $trans_type);
+       $Refs->save($trans_type, $payment_id, $ref);
 
        commit_transaction();