Merged last changes from stable.

[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 cec8f351b10b4c0fee198614a6c53719e62e2b1c..99fe530cad6001999c24d949c3cd87650ccee07b 100644 (file)
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -9,6 +9,84 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+function write_supp_payment($trans_no, $supplier_id, $bank_account,
+       $date_, $ref, $supp_amount, $supp_discount, $memo_, $bank_charge=0, $bank_amount=0)
+{
+       global $Refs;
+
+       begin_transaction();
+       $args = func_get_args(); while (count($args) < 10) $args[] = 0;
+       $args = (object)array_combine(array('trans_no', 'supplier_id', 'bank_account', 'date_',
+                'ref', 'bank_amount', 'supp_amount', 'supp_discount', 'memo_', 'bank_charge'), $args);
+       $args->trans_no = 0;
+       hook_db_prewrite( $args, ST_SUPPAYMENT);
+
+       if ($trans_no != 0) {
+         delete_comments(ST_SUPPAYMENT, $trans_no);
+         void_bank_trans(ST_SUPPAYMENT, $trans_no, true);
+         void_gl_trans(ST_SUPPAYMENT, $trans_no, true);
+         void_cust_allocations(ST_SUPPAYMENT, $trans_no, $date_);
+       }
+
+       /* Create a supp_trans entry for the supplier payment */
+       $payment_id = write_supp_trans(ST_SUPPAYMENT, 0, $supplier_id, $date_, $date_,
+               $ref, "", -$supp_amount, 0, -$supp_discount);
+
+       // Now debit creditors account with payment + discount
+
+       $total = 0;
+    $supplier_accounts = get_supplier_accounts($supplier_id);
+       $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
+               $supp_amount + $supp_discount, $supplier_id);
+
+       // Now credit discount received account with discounts
+       if ($supp_discount != 0)
+       {
+               $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
+                       -$supp_discount, $supplier_id);
+       }
+
+       $bank = get_bank_account($bank_account);
+
+       if ($bank_charge != 0)
+       {
+               $charge_act = get_company_pref('bank_charge_act');
+               $total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $charge_act, 0, 0, '',
+                       $bank_charge, $bank['bank_curr_code']);
+       }
+
+       $total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $bank['account_code'], 0, 0, '',
+               -($bank_amount + $bank_charge), $bank['bank_curr_code']);
+
+       /*Post a balance post if $total != 0 due to variance in AP and bank posted values*/
+       if ($total != 0)
+       {
+               $variance_act = get_company_pref('exchange_diff_act');
+               add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $variance_act, 0, 0, '',
+                       -$total, null, PT_SUPPLIER,  $supplier_id);
+       }
+
+   /*now enter the bank_trans entry */
+       add_bank_trans(ST_SUPPAYMENT, $payment_id, $bank_account, $ref,
+               $date_, -($bank_amount + $bank_charge), PT_SUPPLIER, $supplier_id);
+
+       add_comments(ST_SUPPAYMENT, $payment_id, $date_, $memo_);
+
+       $Refs->save(ST_SUPPAYMENT, $payment_id, $ref);
+
+       $args->trans_no = $payment_id;
+       hook_db_postwrite($args, ST_SUPPAYMENT);
+
+       commit_transaction();
+
+       return $payment_id;
+}
+
+//------------------------------------------------------------------------------------------------
+/*
+       This is legacy code, leaved here to provide compatibility for 2.3 extension modules.
+       Will be removed in 2.4 due to design issues.
+*/
 function add_supp_payment($supplier_id, $date_, $bank_account,
        $amount, $discount, $ref, $memo_, $rate=0, $charge=0)
 {