From e81b8d5baebf037f1c1c428447742688fde66b12 Mon Sep 17 00:00:00 2001 From: tipaul Date: Wed, 18 Jan 2006 15:38:17 +0000 Subject: [PATCH] prog templates : completed, fixed & xhtml valid --- acqui/acquire.pl | 61 +---- .../prog/en/acqui/acqui-home.tmpl | 104 ++++---- .../intranet-tmpl/prog/en/acqui/acquire.tmpl | 137 +++------- .../intranet-tmpl/prog/en/acqui/basket.tmpl | 36 ++- .../prog/en/acqui/histsearch.tmpl | 16 +- .../prog/en/acqui/lateorders.tmpl | 109 ++++++++ .../prog/en/acqui/newbasket2.tmpl | 25 +- .../prog/en/acqui/newbiblio.tmpl | 240 ++++++++++++++++++ .../intranet-tmpl/prog/en/acqui/order.tmpl | 65 +++++ .../intranet-tmpl/prog/en/acqui/recieve.tmpl | 73 ++++++ .../prog/en/acqui/recieveorder.tmpl | 27 ++ .../prog/en/acqui/suggestion-select.tmpl | 63 +++++ .../intranet-tmpl/prog/en/acqui/supplier.tmpl | 138 ++++++++++ 13 files changed, 855 insertions(+), 239 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl diff --git a/acqui/acquire.pl b/acqui/acquire.pl index 44facdf70f..a5986c2a1d 100755 --- a/acqui/acquire.pl +++ b/acqui/acquire.pl @@ -26,13 +26,9 @@ use strict; use CGI; use C4::Context; use C4::Acquisition; -use C4::Biblio; -use C4::Output; -use C4::Search; +use C4::Koha; use C4::Auth; use C4::Interface::CGI::Output; -use C4::Database; -use HTML::Template; use C4::Date; my $input=new CGI; @@ -65,39 +61,15 @@ my ($flags, $homebranch)=$sthtemp->fetchrow; if ($count == 1){ my $sth; -# my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description"); -# $sth->execute; -# my @itemtype; -# my %itemtypes; -# push @itemtype, ""; -# $itemtypes{''} = "Please choose"; -# while (my ($value,$lib) = $sth->fetchrow_array) { -# push @itemtype, $value; -# $itemtypes{$value}=$lib; -# } -# -# my $CGIitemtype=CGI::scrolling_list( -name => 'format', -# -values => \@itemtype, -# -default => $results[0]->{'itemtype'}, -# -labels => \%itemtypes, -# -size => 1, -# -multiple => 0 ); -# $sth->finish; - my @branches; - my @select_branch; - my %select_branches; - my ($count2,@branches)=branches(); - for (my $i=0;$i<$count2;$i++){ - push @select_branch, $branches[$i]->{'branchcode'};# - $select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'}; + my $branches = getbranches; + my @branchloop; + foreach my $thisbranch (sort keys %$branches) { + my %row =(value => $thisbranch, + branchname => $branches->{$thisbranch}->{'branchname'}, + ); + push @branchloop, \%row; } - my $CGIbranch=CGI::scrolling_list( -name => 'branch', - -values => \@select_branch, - -default => $results[0]->{'branchcode'}, - -labels => \%select_branches, - -size => 1, - -multiple => 0 ); my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0; # See whether barcodes should be automatically allocated. @@ -111,21 +83,6 @@ if ($count == 1){ $sth->finish; } -# my @bookfund; -# my @select_bookfund; -# my %select_bookfunds; -# ($count2,@bookfund)=bookfunds(); -# for (my $i=0;$i<$count2;$i++){ -# push @select_bookfund, $bookfund[$i]->{'bookfundid'}; -# $select_bookfunds{$bookfund[$i]->{'bookfundid'}} = $bookfund[$i]->{'bookfundname'} -# } -# my $CGIbookfund=CGI::scrolling_list( -name => 'bookfund', -# -values => \@select_bookfund, -# -default => $results[0]->{'bookfundid'}, -# -labels => \%select_bookfunds, -# -size => 1, -# -multiple => 0 ); - if ($results[0]->{'quantityreceived'} == 0){ $results[0]->{'quantityreceived'}=''; } @@ -133,6 +90,7 @@ if ($count == 1){ $results[0]->{'unitprice'}=''; } $template->param( + branchloop => \@branchloop, count => 1, biblionumber => $results[0]->{'biblionumber'}, ordernumber => $results[0]->{'ordernumber'}, @@ -147,7 +105,6 @@ if ($count == 1){ author => $results[0]->{'author'}, copyrightdate => format_date($results[0]->{'copyrightdate'}), itemtype => $results[0]->{'itemtype'}, - CGIbranch => $CGIbranch, isbn => $results[0]->{'isbn'}, seriestitle => $results[0]->{'seriestitle'}, barcode => $barcode, diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl index ac4b45725f..468b034a8d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl @@ -1,80 +1,70 @@ Koha -- Acquisitions - - + +

Acquisitions

You must define a budget in parameters - -
- - - - - -
Start, Recieve, or Modify Any Order
-
-

+
+

Start, Recieve, or Modify Any Order

+

+ +
+
+ +
- -
- - - - - -
Receive or Modify a Periodical Order
- - - -
-
- - - - - - + +

Exchange Rates

+
Exchange Rates
- - + + - -
- - - - " name="" value="" /> - CurrencyRate
-
- - -
+ + + + + + + + " name="" value="" /> + + + + + + + +
+ +
+ -

Pending Suggestions

+

Pending Suggestions

suggestions waiting Manage Suggestions - No suggestions waiting +

No suggestions waiting

- You must define a budget in parameters +

You must define a budget in parameters

+

Budgets and Bookfunds

- @@ -92,23 +82,21 @@ - - + -
Budgets and Bookfunds
Budgets Total
TotalTotal
-

Use your reload button [ctrl + r] to get the most recent figures. - Committed figures are approximate only, as exchange rates will affect the amount actually paid.

- -

Help

To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).

-

To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.

-

To start a new shopping basket with a new supplier return to this page and just start a new supplier search.

-

To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".

+

Use your reload button [ctrl + r] to get the most recent figures. +Committed figures are approximate only, as exchange rates will affect the amount actually paid.

+

Help

+

To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).

+

To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.

+

To start a new shopping basket with a new supplier return to this page and just start a new supplier search.

+

To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".

diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl index 147cf6aaa8..b54d079d46 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl @@ -1,5 +1,7 @@ Koha -- Receipt Summary for : Invoice, + +

Receipt Summary for : Invoice,

@@ -26,106 +28,45 @@

- Receive Order

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Catalogue Details
Title *" /> -
Author" /> -
Copyright Date" /> -
Format
ISBN" />
Series" />
Branch
Item Barcode *" />
Volume Info (for serials) *
- " /> - " /> - " /> - " /> - " /> - " /> - - - - &id=">Edit - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Accounting Details
Bookfund * -
Quantity Ordered" /> -
Quantity Received *" /> -
Replacement Cost" /> -
Budgeted Cost " />
Actual Cost *" />
Invoice Number - - " /> -
Notes" />
+

Catalogue Details

+

" />

+

" />

+

" />

+

+

" />

+

" />

+

+ +

+

" />

+

+ " /> + " /> + " /> + " /> + " /> + " /> + + + + &id=">Edit + +

Accounting Details

+

+

" />

+

" />

+

" />

+

" />

+

" />

+

" />

+

" />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl index 9d50dcfc31..50f8f8246d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl @@ -1,25 +1,35 @@ Koha -- New Shopping Basket () for + +

New Shopping Basket for ">


+

Basket Details

- -
Basket Details
Basket Number:
Managed By:
Open On:
For:Supplier Id
Invoice Number:
Closed On:
" />" />
+ + +
+ + " /> + " /> + +
+ +

Order Details

- @@ -65,7 +75,13 @@ @@ -74,7 +90,9 @@ + " /> + " /> +
Order Details
Order &order=biblioitems.publishercode">Publisher -
" />" />" />
+
+ " /> + " /> + + " /> + +
-" />" /> SubTotal @@ -97,7 +115,6 @@
-
Order Details
Basket empty
@@ -106,9 +123,10 @@

Add To Order

- "> - "> -