From b5312a17cb87851c01601825f03dc2dba75b9f84 Mon Sep 17 00:00:00 2001 From: Nicole Engard Date: Fri, 18 Dec 2009 20:14:01 -0500 Subject: [PATCH] Bugs: 3965, 3979, 3981 - GST changes in acquisitions This patch fixes three bugs: Bug 3965: gist sys pref not taken into account changed it so that GST does not show on basket if gist pref set to 0 changed it so that GST fields don't appear on vendor record if gist pref=0 Bug 3979: gst options not lining up fixed layout on vendor add/edit form so GST radio buttons line up right Bug 3981: GST confusing in en-US there is no GST in the US and so GST changed to 'Tax' in templates Also, a small spacing fix was made to the path on the basket grouping template. --- acqui/basket.pl | 1 + acqui/supplier.pl | 3 ++ .../prog/en/modules/acqui/basket.tmpl | 18 +++++-- .../prog/en/modules/acqui/basketgroup.tmpl | 2 +- .../prog/en/modules/acqui/supplier.tmpl | 50 +++++++++---------- 5 files changed, 44 insertions(+), 30 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 41402fd613..492417abb7 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -306,4 +306,5 @@ if ( $op eq 'delete_confirm' ) { grouped => $basket->{basketgroupid}, ); } + output_html_with_http_headers $query, $cookie, $template->output; diff --git a/acqui/supplier.pl b/acqui/supplier.pl index 3934da31a8..b8afe0d48d 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -154,4 +154,7 @@ elsif ($op eq 'delete') { enter => 1, ); } + + + output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index c3056583a3..a174e5ec39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -191,8 +191,9 @@ + - Total GST Exc. + Total Tax Exc.   @@ -206,19 +207,28 @@ - GST () + Tax ()     - Total GST Inc. () + Total Tax Inc. ()   + + + Total () + +   + + + + @@ -256,7 +266,7 @@ Basket empty - ** Vendor's listings already include GST. + ** Vendor's listings already include tax.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl index 1a1e7ebd11..bb8a1dda6d 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl @@ -120,7 +120,7 @@ fieldset.various li { - +
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 20feb11e86..a97a818206 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl @@ -98,39 +98,39 @@ if (f.company.value == "") { - -
    -
  1. +
+
    +
  1. - - + + - - + +
  2. -
  3. +
  4. - - + + - - + +
  5. -
  6. +
  7. - - + + - - + +
  8. -
-
    +
+
  1. " /> %
  2. -
  3. "/>%
  4. +
  5. "/>%
@@ -188,16 +188,16 @@ if (f.company.value == "") {

List Prices are:

Invoice Prices are:

-

GST Registered: +

Tax Number Registered: YesNo

-

List Item Price Includes GST: +

List Item Price Includes Tax: YesNo

-

Invoice Item Price Includes GST: +

Invoice Item Price Includes Tax: YesNo

Discount: %

-

GST rate: - %

+ %

Notes:

-- 2.39.5