Improved journal trans: added currency support, tax and source document date. Allowed...

[fa-stable.git] / gl / includes / db / gl_db_trans.inc

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index cac714b062f1504faeaffde4cb289d75367a84b5..d42bd73263a5baefe43cfcca0f233a850695a858 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -475,102 +475,6 @@ function get_tax_summary($from, $to)
     return db_query($sql,"Cannot retrieve tax summary");
 }
 
-//--------------------------------------------------------------------------------
-// Write/update journal entries.
-//
-function write_journal_entries(&$cart, $reverse, $use_transaction=true)
-{
-       global $Refs;
-
-       $date_ = $cart->tran_date;
-       $ref   = $cart->reference;
-       $memo_ = $cart->memo_;
-       $trans_type = $cart->trans_type;
-       $new = $cart->order_id == 0;
-       
-       if ($new)
-           $cart->order_id = get_next_trans_no($trans_type);
-
-    $trans_id = $cart->order_id;
-
-       if ($use_transaction)
-               begin_transaction();
-       
-       if(!$new)
-               void_journal_trans($trans_type, $trans_id, false);
-
-       foreach ($cart->gl_items as $journal_item)
-       {
-               // post to first found bank account using given gl acount code.
-               $is_bank_to = is_bank_account($journal_item->code_id);
-
-               add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id,
-                       $journal_item->dimension_id, $journal_item->dimension2_id,
-                       $journal_item->reference, $journal_item->amount, null, 
-                       $journal_item->person_type_id, 
-                       $journal_item->person_id);
-
-       if ($is_bank_to)
-       {
-               add_bank_trans($trans_type, $trans_id, $is_bank_to, $ref,
-                       $date_, $journal_item->amount,  0, "", get_company_currency(),
-                       "Cannot insert a destination bank transaction");
-       }
-               // store tax details if the gl account is a tax account
-               add_gl_tax_details($journal_item->code_id, 
-                       ST_JOURNAL, $trans_id, $journal_item->amount, 1, $date_, $memo_);
-       }
-       
-       $Refs->save($trans_type, $trans_id, $ref);
-       if ($new) {
-               add_comments($trans_type, $trans_id, $date_, $memo_);
-       } else {
-               update_comments($trans_type, $trans_id, null, $memo_);
-       }
-
-       add_audit_trail($trans_type, $trans_id, $date_);
-
-       if ($reverse)
-       {
-       //$reversingDate = date(user_date_display(),
-       //      Mktime(0,0,0,get_month($date_)+1,1,get_year($date_)));
-       $reversingDate = begin_month(add_months($date_, 1));
-
-       $trans_id_reverse = get_next_trans_no($trans_type);
-
-       foreach ($cart->gl_items as $journal_item)
-       {
-                       $is_bank_to = is_bank_account($journal_item->code_id);
-
-               add_gl_trans($trans_type, $trans_id_reverse, $reversingDate,
-                       $journal_item->code_id, $journal_item->dimension_id, $journal_item->dimension2_id,
-                       $journal_item->reference, -$journal_item->amount, 
-                       null, $journal_item->person_type_id, $journal_item->person_id);
-
-               if ($is_bank_to)
-               {
-                       add_bank_trans($trans_type, $trans_id_reverse, $is_bank_to, $ref,
-                               $reversingDate, -$journal_item->amount,
-                               0, "", get_company_currency(),
-                               "Cannot insert a destination bank transaction");
-               }
-                       // store tax details if the gl account is a tax account
-                       add_gl_tax_details($journal_item->code_id, 
-                               ST_JOURNAL, $trans_id, $journal_item->amount, 1, $reversingDate, $memo_);
-       }
-
-       add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_);
-
-       $Refs->save($trans_type, $trans_id_reverse, $ref);
-               add_audit_trail($trans_type, $trans_id_reverse, $reversingDate);
-       }
-
-       if ($use_transaction)
-               commit_transaction();
-
-       return $trans_id;
-}
-
 //--------------------------------------------------------------------------------------------------
 
 function exists_gl_trans($type, $trans_id)
@@ -614,21 +518,6 @@ function clear_gl_trans($type, $trans_id, $nested=false)
                commit_transaction();
 }
 
-//----------------------------------------------------------------------------------------
-
-function void_journal_trans($type, $type_no, $use_transaction=true)
-{
-       if ($use_transaction)
-               begin_transaction();
-
-       void_bank_trans($type, $type_no, true);
-//     void_gl_trans($type, $type_no, true);    // this is done above
-//     void_trans_tax_details($type, $type_no); // ditto
-
-       if ($use_transaction)
-               commit_transaction();
-}
-
 function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false)
 {