From 70f901f5f9a539b0307c44e59d57528eae8d8fa6 Mon Sep 17 00:00:00 2001
From: Alex Arnaud <alex.arnaud@biblibre.com>
Date: Mon, 12 Mar 2018 09:34:28 +0000
Subject: [PATCH] Bug 17047 - Remove changes on Koha/Schema/Result/SavedSql.pm
 and Subscription.pm - mana.inc included twice

Rebased-by: Alex Arnaud <alex.arnaud@biblibre.com> (2018-07-04)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 Koha/Schema/Result/SavedSql.pm                             | 7 -------
 Koha/Schema/Result/Subscription.pm                         | 7 -------
 .../intranet-tmpl/prog/en/includes/reports-toolbar.inc     | 1 -
 3 files changed, 15 deletions(-)

diff --git a/Koha/Schema/Result/SavedSql.pm b/Koha/Schema/Result/SavedSql.pm
index c12dd7fa17..622f588f52 100644
--- a/Koha/Schema/Result/SavedSql.pm
+++ b/Koha/Schema/Result/SavedSql.pm
@@ -105,11 +105,6 @@ __PACKAGE__->table("saved_sql");
   is_nullable: 1
   size: 80
 
-=head2 mana_id
-
-  data_type: 'integer'
-  is_nullable: 1
-
 =cut
 
 __PACKAGE__->add_columns(
@@ -153,8 +148,6 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 80 },
   "report_subgroup",
   { data_type => "varchar", is_nullable => 1, size => 80 },
-  "mana_id",
-  { data_type => "integer", is_nullable => 1 },
 );
 
 =head1 PRIMARY KEY
diff --git a/Koha/Schema/Result/Subscription.pm b/Koha/Schema/Result/Subscription.pm
index f24e1f1bd6..c493b73b60 100644
--- a/Koha/Schema/Result/Subscription.pm
+++ b/Koha/Schema/Result/Subscription.pm
@@ -271,11 +271,6 @@ __PACKAGE__->table("subscription");
   is_nullable: 1
   size: 10
 
-=head2 mana_id
-
-  data_type: 'integer'
-  is_nullable: 1
-
 =cut
 
 __PACKAGE__->add_columns(
@@ -363,8 +358,6 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "previousitemtype",
   { data_type => "varchar", is_nullable => 1, size => 10 },
-  "mana_id",
-  { data_type => "integer", is_nullable => 1 },
 );
 
 =head1 PRIMARY KEY
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
index 41cdcbcab1..9a2c4bbe83 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
@@ -1,5 +1,4 @@
 [% INCLUDE 'blocking_errors.inc' %]
-[% INCLUDE 'mana.inc' %]
 <div id="toolbar" class="btn-toolbar">
     [% IF ( CAN_user_reports_create_reports ) %]
         <div class="btn-group">
-- 
2.17.2 (Apple Git-113)