Commit graph

117 commits

Author SHA1 Message Date
toins
6c9724209f this file has been changed by parcels.pl 2006-07-13 14:49:51 +00:00
toins
98f9060c4d this file has been changed by parcel.pl 2006-07-13 14:49:33 +00:00
toins
6ab4ebf38e this file replaces acquire.pl 2006-07-13 14:25:27 +00:00
toins
1b4addad16 this file replaces recieve.pl 2006-07-13 14:25:01 +00:00
toins
dee72643a8 this file replaces recieveorder.pl 2006-07-13 14:24:18 +00:00
toins
d8babfb6ea bad merge corrected. 2006-07-13 09:30:05 +00:00
sushi
c2822e30ed big change from Katipo.
------------------------------
- Results for 'mutli orders with matching titles attached to same bibitem'  now split into new .tmpl file, "acquire-multi-order.tmpl".
- this script/tmpl does 3 things!?!, pulled search results out of acquire.pl, now points to searchresults.tmpl.
- little fix to display correct supplier info in acquire.pl's 'detail' view.
- Little fix on previous commit, now doesnt break single order acquire view.
- Fix for RT:698 https://staff.katipo.co.nz/rt/Ticket/Display.html?id=698.
- now display correct supplier title when 0 results returned.
- Now pickes up basketno, to display as url to tmpl.
- Adding in fix for bibitems with more than one matching order.
- Rolled back to prod version, added 'create new bib-group' fix.
- Mason's ACQ fixes from HLT-DEV , work in progress
- Now does a lookup in aqorders, for all existing orders matching  biblioitems, then presents all matching orders in a table. this feature can be overridden by calling acquire.pl with multiorderseach=n in url, acquire.pl will instead go to specific order.
- Now catches, and returns to acquire.pl if newitems() fails.
- Now takes a barcodeerror value as arg.
- 'create new biblioitems' checkbox now only apears for bibitems with >= 1 items attached.
- adding stuff to let hlt have an accession date link from moredetail.tmpl
  that actually does something other than break biblioitems - not working yet
- Added output for volume as well as volumeddesc
- Added volume description to output loop
- Making change for bug #3676 displaying date unformatted
- More bugfixing this time a bug not saving volume info
- Fix for bug 3529, allow freight to be distributed among the items
- added a sprintf to get the number displaying in normal notation
- Altered the auto_barcode to actually get something other than 1
  but now got a problem with the result displaying in scientific notation
2006-07-12 14:56:52 +00:00
toins
989ca91339 Sub renamed & GPL Licence added. 2006-07-07 07:51:41 +00:00
toins
21a410129c Sub renamed according to the coding guidelines 2006-07-07 07:51:02 +00:00
toins
b4ce3dbfb7 Head & rel_2_2 merged 2006-07-04 13:35:29 +00:00
sushi
0dd1e735fe OOPS, adding back Joshua's changes.
Adds script support for IntranetNav ... see mail to koha-devel for
details.
Adds support for intranetstylesheet system pref in Koha scripts.
Adds support for intranetcolorstylesheet.
2006-06-07 19:49:11 +00:00
sushi
daa46804dc perltidy before commit. 2006-06-07 19:33:33 +00:00
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
plg
59ffd549c7 Improve SQL formatting (following coding guidelines) 2006-06-07 11:03:17 +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
sushi
64e9fde761 perltidy before commit. 2006-06-07 04:01:00 +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
sushi
ad249c82d8 Merging Katipo changes. 2006-06-07 03:30:44 +00:00
sushi
14fa887bbe perltidy before commit. 2006-06-07 03:25:01 +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
sushi
9d1c8fa9d2 perltidy before next commit. 2006-06-07 02:36:24 +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
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
tipaul
e81b8d5bae prog templates : completed, fixed & xhtml valid 2006-01-18 15:38:17 +00:00
tipaul
86a9c7fb9f bugfixes xhtml & prog templates 2006-01-18 14:52:07 +00:00
tipaul
d5938493d7 synch'ing head and rel_2_2 (from 2.2.5, including npl templates)
Seems not to break too many things, but i'm probably wrong here.
at least, new features/bugfixes from 2.2.5 are here (tested on some features on my head local copy)

- removing useless directories (koha-html and koha-plucene)
2006-01-06 16:39:37 +00:00
tipaul
b38997925f big commit, still breaking things...
* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued
2005-10-26 09:11:02 +00:00
hdl
3a48682514 Adding lateorders page.
It provides the user with the list of items that have been ordered for a delay and are NOT yet received.
The user may filter by supplier or branch or delay.
This page is still under developpement.
Goal is to make it ready to print to reorder the books.

2 new functions have been written in Acquisition module :
getsupplierlistwithlateorders
getlateorders

branches has been modified to manage branch independancy.
Request for comment.
STILL UNDER developpment
2005-08-09 14:13:27 +00:00
hdl
3d78e15b31 BUG Fixing a user with acquisition rights and no superlibrarian rights couldn't create a new basket with IndependantBranches management on. 2005-08-08 13:58:07 +00:00
hdl
a5b0a37a8a Managing branch independancy when creating a new biblio.
A librarian of one branch cannot create a biblio on a branch different form his own, unless superlibrarian.
2005-08-08 13:55:52 +00:00
tipaul
ed9616f474 synch'ing 2.2 and head 2005-08-04 09:52:32 +00:00
hdl
1b11e86c9e Some Bug Fixes 2005-07-28 15:40:52 +00:00
hdl
5d22c28ea2 Implementing Independancy Branches management :
- Trying to get a basket not owned by so of his own branch leads to mainpage.
- Lists onlys ths baskets owned by someon of user's brach.

Auth.pm now sends a cookie with userenv informations.
2005-07-28 07:52:02 +00:00
hdl
2950574dd6 Adding branch specific display to budgets and selection.
Be warned that to be able to select a budget which is not from patron's Branch, you should have a '' Branch information.
2005-07-14 09:13:24 +00:00
rangi
70f8682559 Formatting the creation date correctly 2005-06-29 01:16:37 +00:00
rangi
8371ad66f1 Removing a line that was adding a \ in front of every ' in a suppliers name 2005-06-29 01:03:06 +00:00
rangi
d1768a67fb Some of the values from the bookseller table werent being passed through to the templates 2005-06-29 01:00:49 +00:00
hdl
12389845c9 Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort
2005-06-22 13:14:12 +00:00
hdl
02c6eacdb7 Adding scrolling list for sort1 and sort2 2005-06-22 09:36:24 +00:00
tipaul
5e44e797eb synch'ing 2.2 and head 2005-06-20 13:15:46 +00:00
hdl
5c1241034b Displaying search results count 2005-06-20 10:14:12 +00:00
tipaul
7aad473042 synch'ing 2.2 and head 2005-05-04 08:45:03 +00:00
tipaul
93ff09d081 merging 2.2 branch with head. Sorry for not making it before, many many commits done here 2005-03-01 13:40:35 +00:00
tipaul
54987d977b CRITICAL bug in acquisition (another one...) : when MARC=ON, and an order line is created from an existing biblio (to buy another item), the MARC biblio is lost and replaced by the non marc one (that has a lot less informations...). To solve the problem, the biblio can no more be modified after the order has been placed. Less feature, but more reliable ! (not simple solution to solve this problem. Would imply to rewrite the MARC biblio from the non marc datas, and no API is provided for this yet) 2004-12-02 16:36:27 +00:00
tipaul
23881a317e * critical fix for acquisition (see RC3 release notes) 2004-11-24 15:59:15 +00:00
tipaul
2eda32b247 adding search orders history feature 2004-10-19 12:24:56 +00:00