Commit Graph

47735 Commits

Author SHA1 Message Date
sushi 4e8e426629 slight change in receiveorder() call, added bookfund arg. bookfund now updated during receive for HLT.
Mason's ACQ fixes from HLT-DEV , work in progress.

Adding code to check existing orders in basket to avoid duplication of rows.

Addorder() now allows the user to select whether: the bibitem for the order will be an existing bibitem, or a newly created  bibitem.

adding back in the part the saves the edit page's changes.

Fix for bug 3589, can now order and receive donations in one go.

Fixing a bug, acquisitions wasnt making a new biblioitem when needed.
2006-06-07 19:25:59 +00:00
sushi 4d97bc7dbc perltidy before next commit. 2006-06-07 19:14:06 +00:00
btoumi d7526b7044 members.js :translate javascript message
moremember.tmpl:change wrong url
Members.pm: change wrong field name in sql request(sub newmember)
memberentryA.tmpl : change wrong field name
memberentry.pl:change test condition (checkuniquemember)
2006-06-07 14:55:36 +00:00
alaurin c5f7394fcb change the name of function : "get_return_date_of" to "get_current_date_of" 2006-06-07 13:47:55 +00:00
btoumi 5a1bec6afc fix syntax error:change field name 2006-06-07 11:38:23 +00:00
plg 59ffd549c7 Improve SQL formatting (following coding guidelines) 2006-06-07 11:03:17 +00:00
btoumi 3b7806a364 bug fix: change bad name of function
translate template in english ( i hope it's right :=))
delete call to css
change size of popup window
2006-06-07 10:15:58 +00:00
btoumi 0854ecfd83 add borrowers_details.pl and borrowers_details.tmpl:
to show details from borrowors double
2006-06-07 09:15:00 +00:00
btoumi 3eb754b995 bug fix: syntax error in sub getbranches 2006-06-07 07:50:04 +00:00
bob_lyon 0a7c849997 merging katipo changes...
Added the ability to display all branches opening/closing times on the opac
homepage
2006-06-07 04:56:55 +00:00
bob_lyon 975030608c merging katipo changes...
allow the getting of only issuing branches only
2006-06-07 04:43:48 +00:00
bob_lyon 3e64f4abd4 merging katipo changes...
adding in new set_transit sub
2006-06-07 04:39:37 +00:00
rangi 70e2e7560b Merging in some more changes to allow to resort the reserve list 2006-06-07 04:34:21 +00:00
sushi 16954a80eb Merging Katipo changes.
Fix for bug 3589, can now order and receive donations in one go.
Also a fix to allow user to create a new item, attached to an exisiting bibitem.
2006-06-07 04:29:10 +00:00
bob_lyon 9161eba4bd merging katipo changes...
Adding flag for being in credit vs being in debt and added checks to see if
one can renew before trying to renew
2006-06-07 04:13:22 +00:00
sushi 64e9fde761 perltidy before commit. 2006-06-07 04:01:00 +00:00
rangi dbdd62422e Merging in Katipo changes plus perltidy code format 2006-06-07 03:58:37 +00:00
sushi 48b5cebb0b *** empty log message *** 2006-06-07 03:55:54 +00:00
sushi 7bd1980eca Merging Katipo changes.
call to receiveorder() now takes $bookfund as arg.
Mason's ACQ fixes from HLT-DEV , work in progress
Added regex to convert & to %26 before redirect to receive.pl.
Now has error alert for blank barcode field, and little tidyup.
finishreceive.pl now updates aqorder table's order record with lastest added biblioitem for that order, so ordersearch() now returns the acq-orders most recently created bibitem info, instead of the initally created biblitem info.
Now redirects back to acquire.pl if barcode exists or newitems() fails.
Now allows user to create a new biblioitem/item using a checkbox.
Adding option so magazines make new biblioitems as well as items - in testing stage
adding in the update for the replacement cost on the item table when editing a received order via
adding a bit to allow hlt to edit received order bit and not fail on duplicate barcode
added elsif to handle dup barcode error.
Fix to handle dup barcodes for newitem(), displays error the goes back to acquire.pl.
Now checks to see if newly created item is currently reserved.
Fix for the receive periodicals bit
Catching any errors when making items
More bugfixing this time a bug not saving volume info
Fix for bug 3529, allow freight to be distributed among the items
Now saves modified fields.
2006-06-07 03:47:50 +00:00
rangi 18e59b24ea Giving the correct info to update stats 2006-06-07 03:36:51 +00:00
sushi ad249c82d8 Merging Katipo changes. 2006-06-07 03:30:44 +00:00
bob_lyon 92d88b35a7 merging katipo changes...
frbranchcd was being passed tobranch info from transferbook
2006-06-07 03:29:19 +00:00
rangi 502a6e9674 Adding a sprintf so fines show up to 2 decimal places 2006-06-07 03:27:51 +00:00
sushi 14fa887bbe perltidy before commit. 2006-06-07 03:25:01 +00:00
rangi b8c46509f3 Shows reserves for a given branch 2006-06-07 03:18:55 +00:00
bob_lyon b9704af003 merging katipo changes...
Adding the ability to have charge discounts on items for certain patrons
2006-06-07 03:11:35 +00:00
rangi a9fa80e4e1 Allowing the rental discount to be modified here too.
Rental discount effects the amount a borrower is charge to issue an item

eg, if a borrower category has rental discount of 20 (its a percentage) on itemtypes DVD, and a dvd costs $2 to borrow normally, then it will cos them $1.60
If not set it defaults to zero
2006-06-07 03:00:48 +00:00
sushi 8b927e8593 perltidy before commit. 2006-06-07 02:59:10 +00:00
sushi 2ee33de5ef Merging Katipo changes.
Got acqui homepage actually displaying suggestions - only displayed count before - need to get the suggestedby diplaying borrowers name rather than id number.
Showing budget breakdowns.
Slight alteration - let $status be an input parameter.
2006-06-07 02:45:26 +00:00
rangi b98cbde880 Adding a sprintf to format the fields involving currency to 2 decimal places 2006-06-07 02:42:51 +00:00
sushi 9d1c8fa9d2 perltidy before next commit. 2006-06-07 02:36:24 +00:00
rangi e07e589879 Fix to allow any limit to be passed in 2006-06-07 02:33:09 +00:00
bob_lyon 321474ab31 merging katipo changes...
fixing syntax mistake and adding specific change allowing workers at a
library not to have issuing impossible alerts
2006-06-07 02:31:18 +00:00
sushi 1574910cb7 Merging Katipo changes.
adding html highlight toggling.
2006-06-07 02:22:12 +00:00
rangi 90ffdc7dfd Merging Katipo changes
Script to breakdown the amount committed (ordered but not received) of a particular budget
2006-06-07 02:17:54 +00:00
bob_lyon ab62ac7ab6 fixing choosing wrong var for max amount issues number 2006-06-07 02:07:10 +00:00
bob_lyon ed8eee0aa6 merging katipo changes...
Adding new pref to the circ tab
2006-06-07 02:05:06 +00:00
sushi fb5c9b318a Merging Katipo changes.
Added a bit to display the correct item type for a person who has 2 or more
reserve this type only reserves on the same day, ie - reserved a dvd and a book with same biblio.
2006-06-07 02:04:48 +00:00
bob_lyon 404da07848 merging katipo changes...
adding new preference IssuingInProcess
2006-06-07 02:02:47 +00:00
rangi ef2ff09c8b Merging Katipo changes
Workaround to deal with bug with IE
2006-06-07 02:02:00 +00:00
bob_lyon 79befda127 Merging Katipo changes...
Adding the allowance for making issuing impossible after a patron has
accumulated a certain level of debt
2006-06-07 01:56:57 +00:00
rangi 62053c1686 Merging from Katipo work
Script to show the breakdown of the amount spent in a budget
2006-06-07 01:53:15 +00:00
rangi 1f10e56f02 Scripts written by Bob and Mason to do daily til/cash reconciliation for librarybranches 2006-06-07 01:40:03 +00:00
bob_lyon d10c940c46 Merging Katipo changes...
Fixing bug with defined() - when used on array or hash will check if memory
is allocated rather than if is empty/not empty
2006-06-07 01:38:14 +00:00
rangi c6f622b3d6 Merging Katipo work
Fixing formatting of code, and adding new routines for use generating overdue notices
2006-06-07 01:32:06 +00:00
rangi 5ef593682d Merging katipo changes
Last of the changes for Acquisitions.pm, bookfundbreakdowns
2006-06-07 00:39:22 +00:00
sushi 247680016c Merging Katipo changes.
Updating new fixpriority() sub. now used by reorder_reserve.pl.
2006-06-07 00:36:22 +00:00
rangi 364e4f9061 Katipo merging work
Fixes for the ordersearch
2006-06-07 00:07:59 +00:00
sushi 1a7c82488a Merging Katipo changes.
Adding CalcHLTReserveFee(), and change to CreateReserve().
2006-06-06 23:49:26 +00:00
bob_lyon e12623fd0b Merging Katipo changes...
adding new system pref 'reading history' to the Members tab
2006-06-06 23:45:45 +00:00