From 2a1b68295256852b080ff699283e6cf29e34b9a6 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Fri, 9 Sep 2016 13:45:36 +0200
Subject: [PATCH] Bug 13321: Update DBIx::Class schema files

Signed-off-by: Sonia Bouis <koha@univ-lyon3.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 Koha/Schema/Result/Aqbookseller.pm |  8 ++--
 Koha/Schema/Result/Aqorder.pm      | 64 ++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/Koha/Schema/Result/Aqbookseller.pm b/Koha/Schema/Result/Aqbookseller.pm
index 5cd4ec3cb4..e9c2656940 100644
--- a/Koha/Schema/Result/Aqbookseller.pm
+++ b/Koha/Schema/Result/Aqbookseller.pm
@@ -142,7 +142,7 @@ __PACKAGE__->table("aqbooksellers");
   data_type: 'tinyint'
   is_nullable: 1
 
-=head2 gstrate
+=head2 tax_rate
 
   data_type: 'decimal'
   is_nullable: 1
@@ -212,7 +212,7 @@ __PACKAGE__->add_columns(
   { data_type => "tinyint", is_nullable => 1 },
   "invoiceincgst",
   { data_type => "tinyint", is_nullable => 1 },
-  "gstrate",
+  "tax_rate",
   { data_type => "decimal", is_nullable => 1, size => [6, 4] },
   "discount",
   { data_type => "float", is_nullable => 1, size => [6, 4] },
@@ -382,8 +382,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-10 19:36:24
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mNH0CKfuRQqoOLXieV43DQ
+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-09-09 13:43:30
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:b3aUNZsdvNzEuKScGD7ZPQ
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqorder.pm b/Koha/Schema/Result/Aqorder.pm
index b61f2f5067..b96d5f9523 100644
--- a/Koha/Schema/Result/Aqorder.pm
+++ b/Koha/Schema/Result/Aqorder.pm
@@ -83,6 +83,18 @@ __PACKAGE__->table("aqorders");
   is_nullable: 1
   size: [28,6]
 
+=head2 unitprice_tax_excluded
+
+  data_type: 'decimal'
+  is_nullable: 1
+  size: [28,6]
+
+=head2 unitprice_tax_included
+
+  data_type: 'decimal'
+  is_nullable: 1
+  size: [28,6]
+
 =head2 quantityreceived
 
   data_type: 'smallint'
@@ -134,13 +146,43 @@ __PACKAGE__->table("aqorders");
   is_nullable: 1
   size: [13,2]
 
+=head2 rrp_tax_excluded
+
+  data_type: 'decimal'
+  is_nullable: 1
+  size: [28,6]
+
+=head2 rrp_tax_included
+
+  data_type: 'decimal'
+  is_nullable: 1
+  size: [28,6]
+
 =head2 ecost
 
   data_type: 'decimal'
   is_nullable: 1
   size: [13,2]
 
-=head2 gstrate
+=head2 ecost_tax_excluded
+
+  data_type: 'decimal'
+  is_nullable: 1
+  size: [28,6]
+
+=head2 ecost_tax_included
+
+  data_type: 'decimal'
+  is_nullable: 1
+  size: [28,6]
+
+=head2 tax_rate
+
+  data_type: 'decimal'
+  is_nullable: 1
+  size: [6,4]
+
+=head2 tax_value
 
   data_type: 'decimal'
   is_nullable: 1
@@ -269,6 +311,10 @@ __PACKAGE__->add_columns(
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "unitprice",
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
+  "unitprice_tax_excluded",
+  { data_type => "decimal", is_nullable => 1, size => [28, 6] },
+  "unitprice_tax_included",
+  { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "quantityreceived",
   { data_type => "smallint", default_value => 0, is_nullable => 0 },
   "datecancellationprinted",
@@ -292,9 +338,19 @@ __PACKAGE__->add_columns(
   },
   "rrp",
   { data_type => "decimal", is_nullable => 1, size => [13, 2] },
+  "rrp_tax_excluded",
+  { data_type => "decimal", is_nullable => 1, size => [28, 6] },
+  "rrp_tax_included",
+  { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "ecost",
   { data_type => "decimal", is_nullable => 1, size => [13, 2] },
-  "gstrate",
+  "ecost_tax_excluded",
+  { data_type => "decimal", is_nullable => 1, size => [28, 6] },
+  "ecost_tax_included",
+  { data_type => "decimal", is_nullable => 1, size => [28, 6] },
+  "tax_rate",
+  { data_type => "decimal", is_nullable => 1, size => [6, 4] },
+  "tax_value",
   { data_type => "decimal", is_nullable => 1, size => [6, 4] },
   "discount",
   { data_type => "float", is_nullable => 1, size => [6, 4] },
@@ -537,8 +593,8 @@ Composing rels: L</aqorder_users> -> borrowernumber
 __PACKAGE__->many_to_many("borrowernumbers", "aqorder_users", "borrowernumber");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-05-06 18:07:43
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SQC7q+ZeARRBGvdzzWgSkw
+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-09-09 13:43:30
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:R2a+DkXI1AaEVnpb1YKu5Q
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
-- 
2.39.5