Commit graph

208 commits

Author SHA1 Message Date
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
tipaul
89dea6f3ec Adding possibility to order the basket by :
* publishercode
OR
* budget then publishercode
2004-10-05 09:22:16 +00:00
tipaul
b9a7f33601 * removing the hard coded $
* adding bookfund to the order list
2004-10-04 20:03:23 +00:00
tipaul
cbe2b2139c 1- don't loose bookseller id when closing a basket
2- add possibility to view a closed basket (but not modify it)
2004-09-17 12:32:29 +00:00
tipaul
92b914b394 fix to calculate item cost (the / was buggy : everywhere else there is the price is the unit price) 2004-09-14 12:32:13 +00:00
tipaul
ca2717c968 bugfix in order modification 2004-09-14 12:09:51 +00:00
tipaul
9674400e46 some fixes for acquisition 2004-09-13 15:17:48 +00:00
tipaul
cfa9223cd1 * updates to make acquisition compatible with suggestions & serials
* changes to use supplierid instead of id, that's easier to read.
2004-08-12 14:35:22 +00:00
doxulting
bc27c4c211 Very beginning of late serial consulting in acquisitions 2004-07-30 14:08:53 +00:00
tipaul
f29ce59691 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)
2004-07-15 09:41:03 +00:00
tipaul
6376aa4326 catalogue.pm deals only with acquisitions.
so, renaming it...
catalogue management is done in Biblio.pm package
2004-07-13 12:52:13 +00:00
tipaul
73de15b3ff Adding 2 new fields, called "sort1" and "sort2"
They can be used for sorting & statistics reasons by the library.
2004-07-02 15:55:06 +00:00
tipaul
b0cf7df697 synch'ing with 2.0 branch 2004-03-16 13:39:50 +00:00
tipaul
3635a596cf synch'ing 2.0.0 branch and head 2004-02-11 08:35:31 +00:00
tipaul
f8bde9b034 sync'ing with rel_2_0 (mostly prepare/execute pb, bug #662) 2003-12-22 19:16:58 +00:00
tipaul
323642f5a1 all those fixes are related to translation improvement.
A few minor bugfixes too in perl code.

NOTE TO ENGLISH "TEMPLATORS" : you should look at this commits, as some ideas are really nice.  Thanks to Carole, Wesford School, new Koha user in France :-)
2003-09-18 10:19:28 +00:00
tipaul
f0645e2953 include quantityrecieved in the code passed to template.
Template modified for fr only. english users, feel free to change the template too :)
2003-09-17 13:33:37 +00:00
tipaul
164581d877 fixing small bug : escaping twice the ' in title & author. (bugreport from Dombes Abbey) 2003-09-04 17:29:50 +00:00
cauchoip
e9ae9ce9f4 invoice number problems fixed, "fast receive" now works 2003-07-08 16:20:15 +00:00
tipaul
a8574a5b83 fixing bug #526 : gst rate is now calculated through systempref gist entry.
Before this fix :
* was harcoded to 12,5%
* some bugs in template parameters prevented the javascript to work.
* some bugs prevented some calculations to be done properly.
2003-07-07 14:11:16 +00:00
tipaul
09b6cc337a fix for #342 2003-06-24 09:02:15 +00:00
rangi
527902426b Fixing bug 450 2003-05-30 21:39:50 +00:00
tipaul
254bb419cf fix for #407 2003-05-14 14:33:07 +00:00
tipaul
c0b30331e5 removing warn 2003-05-05 15:13:51 +00:00
tipaul
368d9107a2 moving loggedinuser => loggedinusername in includes and Auth.pm :
The $loggedinuser in Koha is the CODE of the logged user (result of get_user_and_template subroutine).
BTW, in get_user_and_template subroutine, the TMPL_VAR loggedinuser is replaced by the NAME of the user.
This is troubleshooting.
so, I replace the name by the "loggedinusername" template variable.
If you want to add the username somewhere, just add <TMPL_VAR name="loggedinusername"> in the template.

Fixes bug #401
2003-05-05 15:00:53 +00:00
tipaul
670e361bad fix for #409 2003-05-02 13:04:00 +00:00
tipaul
392b94a262 fix for #343 2003-04-24 18:31:03 +00:00
wolfpac444
5ca3118f56 Added format_date() to the scripts. 2003-04-22 10:22:19 +00:00
tipaul
547c0daf6d *** empty log message *** 2003-03-19 21:02:24 +00:00
tipaul
05e5034932 bugfixes + adding buttons to switch between normal and MARC view of a record 2003-03-07 16:34:04 +00:00
tipaul
8dd5bb69de bugfixes. seems to work better.
NOTES to 1.2 managers : the 1.2 seems to have problems too :
* when finishrecieve is called, the booksellerid is lost, and you arrive to the "recieve.pl" again, it's with the 1st bookseller from the DB.
* under certain circunstances, the invoice # is lost, and ALL lines from the bookseller are shown. this strange behaviour is fixed too in this commit
2003-03-03 17:35:29 +00:00
tipaul
dc1cf5f163 road to 1.9.2 :
* finishing templating acquisition
* first step to acquisition/cataloguing merging.

show no errors, but seems a little buggy (order counter wrong, problem at end of acquisition process...)
2003-02-27 16:54:10 +00:00
tipaul
d532cf3b7b Road to 1.9.1
* templating of normal acquisitions
* some graphic changes (use of yellow color as "acquisition/cataloguin" symbol, header consistency...)
* minor reordering of screens (newbasket.pl now unused)
* few bugfixes

When templating finished, the recieving of a book will be ended by a "calatoguing" screen.
Cataloguing will be MARC cataloguing or non-MARC cataloguing, depending on "acquisitions" system parameter.
2003-02-13 17:27:47 +00:00
tipaul
c74a6a0009 templating normal acquisition before reordering acquisition and cataloguing.
supplier now works with currencies table, not hardcoded currencies
2003-02-10 13:38:44 +00:00
acli
850a3e41f6 Use the new C4::Boolean module and the new C4::Auth::boolean_parameter
function to test for boolean values in parameters
2003-02-06 06:35:26 +00:00
acli
52a5fd4bbd Moved C4/Charset.pm to C4/Interface/CGI/Output.pm
Create output_html_with_http_headers function to contain the "print $query
->header(-type => guesstype...),..." call. This is in preparation for
non-HTML output (e.g., text/xml) and charset conversion before output in
the future.

Created C4/Interface/CGI/Template.pm to hold convenience functions specific
to the CGI interface using HTML::Template

Modified moremembers.pl to make the "sex" field localizable for languages
where M and F doesn't make sense
2003-02-02 07:18:37 +00:00
tipaul
2b5699f89b reordering code 2003-01-28 15:02:39 +00:00
tipaul
11480721bf Now uses get_template_and_user, and non iso-5589-1 code from Ambrose 2003-01-28 15:01:42 +00:00
tipaul
5062b701e0 templating newbasket2.pl. (Done by hdl, new french developer !) 2002-11-04 09:31:20 +00:00
arensb
eff606ba56 Replaced expressions of the form "$x = $x <op> $y" with "$x <op>= $y".
Thus, $x = $x+2 becomes $x += 2, and so forth.
2002-10-13 11:32:14 +00:00
arensb
7197a3735b Added magic RCS comment.
Removed trailing whitespace.
2002-10-13 07:31:21 +00:00
arensb
f2fb7a5a30 Added some FIXME comments.
Removed trailing whitespace.
2002-10-13 06:30:50 +00:00
arensb
a9e5b8bb76 Added a FIXME comment. 2002-10-13 06:30:01 +00:00
arensb
cc1d55c136 Use C4::Context->preference, rather than getting all system
preferences and picking out only what's needed.
2002-10-05 23:56:13 +00:00
arensb
dbca39823f Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.
2002-10-05 09:44:27 +00:00
tipaul
5daa177422 long is the road to 1.4.0
* MARCadditem and MARCmoditem now works
* various bugfixes in MARC management
!!! 1.3.0 should be released very soon now. Be careful !!!
2002-09-20 13:01:50 +00:00
tonnesen
1e67687742 Added copyright statement to all .pl and .pm files 2002-08-14 18:12:50 +00:00
tipaul
528f1b2b80 Long is the road to MARC..
Not related to MARC :
* removed HLT- empty link when no basket for a supplier (should be useful to copy this into rel-1-2 i think)
* fixed some "use of uninitialized value"
related to MARC
* changed use Acquisition to use Catalogue, new package for MARC management

For instance, nothing is done to MARC DB, but structure is modified (see Biblio.pm for details), and everything seems to work : it's still possible to use acqui, and it fills old-DB pretty good.

WARNING : if you work on main trunk, please note Acquisition.pm is NO MORE USED in /acqui/ system. Every sub in Acquisition.pm has been moved to Biblio.pm or Catalogue.pm.
2002-07-04 15:53:02 +00:00
tipaul
bd04fceca8 merging 1.2 and main branches 2002-07-04 10:42:31 +00:00
tipaul
bdd324f187 merging of rel-1-2 and main branch 2002-06-24 14:16:36 +00:00
tipaul
d467f092a3 merging branches 1.2 and main 2002-06-21 13:15:36 +00:00
tonnesen
3d0fb625a0 Third in the series of branch merges. Starting to run out of easy stuff. :) 2002-06-20 17:45:18 +00:00
tonnesen
cb7441a537 More merges in from rel-1-2
All of the changes so far have been minor.  I did uncomment delbiblio($biblio)
in delbiblio.pl in the main branch to match delbiblio.pl in rel-1-2
2002-06-20 17:33:07 +00:00
dragon28
8c2a8ae3b6 fixed typo 2002-05-27 08:22:23 +00:00
tipaul
8cd909ead8 smalll bugfixes and code cleaning. See mail in koha-devel for remaining questions 2002-05-15 14:32:48 +00:00
tipaul
b1dd6ad93b small bugfix : adding bibdata only if exist 2002-05-15 08:17:59 +00:00
tipaul
6d2a66e639 newsubtitle called only if title exist 2002-05-15 07:52:01 +00:00
truth_nz
7ae8f46a85 Patch to acqui system to use new newbiblioitem() parameters 2002-05-15 02:22:24 +00:00
tipaul
00319751b7 DB query optimisation 2002-05-14 09:13:52 +00:00
truth_nz
0747fb1fbb Changes to allow modifications to the website biblioitems
Changes to way that website biblioitems are shown on the details page
2002-05-12 18:08:17 +00:00
truth_nz
cec2db30ea Update to catalogue to allow change of biblio abstracts.
Related modifications to acqui system to match changes in Acquisition.pm
detail.pm changed to show abstract - still working on how to show url's
2002-05-09 03:01:40 +00:00
rangi
f1e1110cf9 Now use the new hash based results returned from Search.pm 2002-05-07 00:09:06 +00:00
truth_nz
47c18cfcdc Modifications for new acqui.simple
Database includes new biblio abstract field and biblioitem url field
acqui/finishreceive.pl modified to use changed C4/Acquisitions.pm
2002-04-29 05:25:41 +00:00
truth_nz
e1d7a81197 Acquisitions::newbiblioitem updated to be usable for new acqui.simple
addorder.pl and updatebibitem.pl modified to use new newbiblioitem
2002-04-15 05:33:33 +00:00
truth_nz
7a1c0652d5 Updates to use changed newbiblio sub in C4/Acquisitions.pm 2002-04-10 05:47:07 +00:00
rangi
cd96e8c297 Fix for displaying prices 2002-02-26 09:06:19 +00:00
rangi
f941988e05 Glens updates to automatically increment barcode, and to remove hardcoded itemtypes in scripts 2001-03-12 23:32:47 +00:00
rangi
d0374d0037 Initial revision 2000-12-19 23:45:51 +00:00