[0005239] Revaluation of Currency Accounts: removed sparse reference field, fixed...

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index ac29552b647f7aaac96536dd79beaaacf1f048c4..c1a5e16d23a193e3d3ce3c67a4177fa7d94a08a1 100644 (file)
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -10,7 +10,7 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 function add_exchange_variation($trans_no, $date_, $acc_id, $account,
-    $currency, $person_type_id=null, $person_id = "")
+    $currency, $person_type_id=null, $person_id = "", $memo='')
 {
        if (is_company_currency($currency))
                return false;
@@ -41,7 +41,7 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account,
 
                begin_transaction();
                $trans_no = get_next_trans_no(ST_JOURNAL);
-               $ref = $Refs->get_next(ST_JOURNAL);
+               $ref = $Refs->get_next(ST_JOURNAL, null, $date_);
 
                add_journal(ST_JOURNAL, $trans_no, $diff, $date_ , get_company_currency(), $ref, '', 1, $date_, $date_);
                $Refs->save(ST_JOURNAL, $trans_no, $ref);
@@ -53,7 +53,14 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account,
                -$diff, null, $person_type_id, $person_id);
 
        add_gl_trans(ST_JOURNAL, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0, 
-               _("Exchange Variance"), $diff, null, $person_type_id, $person_id);
+               _("Exchange Variance"), $diff, null, $person_type_id, $person_id);
+
+               if ($memo)
+                       add_comments(ST_JOURNAL, $trans_no, $date_, $memo);
+
+               $Refs->save(ST_JOURNAL, $trans_no, $ref);
+               add_audit_trail(ST_JOURNAL, $trans_no, $date_);
+
                commit_transaction();
                return true;
        }
@@ -130,32 +137,29 @@ function get_account_home_balance($person_id, $person_type, $rec_account, $to_da
        $row = db_fetch_row($result);
        return $row[0];
 }
-//------------- New helper functions for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt.
 
-function add_exchange_variation_all($date=null, $ref="", $memo)
+//
+// Calculate and post currency accounts revaluation including foreign AP/AR
+// Note: in 2.4.9 sparse 'ref' argument was removed (generated transactions use
+// next references from default refline).
+//
+function add_exchange_variation_all($date=null, $memo)
 {
-       global $Refs;
        begin_transaction();
        $exchanged = false;
        $trans_no = get_next_trans_no(ST_JOURNAL);
        $sql = "SELECT * FROM ".TB_PREF."bank_accounts";
        $result = db_query($sql, "could not retreive bank accounts");
+       $b_num = 0;
        while ($myrow = db_fetch($result))
        {
                if (add_exchange_variation($trans_no, $date, $myrow['id'], $myrow['account_code'],
-                       $myrow['bank_curr_code']))
-                       $exchanged = true;
+                       $myrow['bank_curr_code'], null, '', $memo))
+               $b_num++;
        }
-       if ($exchanged)
-       {
-               add_comments(ST_JOURNAL, $trans_no, $date, $memo);
-               if ($ref == "")
-                       $ref = $Refs->get_next(ST_JOURNAL, null, $date);
-               $Refs->save(ST_JOURNAL, $trans_no, $ref);
-               add_audit_trail(ST_JOURNAL, $trans_no, $date);
-       }       
 
-       //------------- BEGIN inserted for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt.
+       // revaluation of customer/supplier currencies
+
        if ($date == null)
                $date = Today();
        $exchange_act = get_company_pref('exchange_diff_act');
@@ -192,10 +196,9 @@ function add_exchange_variation_all($date=null, $ref="", $memo)
                        $je++;  
                }
        }
-       //------------- END
 
        commit_transaction();
-       return array(($exchanged ? $trans_no : 0), $je);
+       return array($b_num, $je);
 }
 //----------------------------------------------------------------------------------
 //     Add bank tranfer to database.
@@ -229,7 +232,6 @@ function add_bank_transfer($from_account, $to_account, $date_,
        $from_gl_account = get_bank_gl_account($from_account);
        $to_gl_account = get_bank_gl_account($to_account);
        
-       $exchanged = false;
        $total = 0;
        // do the source account postings
     $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, $person_id,
@@ -242,9 +244,8 @@ function add_bank_transfer($from_account, $to_account, $date_,
        if ($SysPrefs->auto_currency_revaluation())
        {
                $trans_no1 = get_next_trans_no(ST_JOURNAL);
-               if (add_exchange_variation($trans_no1, $date_, $from_account, $from_gl_account, 
-                       $currency, PT_MISC, $person_id))
-                       $exchanged = true;
+               add_exchange_variation($trans_no1, $date_, $from_account, $from_gl_account, 
+                       $currency, PT_MISC, $person_id);
        }
        if ($charge != 0)
        {
@@ -276,15 +277,8 @@ function add_bank_transfer($from_account, $to_account, $date_,
        if ($SysPrefs->auto_currency_revaluation())
        {
                $currency = get_bank_account_currency($to_account);
-               if (add_exchange_variation($trans_no1, $date_, $to_account, $to_gl_account,     
-                       $currency, PT_MISC, $person_id))
-                       $exchanged = true;
-       }
-       if ($exchanged == true)
-       {
-               $ref1 = $Refs->get_next(ST_JOURNAL, null, $date_);
-               $Refs->save(ST_JOURNAL, $trans_no1, $ref1);
-               add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
+               add_exchange_variation($trans_no1, $date_, $to_account, $to_gl_account, 
+                       $currency, PT_MISC, $person_id);
        }
        add_comments($trans_type, $trans_no, $date_, $memo_);
 
@@ -391,7 +385,6 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
                display_db_error("Invalid type ($trans_type) sent to add_bank_transaction");
 
        $do_exchange_variance = false;
-       $exchanged = false;
        if ($use_transaction)
                begin_transaction();
 
@@ -512,13 +505,8 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 
     if ($do_exchange_variance)
     {
-       if ($exchanged || add_exchange_variation($trans_no1, $date_, $from_account, $bank_gl_account, 
-               $currency, $person_type_id, $person_id))
-       {
-                       $ref1 = $Refs->get_next(ST_JOURNAL, null, $date_);
-                       $Refs->save(ST_JOURNAL, $trans_no1, $ref1);
-                       add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
-               }
+       add_exchange_variation($trans_no1, $date_, $from_account, $bank_gl_account, 
+               $currency, $person_type_id, $person_id);
        }
 
        add_comments($trans_type, $trans_no, $date_, $memo_);

diff --git a/gl/manage/revaluate_currencies.php b/gl/manage/revaluate_currencies.php
index 1dae7eeda932ef74c57889866f7b394691ff2f4c..24241d21057a79e58abb8b13a482bca0c4a8c3c9 100644 (file)
--- a/gl/manage/revaluate_currencies.php
+++ b/gl/manage/revaluate_currencies.php
@@ -22,24 +22,18 @@ if (user_use_date_picker())
        $js .= get_js_date_picker();
 page(_($help_context = "Revaluation of Currency Accounts"), false, false, "", $js);
 
-if (isset($_GET['AddedID'])) 
+if (isset($_GET['BA'])) 
 {
-       $trans_no = $_GET['AddedID'];
+       $BA = $_GET['BA'];
        $JE = $_GET['JE'];
-       $trans_type = ST_JOURNAL;
 
-       if ($trans_no == 0)
-               display_notification_centered( _("No Revaluation was needed"));
-       else
+       if ($BA != 0 || $JE !=0)
        {
-               display_notification_centered( _("Transfer has been entered"));
-
-               display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Journal Entries for this Transfer")));
+               display_notification_centered(sprintf(_("%d Journal Entries for Bank Accounts have been added"), $BA));
+               display_notification_centered(sprintf(_("%d Journal Entries for AR/AP accounts have been added"), $JE));
        }
-       if ($JE > 0)
-               display_notification_centered(sprintf(_("%d Journal Entries for AR/AP accounts have been added"), $JE));
-
-       //display_footer_exit();
+       else
+               display_notification_centered( _("No revaluation was needed."));
 }
 
 
@@ -58,11 +52,6 @@ function check_data()
                set_focus('date');
                return false;
        }
-       if (!check_reference($_POST['ref'], ST_JOURNAL))
-       {
-               set_focus('ref');
-               return false;
-       }
 
        return true;
 }
@@ -74,9 +63,9 @@ function handle_submit()
        if (!check_data())
                return;
 
-       $trans = add_exchange_variation_all($_POST['date'], $_POST['ref'], $_POST['memo_']);
+       $trans = add_exchange_variation_all($_POST['date'], $_POST['memo_']);
 
-       meta_forward($_SERVER['PHP_SELF'], "AddedID=".$trans[0]."&JE=".$trans[1]);
+       meta_forward($_SERVER['PHP_SELF'], "BA=".$trans[0]."&JE=".$trans[1]);
        //clear_data();
 }
 
@@ -85,14 +74,12 @@ function handle_submit()
 
 function display_reval()
 {
-       global $Refs;
        start_form();
        start_table(TABLESTYLE2);
 
        if (!isset($_POST['date']))
                $_POST['date'] = Today();
     date_row(_("Date for Revaluation:"), 'date', '', null, 0, 0, 0, null, true);
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_JOURNAL, null, $_POST['date']), false, ST_JOURNAL);
     textarea_row(_("Memo:"), 'memo_', null, 40,4);
        end_table(1);