Order	Publisher	Isbn	Title	Author	$ rrp	$est	Qty	Total
- -	SubTotal
GST
TOTAL
- - "> - "> - Add order : enter keyword or title: - -

Accounting details

- Quantity + Quantity " onchange='update(this.form)' >

- Bookfund + Bookfund

- Suppliers List Price + Suppliers List Price " onchange='update(this.form)'>

- Replacement Cost + Replacement Cost " onchange='update(this.form)'>

- Budgeted Cost + Budgeted Cost " onchange='update(this.form)'>

- Budgeted GST + Budgeted GST

- BUDGETED TOTAL + BUDGETED TOTAL

- Actual Cost + Actual Cost

- Invoice Number * + Invoice Number *

- Notes + Notes ">

The 2 following fields are available for your own usage. They can be useful for stat purposes

- Sort field 1 + Sort field 1 ">

- Sort field 2 + Sort field 2 ">

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl index ae54538070..7547462d91 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl @@ -1,53 +1,64 @@

Supplier Search Results

You searched on supplier , results found

- - - - - - - - - > - - - - + + + + + + + +

Order

Receive

Company

- - - - - - - -

Basket	Items	Staff	Date

- -

/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > - - Inactive - -

/images/mail_get.png" title="receive" ALT="Add" BORDER=0 > -

- - +

Supplier Search Results

You searched on supplier , results found

+ + + + + + + + + + + + + + + + + - -

Order

Receive

Supplier

+ +

/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > + + Inactive + +

/images/mail_get.png" title="receive" ALT="Add" BORDER=0 > +

+ - - - - + + + + + - -

">				Basket	Items	Created by	Date

- -
-Add supplier + +

+ + closed on + + " class="button acquisition">modify + +

+ + + +

+ Add supplier +

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl new file mode 100644 index 0000000000..4fa8155691 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl @@ -0,0 +1,61 @@ + +

+ + +

Suggestions

+ + + + + + + + + + + + + + + + + + + + + + + +

Suggestion	Suggested by	Accepted by
+ Filter on : + title: "> + author: "> + publisher: "> +	+ +	+ +	+ +
class="hilighted"> + - + + copy. year: + volume: + ISBN : + published by: + in + at + () +	class="hilighted"> + , +	class="hilighted"> + , +	class="hilighted"> + &basket=&suggestionid=" class="button acquisition">Order +

Suggestion

Suggested by

Accepted by

Filter on : + title: "> + author: "> + publisher: "> +

+ +

class="hilighted"> +

+ copy. year: + volume: + ISBN : +
published by: + in + at +

()

class="hilighted"> + , +

class="hilighted"> + &basket=&suggestionid=" class="button acquisition">Order +

+ \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl index 61db69172a..8a13f96a19 100644 --- a/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl +++ b/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl @@ -9,7 +9,7 @@

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl index 9e5bfcd3a3..e8c766c327 100644 --- a/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl +++ b/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl @@ -8,8 +8,12 @@

Title

Author

Publisher

Volume

Publication year

Publication place

ISBN/ISSN

Note

diff --git a/updater/updatedatabase b/updater/updatedatabase index 26d9aed7ba..d712e437d9 100755 --- a/updater/updatedatabase +++ b/updater/updatedatabase @@ -286,7 +286,7 @@ my %requiretables = ( KEY sndx_word (sndx_word) )", suggestions => "( - suggestionnumber int(8) NOT NULL auto_increment, + suggestionid int(8) NOT NULL auto_increment, suggestedby int(11) NOT NULL default '0', managedby int(11) default NULL, status varchar(10) NOT NULL default '', @@ -296,11 +296,23 @@ my %requiretables = ( copyrightdate smallint(6) default NULL, publishercode varchar(255) default NULL, date timestamp(8) NOT NULL, + volumedesc char(255) default NULL, + publicationyear smallint(6) default NULL, + place char(255) default NULL, + isbn char(10) default NULL, mailoverseeing smallint(1) default 0, PRIMARY KEY (suggestionnumber), KEY suggestedby (suggestedby), KEY managedby (managedby) )", + aqbasket => "(basketno int(11) NOT NULL auto_increment, + creationdate date, + closedate date, + booksellerid varchar(10), + authorisedby varchar(10), + booksellerinvoicenumber text, + PRIMARY KEY (basketno) + )", ); my %requirefields = ( @@ -369,6 +381,14 @@ my %dropable_table = ( serialissues => 'serialissues', ); +my %uselessfields = ( + aqorders => "requisitionedby,authorisedby,booksellerid, + deliverydays,followupdays, + numberfollowupsallowed,numberfollowupssent, + dateprinted,sourced,quantityreceiveddamaged, + subscriptionfrom,subscriptionto + " + ); # the other hash contains other actions that can't be done elsewhere. they are done # either BEFORE of AFTER everything else, depending on "when" entry (default => AFTER) @@ -1200,6 +1220,26 @@ if ($marc_word{subfieldid}) { } # Populate tables with required data +# fill aqbasket if it's empty and aqorder is not +# => it means it has just been created & must be filled +$sth = $dbh->prepare("select count(*) from aqbasket"); +$sth->execute; +if ($sth->fetchrow == 0) { + $sth = $dbh->prepare("select count(*) from aqorders"); + $sth->execute; + if ($sth->fetchrow >0) { + print "Populating new table aqbasket\n"; + print "IMPORTANT NOTE: error message \"Duplicate entry 'X' for key 1\" may appear. it should not be a real trouble\n"; + $sth=$dbh->prepare("select distinct basketno,booksellerid,authorisedby,entrydate,booksellerinvoicenumber from aqorders"); + $sth->execute; + my ($basketno,$booksellerid,$authorisedby,$entrydate,$booksellerinvoicenumber); + my $sth2 = $dbh->prepare("insert into aqbasket (basketno,creationdate,booksellerid,authorisedby,booksellerinvoicenumber) values (?,?,?,?,?)"); + while (($basketno,$booksellerid,$authorisedby,$entrydate,$booksellerinvoicenumber) = $sth->fetchrow) { + print "$basketno,$entrydate,$booksellerid,$authorisedby,$booksellerinvoicenumber\n"; + $sth2->execute($basketno,$entrydate,$booksellerid,$authorisedby,$booksellerinvoicenumber); + } + } +} foreach my $table ( keys %tabledata ) { print "Checking for data required in table $table...\n" unless $silent; my $tablerows = $tabledata{$table}; @@ -1244,11 +1284,34 @@ foreach my $table ( keys %tabledata ) { } } +# at last, remove useless fields +foreach $table ( keys %uselessfields ) { + my @fields = split /,/,$uselessfields{$table}; + foreach my $fieldtodrop (@fields) { + $fieldtodrop =~ s/\t//g; + $fieldtodrop =~ s/\n//g; + print "deleting $fieldtodrop field in $table...\n" unless $silent; + my $sth = $dbh->prepare("alter table $table drop $fieldtodrop"); + $sth->execute; + if ( $sth->err ) { + print "Error : $sth->errstr \n"; + $sth->finish; + } # if error + } +} # foreach + + $sth->finish; exit; # $Log$ +# Revision 1.91 2004/07/15 09:52:28 tipaul +# Acquisition & Suggestion : +# * acquisition rewritte : create a aqbasket table to deal with "bookseller order header". +# * add "close basket" feature : a closed basket can't be modified +# * suggestion feature : manage suggestions in acquisition (after suggestion filled in OPAC) +# # Revision 1.90 2004/07/06 08:24:18 tipaul # adding 2 free fields that can be used for sorting purposes # -- 2.39.5

Suggestions to check

Shopping Basket for >

New shopping Basket for >

Basket info

Order

Add order line

- Order Details

+ + Modify order details (line #) + + New order + + (defined from suggestion #) +

catalogue details

Accounting details

Supplier Search Results

You searched on supplier , results found

Supplier Search Results

You searched on supplier , results found

Suggestions