Commit graph

256 commits

Author SHA1 Message Date
Paul POULAIN
47321d0068 Adding dates for display to circulation.pl Minor bug fixes.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-09 18:44:46 -05:00
Chris Cormack
ee56e731ab Fix for bug 1436, changing to use issuedate, not timestamp for sorting issues
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-30 20:45:46 -05:00
34b67109d1 A couple more tweaks to member entry form. Still unfinished: inline CSS will have to be generalized and moved to external stylesheet. Trying some changes to circ page, including moving patron info into sidebar, consolidating messages and warnings. Also unfinished!
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-25 14:47:02 -05:00
a37daca905 More efforts with toolbars, nothing solved. Also corrections, and modifications to resident search to place focus on displayed form field.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-25 14:46:56 -05:00
Paul POULAIN
c4d4b6ecf2 Bug fixing : 1396
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-24 15:31:40 -05:00
Paul POULAIN
3568e20644 bug fixing on 1396 :
Conflicts:

	circ/circulation.pl

Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-24 15:29:42 -05:00
Chris Cormack
1a4fc157bf Applying the fix for bug 1416 from paul
Had to edit the patch as it was corrupt
2007-09-20 17:39:43 -05:00
Paul POULAIN
e809eff05f BUGFIX : branch CPL was hardcoded
What is the branch CPL ?

Anyway, this was buggy and reseted the branch to empty
which was a bug ;-)

Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-18 15:06:47 -05:00
Chris Cormack
f12fc20e1d Fix to get selectbranchandprinter working fine with the Session
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-06 20:48:13 -05:00
Paul POULAIN
497bbd84b0 show the departure date if close or past
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-14 21:32:22 -05:00
Joshua Ferraro
cefeb583ad fixing permissions on scripts
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-08-13 12:22:30 -05:00
Joshua Ferraro
e9ae8c0686 patches from paul 2007-08-08 07:41:19 -05:00
Chris Cormack
2e4a11773c Merge branch 'master' of /home/jmf/repos/koha-rm-root.git/ 2007-08-08 07:36:43 -05:00
Paul POULAIN
19aa1c7a5a formatting date
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-08 07:25:09 -05:00
kados
40af15d8e6 changing permissions on templates and scripts 2007-08-07 13:20:51 -05:00
jmf@arwen.metavore.com
c0d85e87b4 From 0751ba130288bc69e9e563473e7fc25551edc40e Mon Sep 17 00:00:00 2001
From: kados <jmf@arwen.metavore.com>
Date: Sat, 4 Aug 2007 20:10:51 -0500
Subject: [PATCH] fixing permissions on all scripts

Signed-off-by: Chris Cormack <crc@arwen.metavore.com>
2007-08-04 22:41:41 -05:00
toins
ee5c4c303c display enhancement. 2007-07-24 14:17:07 +00:00
toins
cae655f928 removing a compilation warn. 2007-06-05 09:48:31 +00:00
toins
738d04c2ca chmod +x
using output_html_with_http_headers instead of a print "..."
2007-06-05 09:48:06 +00:00
tipaul
577a7bf094 some (minor, functionnaly speaking) bugfixes 2007-06-05 08:54:17 +00:00
tipaul
a04f92a30a some minor bugfixes, templates improvements & zebra default config file changes 2007-05-29 16:36:11 +00:00
tipaul
5ff7fcffa4 Bugfixes & improvements (various and minor) :
- updating templates to have tmpl_process3.pl running without any errors
- adding a drupal-like css for prog templates (with 3 small images)
- fixing some bugs in circulation & other scripts
- updating french translation
- fixing some typos in templates
2007-05-22 09:13:54 +00:00
hdl
286930bdc7 Changing GetMarcStructure signature.
Deleting first parameter $dbh
2007-05-22 08:50:47 +00:00
alaurin
5c4a2c3e4b bugfixing for circulation. 2007-05-04 10:18:00 +00:00
hdl
097fef712a Removing $dbh from GetMarcFromKohaField (dbh is not used in this function.) 2007-04-27 14:00:48 +00:00
hdl
a171035f1d GetBorrowerIssues is deleted from C4::Circulation
Use GetPendingIssues from C4::Members instead.
2007-04-25 14:07:34 +00:00
tipaul
fb143b71ba BIG COMMIT : cleaning of Reserves.pm. See detail on koha-devel 2007-04-24 16:10:36 +00:00
tipaul
ee40bfb5c6 removing reserve.pl (moved to pendingreserves.pl) 2007-04-24 16:09:11 +00:00
hdl
b642e687d2 Still Code Cleaning.
Abiding by Name Convention.
Using Members wherever it should be used.
Borrower is only used for borrower Categories.
+ GetBorrowersWhoHaveNeverBorrowed
and lists like that.
2007-04-24 15:41:27 +00:00
hdl
100e6a9808 functions that were in C4::Interface::CGI::Output are now in C4::Output.
So this implies quite a change for files.
Sorry about conflicts which will be caused.
directory Interface::CGI should now be dropped.
I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
2007-04-24 13:54:28 +00:00
tipaul
4dea4d29b3 moving dotransfer to Biblio.pm::ModItemTransfer + some CheckReserves fixes 2007-04-24 09:07:53 +00:00
tipaul
0c020dd8bf renaming reserves & branchreserves to pendingreserves and waitingreserves 2007-04-23 16:42:59 +00:00
tipaul
9f42b8ad49 renaming currenttransfers to transferstoreceive 2007-04-23 15:21:17 +00:00
tipaul
3ddec89262 moving Reserves2.pm to Reserves.pm 2007-04-23 14:08:47 +00:00
hdl
0b66bd800d Code Cleaning Members.
- checkaccount and getborraccountno => GetBorrowerAcctRecord

Many changes in names,
some changes in function signature.
Will be detailed in a mail to kohadevel.
2007-04-23 13:10:07 +00:00
tipaul
7bd99ef365 removing all useless %env / $env 2007-04-18 17:00:14 +00:00
tipaul
5af8ae975b removing "department" and replacing by items.location 2007-04-18 14:20:54 +00:00
tipaul
43ad7fb4df circulation cleaning continued: working on branchtransfers.pl (unfinished, but at least it compiles... 2007-04-17 16:24:59 +00:00
tipaul
b71839d85c circulation cleaning continued: bufixing 2007-04-17 08:44:49 +00:00
tipaul
c596d55374 HUGE COMMIT : code cleaning circulation.
some stuff to do, i'll write a mail on koha-devel NOW !
2007-04-04 16:46:22 +00:00
alaurin
d23c6c9955 bugfixing of warnings in current transfers and waitingreservestranfers
same bugfixing as branchreserves
2007-04-03 15:41:36 +00:00
alaurin
6f84890152 bugfixing for displaying the maxpicking delays for reservations, now the method of date works is using
Add_Delta_Days and not delta year and month
now the system working
2007-04-03 15:04:30 +00:00
tipaul
987ceb8ce7 using C4::Date instead of C4::Circulation::Date 2007-03-30 11:58:48 +00:00
kados
b4d72b977f fix for bug 1276: Cannot search for patron wtih apostrophe in their name 2007-03-18 04:13:21 +00:00
kados
d126742c41 finish fixing spelling error on department 2007-03-10 06:28:06 +00:00
kados
9f4bf0d7f5 fix spelling department
improve English grammar in template
2007-03-10 06:22:52 +00:00
tipaul
f8e9fb6445 rel_3_0 moved to HEAD (introducing new files) 2007-03-09 15:34:17 +00:00
tipaul
70501283b3 rel_3_0 moved to HEAD 2007-03-09 14:41:32 +00:00
tipaul
2ffd5b7228 rel_3_0 moved to HEAD 2007-03-09 14:28:54 +00:00
tgarip1957
4843e0ee78 Resynching Savannah 2006-11-15 01:41:51 +00:00
tgarip1957
04b2e6112f Finalized XML version for intranet 2006-09-27 21:19:21 +00:00
tgarip1957
7e52a5665c Clean up before final commits 2006-09-06 16:21:03 +00:00
toins
3c6410111b subs renamed according to coding guidelines. 2006-07-21 10:10:29 +00:00
toins
cc9524a875 Head & rel_2_2 merged 2006-07-04 14:36:51 +00:00
rangi
f30b030af8 Code to allow the associated borrowers to work 2006-06-20 22:35:47 +00:00
alaurin
193e22714f Add a new system preference 'AutomaticItemReturn' :
if this prefence is switched on: the document returned in another library than homebranch, the system automaticly transfer the document to his homebranch (with notification for librarian in returns.tmpl) .

switch off : the document stay in the holdingbranch ...

correcting bugs :
- comment C4::acquisition (not using in request.pl).
- correcting date in request.pl
-add the new call of function getbranches in request.pl
2006-06-08 15:36:31 +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
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
bob_lyon
92d88b35a7 merging katipo changes...
frbranchcd was being passed tobranch info from transferbook
2006-06-07 03:29:19 +00:00
alaurin
46c9e24e9d new fonctions for returns.pl :
- the system check if we don't have another reserv for the document returned, we return the document to his homebranch, ......
- improvement of returns,  adapt item reservation , loan rules, and transfer rules ....
2006-06-06 12:46:52 +00:00
alaurin
3ca97f8c15 new color alerts for the differents kind of reserves (available,on transfer, on loan ......) + warning color ....
+ minor changes of templates
2006-06-06 12:30:43 +00:00
alaurin
0f00577a9e bug fix : for item reservation, now the system don't keep the reserve if the document is returned, works fine !!!! 2006-06-06 12:26:57 +00:00
alaurin
795fffef13 Improvements for reserves infos in circulation.pl
new infos displayed :

 -Waiting position of borrower on document reserve .
 -Follow the document he's in transfert 	.
 -more infos of document are displayed in a specific cell ....

N.B : the old display of reserves infos are only commented, will be removed, if new display is ok for everybody ...
2006-06-01 10:03:08 +00:00
rangi
c1c08d65b1 Allows a person to choose an associated borrower (orgranisation) when Issuing.
This is to allow a person who is associated with many organisations to choose the one he/she is borrowing an item for

No changes to the issuing code, or the issues table, the associated borrower number is stored in the statistics table
2006-06-01 01:44:16 +00:00
alaurin
f3fd911dc8 bugfixing of the itemtypes infos in branchreserves,currenttransfers,waitingreservestransfers 2006-05-30 12:03:54 +00:00
alaurin
c98bae12bb new dev : create 3 new program for circulation :
branchreserves : to see reserves for one library (with the branchip selection or librarian preferences)

currenttransfers : show all the transfers are waiting in the library

waitingreservetransfers: show all the book the librarian have to transfer to an another library .

"actions" are bugged, will be corrected .
2006-05-19 17:01:02 +00:00
plg
dc986ecac5 bug fixed: the issue timestamp had not the same format as the today's date
to which it was compared. The comparison separate issues on display between
today issues and older issues.
2006-03-31 15:31:44 +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
tipaul
e82eca42c9 see mail on koha-devel : code cleaning on Search.pm + normalizing API + use of biblionumber everywhere (instead of bn, biblio, ...) 2005-09-22 10:01:45 +00:00
genjimoto
f9d2fa784c modified script to enable circulation system to show picture of borrower for verification purposes. 2005-08-22 12:53:48 +00:00
oleonard
98687d85ad Synch with rel_2_2: Fixing section that was supposed to allow for alternating table row colors 2005-07-19 18:52:37 +00:00
tipaul
4dea4ae494 synch'ing 2.2 and head 2005-05-04 08:50:48 +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
oleonard
cb2dc1d759 Adding 'flagged' variable to help control display in the template 2005-02-16 22:25:17 +00:00
oleonard
ea39d8bd8f Adding email address to list of returned variables 2005-02-10 17:27:32 +00:00
tipaul
52a123a1a4 fix for :
http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=858

* added a button to cancel issue
* adding checkbox to cancel reserve on the book (checked by default)
* the cancelation reserve is done on reserves done for a given item or for any item

Nelsonville, pls test & confirm it's OK
2004-12-15 10:47:09 +00:00
oleonard
000a96fb4b Fix from Joshua for Bug 851: stripping out comma and apostrophe from search terms 2004-12-13 17:54:15 +00:00
rangi
1ce34b32b3 Fix for bug 865
Allows a librarian to tell Koha you want to start issuing to a new borrower
by entering no data. Essentiall by just hitting the enter  key
2004-11-28 08:32:36 +00:00
tipaul
1424addcc2 fix for bug 858 (no warning when issuing a reserved book) 2004-11-18 10:32:39 +00:00
oleonard
935db49ba8 Re-adding patrontable subroutine so that borrower flags and waiting item information can be displayed 2004-11-03 22:40:14 +00:00
tipaul
9aec896627 * Showing the borrowernotes in issues (was shown only in issues before) 2004-10-04 20:29:07 +00:00
tipaul
f927e8eb36 bugfix for manually fixed duedate on issue. 2004-09-15 16:27:18 +00:00
tipaul
ab39e57393 fixes in circulation module 2004-08-18 15:52:14 +00:00
oleonard
00fc740011 Adding overduecount, issuecount, and finetotal variables to template 2004-07-12 20:44:48 +00:00
tipaul
cc5e837309 bugfixes in circulation 2004-06-17 08:17:39 +00:00
tipaul
b56f035183 bugfixes 2004-05-03 16:36:53 +00:00
tipaul
040bcdf92b CIRCULATION : the big rewrite...
This 1st commit reorders deeply the circulation module.
The goal is to :
* have something 100% templated/translatable.
* have something easy to read & modify, to say to customers/users : you can define your circulation rules as you want if you accept to look in C4/Circ/Circ2.pm

The circulation now works :
1=> ask for the borrower barcode (as previously)
2=> ask for the item barcode.
3=> check "canbookbeissued". This new sub returns 2 arrays :
- IMPOSSIBLE : if something is here, then the issue is not possible and is not done.
- TOBECONFIRMED : if something is here, then the issue can be donc if the user confirms it.
4=> if TOBECONFIRMED is set : ask for confirmation, loop. if neither  are set or confirmation flag is set (2nd pass of the loop), then issue.

The IMPOSSIBLE & TOBECONFIRMED hashs contains :
* the reason of the line. always in capitals, with words separated by _ : BARCODE_UNKNOWN, DEBTS ... as key of the hash
* more information, as value of the hash ( TOBECONFIRMED{ALREADY_ISSUED} = "previous_borrower_name", for example)

This commit :
* compiles
* works on certain situations, not on other
* does NOT issue (the line is # )
* does not check issuing rules depending of # of books allowed / already issued

The next step is :
- check issuing rule.
- extend issuing rule to have a 3D array : for each branch / itemtype / borrowertype = issuing number and issuing length.
2004-05-03 09:10:51 +00:00
tipaul
21a379acda CIRCULATION : the big rewrite...
This 1st commit reorders deeply the circulation module.
The goal is to :
* have something 100% templated/translatable.
* have something easy to read & modify, to say to customers/users : you can define your circulation rules as you want if you accept to look in C4/Circ/Circ2.pm

The circulation now works :
1=> ask for the borrower barcode (as previously)
2=> ask for the item barcode.
3=> check "canbookbeissued". This new sub returns 2 arrays :
- IMPOSSIBLE : if something is here, then the issue is not possible and is not done.
- TOBECONFIRMED : if something is here, then the issue can be donc if the user confirms it.
4=> if TOBECONFIRMED is set : ask for confirmation, loop. if neither  are set or confirmation flag is set (2nd pass of the loop), then issue.

The IMPOSSIBLE & TOBECONFIRMED hashs contains :
* the reason of the line. always in capitals, with words separated by _ : BARCODE_UNKNOWN, DEBTS ... as key of the hash
* more information, as value of the hash ( TOBECONFIRMED{ALREADY_ISSUED} = "previous_borrower_name", for example)

This commit :
* compiles
* works on certain situations, not on other
* does NOT issue (the line is # )
* does not check issuing rules depending of # of books allowed / already issued

The next step is :
- check issuing rule.
- extend issuing rule to have a 3D array : for each branch / itemtype / borrowertype = issuing number and issuing length.
2004-05-03 09:02:12 +00:00
rangi
9ab6c09048 Passing thru the borrowernumber with the charges data, so can create a link
to the payment window
2004-03-15 23:41:20 +00:00
rangi
1d2a764626 fix for bug 606,
seems to be an error in the tmpl still but the functionality seems to be working again
2004-02-25 21:44:40 +00:00
oleonard
e0d4eee48f Small changes to help fix Bug 436 2004-02-25 18:09:29 +00:00
oleonard
7a2a0fe018 Adding item information variable declarations to 'Waiting' section already present in 'Reserved' section 2004-02-18 16:51:20 +00:00
oleonard
84b3a7b984 Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info 2004-02-17 22:15:33 +00:00
tipaul
af08d677c5 synch'ing 2.0.0 branch (RC4 tag) and head 2004-02-11 08:42:01 +00:00
oleonard
0f8e6bfb73 Added variables available to template: streetaddress, city, phone, cardnumber. Added FIXME comments to sections where HTML should be moved to template 2004-01-26 19:32:36 +00:00
rangi
cf67d8bb8f Bug 605 fixed 2004-01-21 20:49:54 +00:00
rangi
9c998cda51 Fix for bug 535, and adding the classification column to the variables
available to the template
2003-11-04 19:48:50 +00:00
rangi
d187195a75 Fix for bug 592
Re-issuing book does not renew correctly
2003-10-31 21:02:16 +00:00