From e8d094b2886ebaf570a3bbdc152e8015bbef83f1 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Mon, 20 Dec 2010 18:35:06 +1300 Subject: [PATCH] Bug 5186 - allow tax to be set to zero (3.2.1) This allows the tax rate for a vendor to be set to zero. Previously, a zero meant that the system default was used. Now, zero means no tax, and to have it be the default the field should simply be left empty. Additionally: * this will now show on the vendor display if the tax value is from the system default * this includes a database update that changes all the existing 0.00 tax settings to be NULL, which preserves existing behaviour. * this now saves the tax value supplied for new vendors Note: this patch has been rebased against 3.2.1. It will not apply against master. --- C4/Bookseller.pm | 5 ++- acqui/addorderiso2709.pl | 5 ++- acqui/basket.pl | 2 +- acqui/basketgroup.pl | 8 +++--- acqui/neworderempty.pl | 2 +- acqui/orderreceive.pl | 3 +- acqui/parcel.pl | 3 +- acqui/supplier.pl | 16 ++++++------ acqui/updatesupplier.pl | 7 ++++- installer/data/mysql/updatedatabase.pl | 10 ++++++++ .../prog/en/modules/acqui/supplier.tmpl | 25 ++++++++------------ 11 files changed, 50 insertions(+), 36 deletions(-) diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm index 8d60938..21ad348 100644 --- a/C4/Bookseller.pm +++ b/C4/Bookseller.pm @@ -173,10 +173,10 @@ sub AddBookseller { postal, phone, fax, url, contact, contpos, contphone, contfax, contaltphone, contemail, contnotes, active, listprice, invoiceprice, gstreg, - listincgst,invoiceincgst, discount, + listincgst,invoiceincgst, gstrate, discount, notes ) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "; my $sth = $dbh->prepare($query); $sth->execute( @@ -191,6 +191,7 @@ sub AddBookseller { $data->{'active'}, $data->{'listprice'}, $data->{'invoiceprice'}, $data->{'gstreg'}, $data->{'listincgst'}, $data->{'invoiceincgst'}, + $data->{'gstrate'}, $data->{'discount'}, $data->{'notes'} ); diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 903d2db..781df61 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -149,7 +149,8 @@ if ($op eq ""){ eval "use C4::Bookseller qw/GetBookSellerFromId/;"; my $basket = GetBasket($orderinfo{basketno}); my $bookseller = GetBookSellerFromId($basket->{booksellerid}); - my $gst = $bookseller->{gstrate} || C4::Context->preference("gist") || 0; + # '//' is like '||' but tests for defined, rather than true + my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0; $orderinfo{'unitprice'} = $orderinfo{listprice} - ($orderinfo{listprice} * ($bookseller->{discount} / 100)); $orderinfo{'ecost'} = $orderinfo{unitprice}; } else { @@ -166,7 +167,7 @@ if ($op eq ""){ eval "use C4::Bookseller qw/GetBookSellerFromId/;"; my $basket = GetBasket($orderinfo{basketno}); my $bookseller = GetBookSellerFromId($basket->{booksellerid}); - my $gst = $bookseller->{gstrate} || C4::Context->preference("gist") || 0; + my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0; $orderinfo{'unitprice'} = $orderinfo{listprice} - ($orderinfo{listprice} * ($bookseller->{discount} / 100)); $orderinfo{'ecost'} = $orderinfo{unitprice}; } else { diff --git a/acqui/basket.pl b/acqui/basket.pl index 005fcb9..221a26b 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -219,7 +219,7 @@ if ( $op eq 'delete_confirm' ) { my @results = GetOrders( $basketno ); - my $gist = $bookseller->{gstrate} || C4::Context->preference("gist") || 0; + my $gist = $bookseller->{gstrate} // C4::Context->preference("gist") // 0; my $discount = $bookseller->{'discount'} / 100; my $total_rrp; # RRP Total, its value will be assigned to $total_rrp_gsti or $total_rrp_gste depending of $bookseller->{'listincgst'} my $total_rrp_gsti; # RRP Total, GST included diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index 69de099..aba32d4 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -137,8 +137,8 @@ sub BasketTotal { my @orders = GetOrders($basketno); for my $order (@orders){ $total = $total + ( $order->{ecost} * $order->{quantity} ); - if ($bookseller->{invoiceincgst} && ! $bookseller->{listincgst} && ( $bookseller->{gstrate} || C4::Context->preference("gist") )) { - my $gst = $bookseller->{gstrate} || C4::Context->preference("gist"); + if ($bookseller->{invoiceincgst} && ! $bookseller->{listincgst} && ( $bookseller->{gstrate} // C4::Context->preference("gist") )) { + my $gst = $bookseller->{gstrate} // C4::Context->preference("gist"); $total = $total * ( $gst / 100 +1); } } @@ -220,7 +220,7 @@ sub printbasketgrouppdf{ push(@ba_order, $ord->{$key}); #Order lines } push(@ba_order, $bookseller->{discount}); - push(@ba_order, $bookseller->{gstrate}*100 || C4::Context->preference("gist") || 0); + push(@ba_order, $bookseller->{gstrate}*100 // C4::Context->preference("gist") // 0); push(@ba_orders, \@ba_order); # Editor Number my $en; @@ -242,7 +242,7 @@ sub printbasketgrouppdf{ -type => 'application/pdf', -attachment => ( $basketgroup->{name} || $basketgroupid ) . '.pdf' ); - my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} || C4::Context->preference("gist")) || die "pdf generation failed"; + my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} // C4::Context->preference("gist")) || die "pdf generation failed"; print $pdf; exit; } diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 61f0962..84fc81e 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -357,7 +357,7 @@ $template->param( import_batch_id => $import_batch_id, # CHECKME: gst-stuff needs verifing, mason. - gstrate => $bookseller->{'gstrate'} || C4::Context->preference("gist"), + gstrate => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0, gstreg => $bookseller->{'gstreg'}, ); diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl index f084f8f..96e4556 100755 --- a/acqui/orderreceive.pl +++ b/acqui/orderreceive.pl @@ -90,7 +90,8 @@ my $datereceived = $input->param('datereceived'); $datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new(); my $bookseller = GetBookSellerFromId($supplierid); -my $gst= $input->param('gst') || $bookseller->{gstrate} || C4::Context->preference("gist") || 0; +my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst')); +my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0; my $results = SearchOrder($ordernumber,$search); diff --git a/acqui/parcel.pl b/acqui/parcel.pl index b1e11e7..6c8f5f0 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -75,7 +75,8 @@ my $bookseller=GetBookSellerFromId($supplierid); my $invoice=$input->param('invoice') || ''; my $freight=$input->param('freight'); -my $gst= $input->param('gst') || $bookseller->{gstrate} || C4::Context->preference("gist") || 0; +my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst')); +my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0; my $datereceived = ($input->param('op') eq 'new') ? C4::Dates->new($input->param('datereceived')) : C4::Dates->new($input->param('datereceived'), 'iso') ; $datereceived = C4::Dates->new() unless $datereceived; diff --git a/acqui/supplier.pl b/acqui/supplier.pl index a939ce1..80660d9 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -71,10 +71,9 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( my $seller_gstrate = $supplier->{'gstrate'}; # ensure the scalar isn't flagged as a string -$seller_gstrate = ( defined $seller_gstrate ) ? $seller_gstrate + 0 : 0; -my $tax_rate = $seller_gstrate || C4::Context->preference('gist'); +$seller_gstrate = ( defined $seller_gstrate ) ? $seller_gstrate + 0 : undef; +my $tax_rate = $seller_gstrate // C4::Context->preference('gist') // 0; $tax_rate *= 100; - #build array for currencies if ( $op eq 'display' ) { @@ -85,8 +84,6 @@ if ( $op eq 'display' ) { $_->{contractenddate} = format_date( $_->{contractenddate} ); } - my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : 0; - $template->param( id => $id, name => $supplier->{'name'}, @@ -110,13 +107,13 @@ if ( $op eq 'display' ) { gstreg => $supplier->{'gstreg'}, listincgst => $supplier->{'listincgst'}, invoiceincgst => $supplier->{'invoiceincgst'}, - gstrate => $gstrate, discount => $supplier->{'discount'}, invoiceprice => $supplier->{'invoiceprice'}, listprice => $supplier->{'listprice'}, GST => $tax_rate, + default_tax => defined($seller_gstrate), basketcount => $supplier->{'basketcount'}, - contracts => $contracts + contracts => $contracts, ); } elsif ( $op eq 'delete' ) { DelBookseller($id); @@ -133,7 +130,9 @@ if ( $op eq 'display' ) { }; } - my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : 0; + my $default_gst_rate = (C4::Context->preference('gist') * 100) || '0.0'; + + my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : ''; $template->param( id => $id, name => $supplier->{'name'}, @@ -163,6 +162,7 @@ if ( $op eq 'display' ) { loop_currency => $loop_currency, GST => $tax_rate, enter => 1, + default_gst_rate => $default_gst_rate, ); } diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl index 05e8db2..1d487cb 100755 --- a/acqui/updatesupplier.pl +++ b/acqui/updatesupplier.pl @@ -98,7 +98,12 @@ $data{'gstreg'}=$input->param('gst'); $data{'listincgst'}=$input->param('list_gst'); $data{'invoiceincgst'}=$input->param('invoice_gst'); #have to transform this into fraction so it's easier to use -$data{'gstrate'}=$input->param('gstrate')/100; +my $gstrate = $input->param('gstrate'); +if ($gstrate eq '') { + $data{'gstrate'} = undef; +} else { + $data{'gstrate'} = $input->param('gstrate')/100; +} $data{'discount'}=$input->param('discount'); $data{'active'}=$input->param('status'); if($data{'name'}) { diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 62e7991..2349886 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3735,6 +3735,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +<<<<<<< HEAD $DBversion = '3.01.00.999'; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { print "Upgrade to $DBversion done (3.2.0 release candidate)\n"; @@ -3842,6 +3843,15 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.01.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("UPDATE aqbooksellers SET gstrate=NULL WHERE gstrate=0.0"); + print "Upgrade to $DBversion done (Add index on guarantorid)\n"; + SetVersion ($DBversion); +} + +=item DropAllForeignKeys($table) + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl index 819c37b..fc7aef7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl @@ -106,44 +106,39 @@ if (f.company.value == "") {
    -
  1. +
  2. -
    3. + -
  3. +
  4. -
    5. + -
  5. +
  6. -
    7. +
  1. - " /> %
    2. -
  2. "/> %
    3. + " />% +
  3. "/>% (leave blank for default tax of %)
- - - - -
"> @@ -197,8 +192,8 @@ if (f.company.value == "") { YesNo

Discount: %

-

Tax rate: - %

+

Tax rate: + % (default)

Notes:

-- 1.7.1