@@ -, +, @@ files --- Koha/Schema/Result/Aqbookseller.pm | 8 +-- Koha/Schema/Result/Aqorder.pm | 103 +++++++++++++++++++++++++++++++++---- 2 files changed, 96 insertions(+), 15 deletions(-) --- a/Koha/Schema/Result/Aqbookseller.pm +++ a/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] }, @@ -352,8 +352,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-08-26 11:53:50 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kz1tuPJihENyV6OyCwyX/A +# Created by DBIx::Class::Schema::Loader v0.07041 @ 2014-11-14 11:03:41 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Jat/G0KedbDUNd+ax+dg1A # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Aqorder.pm +++ a/Koha/Schema/Result/Aqorder.pm @@ -88,6 +88,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' @@ -115,11 +127,6 @@ __PACKAGE__->table("aqorders"); data_type: 'mediumtext' is_nullable: 1 -=head2 supplierreference - - data_type: 'mediumtext' - is_nullable: 1 - =head2 purchaseordernumber data_type: 'mediumtext' @@ -144,18 +151,48 @@ __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 + size: [28,6] + =head2 discount data_type: 'float' @@ -237,6 +274,11 @@ __PACKAGE__->table("aqorders"); is_nullable: 1 size: 16 +=head2 supplierreference + + data_type: 'mediumtext' + is_nullable: 1 + =cut __PACKAGE__->add_columns( @@ -262,6 +304,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", @@ -272,8 +318,6 @@ __PACKAGE__->add_columns( { data_type => "mediumtext", is_nullable => 1 }, "order_vendornote", { data_type => "mediumtext", is_nullable => 1 }, - "supplierreference", - { data_type => "mediumtext", is_nullable => 1 }, "purchaseordernumber", { data_type => "mediumtext", is_nullable => 1 }, "basketno", @@ -287,10 +331,20 @@ __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 => [28, 6] }, "discount", { data_type => "float", is_nullable => 1, size => [6, 4] }, "budget_id", @@ -324,6 +378,8 @@ __PACKAGE__->add_columns( is_nullable => 1, size => 16, }, + "supplierreference", + { data_type => "mediumtext", is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -385,6 +441,21 @@ __PACKAGE__->might_have( { cascade_copy => 0, cascade_delete => 0 }, ); +=head2 aqorderusers + +Type: has_many + +Related object: L + +=cut + +__PACKAGE__->has_many( + "aqorderusers", + "Koha::Schema::Result::Aqorderuser", + { "foreign.ordernumber" => "self.ordernumber" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + =head2 basketno Type: belongs_to @@ -465,9 +536,19 @@ __PACKAGE__->belongs_to( }, ); +=head2 borrowernumbers + +Type: many_to_many + +Composing rels: L -> borrowernumber + +=cut + +__PACKAGE__->many_to_many("borrowernumbers", "aqorderusers", "borrowernumber"); + -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-10-30 01:04:01 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:M+R6T+KIk4lqzdYjbYvg9w +# Created by DBIx::Class::Schema::Loader v0.07041 @ 2014-11-14 12:17:07 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WtLVCrU9/7hf5AenldifDw # You can replace this text with custom content, and it will be preserved on regeneration --