Bug 30194: (follow-up) Remove invalid tests

[koha-ffzg.git] / C4 / Budgets.pm

diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 439fcaf..9624650 100644 (file)
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -18,6 +18,7 @@ package C4::Budgets;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
+use JSON;
 use C4::Context;
 use Koha::Database;
 use Koha::Patrons;
@@ -644,16 +645,17 @@ sub AddBudget {
     my $id = $resultset->create($budget)->id;
 
     # Log the addition
-    if (C4::Context->preference("AcqLog")) {
-        my $infos =
-            sprintf("%010d", $budget->{budget_amount}) .
-            sprintf("%010d", $budget->{budget_encumb}) .
-            sprintf("%010d", $budget->{budget_expend});
+    if (C4::Context->preference("AcquisitionLog")) {
+        my $infos = {
+            budget_amount => $budget->{budget_amount},
+            budget_encumb => $budget->{budget_encumb},
+            budget_expend => $budget->{budget_expend}
+        };
         logaction(
             'ACQUISITIONS',
             'CREATE_FUND',
             $id,
-            $infos
+            encode_json($infos)
         );
     }
     return $id;
@@ -667,20 +669,21 @@ sub ModBudget {
     return unless($result);
 
     # Log this modification
-    if (C4::Context->preference("AcqLog")) {
-        my $infos =
-            sprintf("%010d", $budget->{budget_amount}) .
-            sprintf("%010d", $budget->{budget_encumb}) .
-            sprintf("%010d", $budget->{budget_expend}) .
-            sprintf("%010d", $result->budget_amount) .
-            sprintf("%010d", $result->budget_encumb) .
-            sprintf("%010d", $result->budget_expend) .
-            sprintf("%010d", 0 - ($result->budget_amount - $budget->{budget_amount}));
+    if (C4::Context->preference("AcquisitionLog")) {
+        my $infos = {
+            budget_amount_new    => $budget->{budget_amount},
+            budget_encumb_new    => $budget->{budget_encumb},
+            budget_expend_new    => $budget->{budget_expend},
+            budget_amount_old    => $result->budget_amount,
+            budget_encumb_old    => $result->budget_encumb,
+            budget_expend_old    => $result->budget_expend,
+            budget_amount_change => 0 - ($result->budget_amount - $budget->{budget_amount})
+        };
         logaction(
             'ACQUISITIONS',
             'MODIFY_FUND',
             $budget->{budget_id},
-            $infos
+            encode_json($infos)
         );
     }
 
@@ -698,7 +701,7 @@ sub DelBudget {
        my $sth         = $dbh->prepare("delete from aqbudgets where budget_id=?");
        my $rc          = $sth->execute($budget_id);
     # Log the deletion
-    if (C4::Context->preference("AcqLog")) {
+    if (C4::Context->preference("AcquisitionLog")) {
         logaction(
             'ACQUISITIONS',
             'DELETE_FUND',