From 36e8f1c2c571d4d606839f94ce1e6a88384cb44e Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 21 Oct 2010 10:11:53 +0000 Subject: [PATCH] add_supp_trans and reinsert_supp_trans merged into write_supp_trans --- purchasing/includes/db/invoice_db.inc | 2 +- purchasing/includes/db/supp_payment_db.inc | 2 +- purchasing/includes/db/supp_trans_db.inc | 45 ++++------------------ 3 files changed, 9 insertions(+), 40 deletions(-) diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 48e33987..63935f9d 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -155,7 +155,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $ex_rate = get_exchange_rate_from_home_currency(get_supplier_currency($supp_trans->supplier_id), $date_); /*First insert the invoice into the supp_trans table*/ - $invoice_id = add_supp_trans($trans_type, $supp_trans->supplier_id, $date_, $supp_trans->due_date, + $invoice_id = write_supp_trans($trans_type, 0, $supp_trans->supplier_id, $date_, $supp_trans->due_date, $supp_trans->reference, $supp_trans->supp_reference, $invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included); diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc index 3d848ed6..32b35041 100644 --- a/purchasing/includes/db/supp_payment_db.inc +++ b/purchasing/includes/db/supp_payment_db.inc @@ -38,7 +38,7 @@ function add_supp_payment($supplier_id, $date_, $bank_account, $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 diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc index 50ad5803..5ed21c3a 100644 --- a/purchasing/includes/db/supp_trans_db.inc +++ b/purchasing/includes/db/supp_trans_db.inc @@ -10,17 +10,21 @@ See the License here . ***********************************************************************/ //------------------------------------------------------------------------------------------------------------- - -function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $supp_reference, +// +// FIXME - this should be revised for transaction update case. +// +function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $reference, $supp_reference, $amount, $amount_tax, $discount, $err_msg="", $rate=0, $included=0) { + $new = $trans_no==0; $date = date2sql($date_); if ($due_date == "") $due_date = "0000-00-00"; else $due_date = date2sql($due_date); - $trans_no = get_next_trans_no($type); + if ($new) + $trans_no = get_next_trans_no($type); $curr = get_supplier_currency($supplier_id); @@ -46,41 +50,6 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup //------------------------------------------------------------------------------------------------------------- -function reinsert_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $reference, $supp_reference, - $amount, $amount_tax, $discount, $err_msg="", $rate=0) -{ - if ($trans_no == '') - display_db_error('Invalid call to function reinsert_supp_trans'); - - $date = date2sql($date_); - if ($due_date == "") - $due_date = "0000-00-00"; - else - $due_date = date2sql($due_date); - - $curr = get_supplier_currency($supplier_id); - - if ($rate == 0) - $rate = get_exchange_rate_from_home_currency($curr, $date_); - - - $sql = "INSERT INTO ".TB_PREF."supp_trans (trans_no, type, supplier_id, tran_date, due_date, - reference, supp_reference, ov_amount, ov_gst, rate, ov_discount) "; - $sql .= "VALUES (".db_escape($trans_no).", ".db_escape($type) - .", ".db_escape($supplier_id).", '$date', '$due_date', - ".db_escape($reference).", ".db_escape($supp_reference).", ".db_escape($amount) - .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).")"; - - if ($err_msg == "") - $err_msg = "Cannot insert a supplier transaction record"; - - db_query($sql, $err_msg); - add_audit_trail($type, $trans_no, $date_); - - return $trans_no; -} -//------------------------------------------------------------------------------------------------------------- - function get_supp_trans($trans_no, $trans_type=-1) { $sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, -- 2.30.2