Commit graph

184 commits

Author SHA1 Message Date
Galen Charlton
74fd29d797 clean up redundant test
Credit to Joe Atzberger for cathing this.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 09:00:52 -05:00
Nahuel ANGELINETTI
6640cca486 (bug #3235) improve searchorder
If an supplierid is provided with a ordernumber, the search should be able to return everytime a record. This patch do the job.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:49:42 -05:00
Nahuel ANGELINETTI
a063e94c94 (bug #3149) fix searchorder
this patch fix the searchorder function, and add to the SQL query a "AND biblionumber" statement if a biblionumber is speficied.
Sometimes C4::Acquisitions::searchorder() find more than one result, so the user is looping to the same page to choose the great record, adding a contraint to biblionumber allows to be more strict.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:49:32 -05:00
Andrew Moore
1a953c8e95 Bug 2400 [1/18]: fixing pod syntax in C4/Acquisitions.pm
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:39:13 -05:00
Paul POULAIN
666023d88f bugfix for #2472
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-06 07:14:01 -05:00
Chris Nighswonger
af970db232 kohabug 2139 Fixes C4::Aquisition::NewOrder so that it saves the branchcode
&NewOrder did not save the branchcode posted with a new order. This patch adds that param.

Added code to select the branch the order is for in the branch dropdown list on
acqui/orderreceive.pl

Updating POD and tests

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-24 14:54:01 -05:00
Joe Atzberger
322fd538d0 Refine lateorders - error feedback, filter independence
Added error catching for bad user input on number of days.  I.E., if you
try to filter by "bAd", you now get an error message prompting for valid
digits.  Also I updated highlighting to use loop_context_vars.

Fixed filtering to work on either days, vendor or both.  Previously, if
you selected a number of days, you had to select a vendor or else got
empty results.  DOCUMENTATION NOTE: this supplies the expected behavior,
so specifying vendor is no longer required.

Changed filters form to GET method.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-18 13:23:51 -05:00
Ryan Higgins
f2feb68509 Bugfix 1417 : library was not being saved on order edits.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 14:34:59 -05:00
paul
87dea9cb0e just doing a <= / >= instead of a < / > in history search.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:48:31 -05:00
Andrew Moore
49be89c735 bug 1953: removing possible SQL injections from C4::Acquisition::GetHistory
I think this is the last sub in this module that needs to be changed.
there should be no functionality or no documentation changes with this patch.
http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=1953

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-11 16:56:36 -05:00
Andrew Moore
2df965f4ea bug 1953: removing possible SQL injections from C4::Acquisition::GetLateOrders
I decided to not make chagnes the the query that's executed on databases other than MySQL as I have no good way to test that.
This change provides no functinality change and requires no documentation change.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-11 16:56:25 -05:00
Andrew Moore
e8da5f250d bug 1953: removing potential SQL injection in C4::Acquisition::GetParcels
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-10 03:00:40 -05:00
Ryan Higgins
7fe042a008 Change LateOrders to inclusive <=, s/supplier/vendor , s/parcel/shipment.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-01 06:37:00 -05:00
Galen Charlton
2ccb547118 partial fix for bug 1417
The Notes field should now be displayed correctly
when editing an order - the query in GetOrder
was modified to have aqorder's notes column
appear last, which means that it is the one
selected for the data hash (instead of biblio.notes
or biblioitems.notes).

This is an ugly fix - GetOrder needs to be
refactored so that it doesn't depend on
selecting all columns from several different
tables.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-21 21:45:20 -05:00
Andrew Moore
c445e449c3 bug: 1953. cleaning up Acquisition::NewOrder just a little bit.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-21 21:45:19 -05:00
Andrew Moore
5285bb04fe bug: 1953. using placeholders in C4::Acquisition::NewOrder.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-21 21:45:18 -05:00
Andrew Moore
a610782e6c bug 1953: using placeholders in C4::Acquisition::GetParcel
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-21 21:45:17 -05:00
Andrew Moore
9cf2a4b730 bug 1953: using placeholders in C4::Acquisition::GetParcel
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-21 21:45:16 -05:00
Henri-Damien LAURENT
2007ce3a25 Some Bugfixing for Acquisitions : ModOrderReceive would create 2 lines in baskets And titles were displayed twice in parcel.tmpl
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-21 21:45:11 -05:00
Andrew Moore
761656570b bug 1953: use bind variables in C4::Acquisition::GetPendingOrders
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-19 15:46:24 -05:00
Andrew Moore
a5325c4fcc use bind variables in C4::Acquisition::GetPendingOrders
I improved the tests a bit for this module so that they at least skip
if there's not enough data in the database to test with.
I was unable to test the actual execution path through the change I actually made.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-19 15:46:23 -05:00
Joe Atzberger
a52400b7bc Acquisition.pm - BEGIN block VERSION and vars related to export.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-07 20:02:20 -06:00
Ryan Higgins
31ddb16fa2 Fix bug in ModReceiveOrder call
had been losing datereceived and replacementprice on modorder.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 18:42:48 -06:00
Ryan Higgins
52e1a15e5a Specify datereceived when receiving a new parcel.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 18:42:47 -06:00
Ryan Higgins
b2f5cf3ad2 Further updates to acq, merging in dev_week mods.
Splitting orders now on receipt.
Many tmpl updates to pass correct values btwn scripts.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 15:07:08 -06:00
Ryan Higgins
4b089e1eee updates to acqui - first of several commits
bug fixes to display and save publishercode and purchase order numbers.
use invoice number in place of parcel code
fix template apparently allowing user to modify biblio details on add/mod order
removing CGI scrolling_list

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 15:07:02 -06:00
Joe Atzberger
7012eb1abb Acquisition - Dates.pm switch
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-13 17:42:24 -06:00
Ryan Higgins
271aa9043d Adding MARC preview to acqui screens
Also cleaning up some missing params and language.
Add another js library: greyox (jquery derivative iiuc).

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-25 22:15:08 -06:00
Paul POULAIN
e5ea59b9d5 relooking histsearch & adding some links to jump to basket, biblio...
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-12 17:13:02 -06:00
Chris Cormack
b9c20fa9cf Patch from Galen Charlton, removing $Id$ $Log$ and $Revision$ from files
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-18 20:22:01 -05:00
Henri-Damien LAURENT
f8c6728d87 Filtering cancelled orders on History Search.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-11 15:54:56 -05:00
Paul POULAIN
897de14016 Acquisition minor improvements
Fixing a SQL bug hdl introduced yesterday when updating queries & that I missed when reviewing them.
changing the look of the basket & parcel by adding & moving some link

The goal is to have the same kind of lists & links everywhere. (Will continue on monday)

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-05 19:55:36 -05:00
Henri-Damien LAURENT
04a108482d BUG FIXING : Using LEFT JOIN in replacement of implicit inner joins. WARN NOT FULLY TESTED
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-10-03 14:58:35 -05:00
Henri-Damien LAURENT
fc0dff779b History was broken by my correction on SQL for SearchHistory. Corrected.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-10-03 14:58:30 -05:00
Henri-Damien LAURENT
d53e1d3343 Bug FIXING : Some SQL queries had an old SQL 4.1 form.
Fixing it with LEFT JOIN.

MUST Be CAUTIOUS about biblioitems numbers.
Does a biblio have one and only one biblioitem ?
I took this for granted. But maybe it is not supposed to be so.

Signed-off-by: Chris Cormack <crc@liblime.com>
2007-10-02 15:45:39 -05:00
kados
4af7e13c70 Cleaning up perldocs for make utility that MJ wrote. I was getting a bunch
of warnings:

Manifying blib/man3/reports::cat_issues_top.3pm
reports/cat_issues_top.pl:40: Unknown command paragraph "=over2"
Manifying blib/man3/reports::acquisitions_stats.3pm
reports/acquisitions_stats.pl:40: Unknown command paragraph "=over2"
Manifying blib/man3/C4::Koha.3pm
C4/Koha.pm:1227: Unmatched =back
Manifying blib/man3/reports::catalogue_stats.3pm
reports/catalogue_stats.pl:38: Unknown command paragraph "=over2"
Manifying blib/man3/opac::opac-topissues.3pm
opac/opac-topissues.pl:39: Unknown command paragraph "=over2"
Manifying blib/man3/reports::issues_avg_stats.3pm
reports/issues_avg_stats.pl:39: Unknown command paragraph "=over2"
Manifying blib/man3/reports::borrowers_stats.3pm
reports/borrowers_stats.pl:40: Unknown command paragraph "=over2"
Manifying blib/man3/reports::bor_issues_top.3pm
reports/bor_issues_top.pl:40: Unknown command paragraph "=over2"
Manifying blib/man3/reports::catalogue_out.3pm
reports/catalogue_out.pl:39: Unknown command paragraph "=over2"
Manifying blib/man3/reports::borrowers_out.3pm
reports/borrowers_out.pl:39: Unknown command paragraph "=over2"
Manifying blib/man3/C4::Languages.3pm
C4/Languages.pm:445: Unmatched =back
Manifying blib/man3/reports::issues_stats.3pm
reports/issues_stats.pl:39: Unknown command paragraph "=over2"
Manifying blib/man3/C4::Acquisition.3pm
C4/Acquisition.pm:772: Unmatched =back
2007-07-08 15:36:59 +00:00
tipaul
2ffd5b7228 rel_3_0 moved to HEAD 2007-03-09 14:28:54 +00:00
bob_lyon
0e6d8b1d1a Adding in missing subroutine bookseller 2006-12-13 20:02:34 +00:00
tgarip1957
9be398961d Some bug fixing, new acquisitions handling 2006-09-20 21:48:44 +00:00
tgarip1957
7e52a5665c Clean up before final commits 2006-09-06 16:21:03 +00:00
tgarip1957
0451359813 New set of routines for HEAD.
Uses a complete new ZEBRA Indexing.
ZEBRA is now XML and comprises of a KOHA meta record. Explanatory notes will be on koha-devel
Fixes UTF8 problems
Fixes bug with authorities
SQL database major changes.
Separate biblioograaphic and holdings records. Biblioitems table depreceated
etc. etc.
Wait for explanatory document on koha-devel
2006-08-25 21:07:08 +00:00
toins
192b76cc8a New Function : ModOrderBiblioNumber. 2006-08-01 08:47:49 +00:00
toins
4fd001ceef * Function GetBasketContent renamed to GetOrders.
* Function GetOrder renamed to GetOrderNumber.
* Function GetSingleOrder renamed to GetOrder.
* GetAllOrders has been merged with GetPendingOrders.
2006-08-01 08:26:53 +00:00
toins
2bfa4df482 Code cleaned. 2006-07-31 14:38:14 +00:00
toins
a4c279ac4e Acquisition module has been cut into 3 files :
*Bookseller.pm* : contains all functions dealing with bookseller.

*Bookfund.pm* : contains all functions dealing with bookfund, currency & budget.

*Acquisition.pm* contains all functions dealing with orders, basket & parcels.
2006-07-27 13:39:00 +00:00
sushi
3aad010385 adding aqorders.ordernumber to histsearch(), so so user can click url to ordernuber record via .tmpl. 2006-07-12 14:30:07 +00:00
sushi
b9b3ee16e1 removed hardcoded 'next budget date' from neworder(), now rolls over to 01-07 next year.
i think a future improvement will be to look up the next budget record's end-date for that bookfundi, rather than just assuming its '01-07'.
2006-07-12 14:26:13 +00:00
sushi
567c744d07 fixup of bookfundbreakdown(), totals now add up correctly. 2006-07-12 13:52:28 +00:00
toins
ebfcdb97b5 Sub renamed according to the coding guidelines 2006-07-07 08:02:46 +00:00
toins
cc9524a875 Head & rel_2_2 merged 2006-07-04 14:36:51 +00:00
btoumi
96f5a77830 aquisition.pm : bug fix add variable decalaration
selectbranchprinter.tmpl :bug fix call to wrong include file
2006-06-22 08:43:07 +00:00
rangi
fc7b633b2e Fixing missing parametrs for bookfundbreakdown 2006-06-13 08:45:04 +00:00
rangi
cabf593c41 Fixing the missing , i just missed
I shouldnt commit things at midnight
2006-06-09 11:49:12 +00:00
rangi
feff81eaea Fixing a bug that bruno spotted, $bookfund in receiveorder 2006-06-09 11:47:53 +00:00
rangi
5ef593682d Merging katipo changes
Last of the changes for Acquisitions.pm, bookfundbreakdowns
2006-06-07 00:39:22 +00:00
rangi
364e4f9061 Katipo merging work
Fixes for the ordersearch
2006-06-07 00:07:59 +00:00
rangi
d7648aae50 Merging Katipo changes...
Fixing formatting and fixing neworder
2006-06-06 23:18:12 +00:00
btoumi
55171a6af4 syntax error has been corrected 2006-05-23 15:01:12 +00:00
rangi
2eae386c21 Merging from dev_week 2006-05-21 06:09:33 +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
2ba136efd2 removing branches sub, that should be in Koha.pm package (generic sub) 2005-09-02 14:30:28 +00:00
hdl
18a6bad8ab Minor display changes.
Now displaying publicationyear.
And biblio information in One cell.
2005-08-10 14:22:48 +00:00
hdl
27c2d1a72e Bug fixing on query getlateorders.
Adding subtotal.
Changing information display orders.
next work is pretty printing.
2005-08-10 10:22:57 +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
787c184dc7 Code necessary for IndependantBranches parameter to work. Should have been committed sooner...
Modify Histsearch and getorders to respect branches of librarian.
2005-08-08 08:42:32 +00:00
tipaul
2cd0bc1da8 synch'ing 2.2 and head 2005-08-04 13:27:37 +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
hdl
979940ecba Modifying branch Selection : Now Superlibrarians are always able to see ALL branches budget, not simple librarians. 2005-07-12 13:59:38 +00:00
tipaul
6b0ee5525b synch'ing 2.2 and head 2005-06-20 14:10:00 +00:00
rangi
0c376c1c03 Fix for a bug in full acquisitions basket.pl
Ordernumber not showing
2005-06-06 23:29:36 +00:00
tipaul
369527637b synch'ing 2.2 and head 2005-05-04 15:39:07 +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
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
a1c11c5784 bugfixes in order modif 2004-09-15 16:13:41 +00:00
tipaul
1af42ff447 bugfix for acquisitions 2004-09-13 15:21:59 +00:00
tipaul
716d4a4e18 serials : lot of bugfixes.
Works fine now. And is documented (clic Help)
2004-08-12 14:36:07 +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
Renamed from C4/Catalogue.pm (Browse further)