Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...

[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 c44c8140b2b6a50e31ebb3b856e1fb940e3dc006..cec8f351b10b4c0fee198614a6c53719e62e2b1c 100644 (file)
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -12,7 +12,14 @@
 function add_supp_payment($supplier_id, $date_, $bank_account,
        $amount, $discount, $ref, $memo_, $rate=0, $charge=0)
 {
+       global $Refs;
+
        begin_transaction();
+       $args = func_get_args(); while (count($args) < 9) $args[] = 0;
+       $args = (object)array_combine(array('supplier_id', 'date_', 'bank_account', 
+               'amount', 'discount', 'ref', 'memo_', 'rate', 'charge'), $args);
+       $args->trans_no = 0;
+       hook_db_prewrite( $args, ST_SUPPAYMENT);
 
        $supplier_currency = get_supplier_currency($supplier_id);
     $bank_account_currency = get_bank_account_currency($bank_account);
@@ -33,10 +40,10 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
        
 
        // 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_,
+       $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
@@ -55,7 +62,7 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
 
        if ($supp_charge != 0)
        {
-               $charge_act = get_company_pref('bank_charge_act');
+               $charge_act = get_bank_charge_account($bank_account);
                $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $charge_act, 0, 0,
                        $supp_charge, $supplier_id, "", $rate);
        }
@@ -67,18 +74,20 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
        }
 
        /*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_, -($amount + $supp_charge), 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($trans_type, $payment_id, $ref);
+       $Refs->save($trans_type, $payment_id, $ref);
 
+       $args->trans_no = $payment_id;
+       hook_db_postwrite($args, ST_SUPPAYMENT);
        commit_transaction();
 
        return $payment_id;
@@ -89,6 +98,7 @@ function add_supp_payment($supplier_id, $date_, $bank_account,
 function void_supp_payment($type, $type_no)
 {
        begin_transaction();
+       hook_db_prevoid($type, $type_no);
 
        void_bank_trans($type, $type_no, true);
        void_gl_trans($type, $type_no, true);