Printers code paring, related to bug 2045. This does not resolve the bug,

[koha.git] / admin / aqbookfund.pl

diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl
index 88b0008..184f059 100755 (executable)
--- a/admin/aqbookfund.pl
+++ b/admin/aqbookfund.pl
@@ -59,7 +59,9 @@ use C4::Koha;
 use C4::Context;
 use C4::Bookfund;
 use C4::Output;
-use C4::Date;
+use C4::Dates;
+
+# use Smart::Comments;
 
 my $dbh = C4::Context->dbh;
 my $input = new CGI;
@@ -94,7 +96,7 @@ $template->param(action => $script_name);
 
 my $branches = GetBranches;
 
-################## ADD_FORM ##################################
+#-----############# ADD_FORM ##################################
 # called by default. Used to create form to add or  modify a record
 if ($op eq 'add_form') {
        #---- if primkey exists, it's a modify action, so read values to modify...
@@ -106,6 +108,7 @@ if ($op eq 'add_form') {
        if ($bookfundid) {
            $header = "Modify book fund";
            $template->param('header-is-modify-p' => 1);
+           $template->param('current_branch' =>  $branchcodeid);
        } else {
            $header = "Add book fund";
            $template->param('header-is-add-p' => 1);
@@ -140,32 +143,51 @@ if ($op eq 'add_form') {
 
 } # END $OP eq ADD_FORM
 
-################## ADD_VALIDATE ##################################
+#-----############# ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 elsif ($op eq 'add_validate') {
+### add
        my $bookfundid = uc $input->param('bookfundid');
+        my $bookfundname = $input->param('bookfundname');
+        my $branchcode = $input->param('branchcode') || undef;
 
     my $number = Countbookfund($bookfundid,$branchcodeid);
+    if ($number == 0 ) {
 
-    my $bookfund_already_exists = $number > 0 ? 1 : 0;
-
-    if ($bookfund_already_exists) {
-        my $bookfundname = $input->param('bookfundname');
-        my $branchcode = $input->param('branchcode') || undef;
-         warn "name :$bookfundname branch:$branchcode";
-        ModBookFund($bookfundname,$bookfundid,$branchcode);
-    }
-    else {
         NewBookFund(
             $bookfundid,
             $input->param('bookfundname'),
             $input->param('branchcode')||''
         );
     }
-    $input->redirect('/cgi-bin/koha/aqbookfund.pl');
+    $input->redirect('aqbookfund.pl');
 # END $OP eq ADD_VALIDATE
 }
-################## DELETE_CONFIRM ##################################
+
+#-----############# MOD_VALIDATE ##################################
+# called by add_form, used to insert/modify data in DB
+elsif ($op eq 'mod_validate') {
+### mod ddddddddddddddddd
+
+       my $bookfundid  = uc $input->param('bookfundid');
+       my $bookfundname   = $input->param('bookfundname');
+       my $branchcode     = $input->param('branchcode'    ) || undef;
+       my $current_branch = $input->param('current_branch') || undef;
+       warn "$bookfundid, $bookfundname, $branchcode";
+
+       my $number = Countbookfund($bookfundid,$branchcodeid);
+### $number
+
+
+    if ($number < 2)  {
+         warn "name :$bookfundname branch:$branchcode";
+        ModBookFund($bookfundname,$bookfundid,$current_branch, $branchcode);
+    }
+   $input->redirect('aqbookfund.pl');
+# END $OP eq ADD_VALIDATE
+}
+
+#-----############# DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
 
 elsif ($op eq 'delete_confirm') {
@@ -176,7 +198,7 @@ elsif ($op eq 'delete_confirm') {
 } # END $OP eq DELETE_CONFIRM
 
 
-################## DELETE_CONFIRMED ##################################
+#-----############# DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 elsif ($op eq 'delete_confirmed') {
     DelBookFund(uc($input->param('bookfundid')),$branchcodeid);
@@ -184,7 +206,7 @@ elsif ($op eq 'delete_confirmed') {
 }# END $OP eq DELETE_CONFIRMED
 
 
-################## DEFAULT ##################################
+#-----############# DEFAULT ##################################
 else { # DEFAULT
     my ($query, $sth);
 
@@ -197,17 +219,15 @@ else { # DEFAULT
             code => $branchcode,
             name => $branches->{$branchcode}->{branchname},
         };
-
         if (defined $input->param('filter_branchcode')
             and $input->param('filter_branchcode') eq $branchcode) {
             $row->{selected} = 1;
         }
-
         push @branchloop, $row;
     }
 
     my @bookfundids_loop;
-    my $sth = GetBookFundsId();
+    $sth = GetBookFundsId();
 
     while (my $row = $sth->fetchrow_hashref) {
         if (defined $input->param('filter_bookfundid') and $input->param('filter_bookfundid') eq $row->{bookfundid}){
@@ -232,7 +252,7 @@ else { # DEFAULT
 
     # does the book funds have budgets?
     my @loop_id;
-    my $sth = GetBookFundsId();
+    $sth = GetBookFundsId();
     while (my $row = $sth->fetchrow){
         push @loop_id, $row;
     }
@@ -280,10 +300,4 @@ else { # DEFAULT
             )
         );
 } #---- END $OP eq DEFAULT
-$template->param(
-    intranetcolorstylesheet =>C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav => C4::Context->preference("IntranetNav"),
-    );
-
 output_html_with_http_headers $input, $cookie, $template->output;