Commit graph

112 commits

Author SHA1 Message Date
Nahuel ANGELINETTI
15334926ad (bug #3737) fix title search in order history
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 08:57:07 +13:00
573ac9488f remove a bunch of unconditional debug warns
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 10:57:08 -04:00
7c0e441d50 replace references to defunct info email address
Now links to Koha project website.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-25 05:18:44 -04:00
Andrew Elwell
c6bf50d052 The start of some POD cleanups in C4/*.pm
If these are acceptable I'll continue - target is to get rid of all warnings
and errors with podcheck and make sure that any man and html formatted pod
docs look 'OK'

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:55 -04:00
64daee5495 fix a common "developement" typo
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 14:38:38 -04:00
Alex Arnaud
e594317f4d (BUG #4332) Changed the display of ordered search results
Changing the display of the basket column: changing "basketNumber" to "my
basket (basketNumber)".
Adding the Basket group column with fallowing display: "my group (group
Number)"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:20:10 -04:00
Lars Wirzenius
7279f55b60 Fix FSF address in directory C4/
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:56 -04:00
Colin Campbell
745ac87c20 Bug 4133 Ensure that orders have a valid quantity received
quantityreceived drives other parts of acq noticeably budget balances
ensure that a number (usually 0) is set in NewOrder
give field a valid default and set as not null
reinterpret exsting nulls in table as zero

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 11:21:48 -05:00
Colin Campbell
c3d1b33a2a Remove cause of some warnings in order display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 07:39:46 -05:00
afed49ccc8 fix POD errors reported by xt/author/podcorrectness.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:57:31 -05:00
Jean-André Santoni
c6027e73c5 Fixed a major bug in ModReceiveOrder
Orders were not splited correctly.
2010-01-28 15:11:53 +01:00
Matthias Meusburger
5f61beed72 MT2408 : UI Changes / CSV Export 2010-01-28 15:11:48 +01:00
Henri-Damien LAURENT
d339abf0bf Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community
Conflicts solved:
	Makefile.PL
	installer/data/mysql/en/mandatory/sysprefs.sql
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2010-01-20 23:16:34 +01:00
Chris Nighswonger
ff13d25bb3 Bugfix: Various Label Creator bugs
This fixes:

* A bug which caused the label template editor to throw
an error when saving when no previous profile was applied.

* A typo which caused a 'fetch without execute' error in Labels.pm

It also comments out several useless warns
2010-01-19 22:27:09 -05:00
Jean-André Santoni
e3c78da1eb [MT2435] Fixed the SQL syntax error in GetLateOrders 2009-12-20 14:31:23 +01:00
Henri-Damien LAURENT
677111b342 Bug Fixing : C4/Acquisition.pm
Updating ModStatus to ModSuggestion
2009-11-19 22:54:41 +01:00
Jean-André Santoni
eff46d395e Adds billing address support in the basketgroup.
Also fixes a bug in ModBasketgroup, and renames the PDF uploaded to the client.
2009-11-04 13:17:09 +01:00
Jean-André Santoni
d61161a3d5 [3.2.x](bug #3624) Per-basketgroup delivery place
Librarian are now able to select a different delivery place for each basketgroup. They can choose one from the branch list or manualy using a textarea.
Database schema and PDF generation have been modified to reflect these changes.
2009-11-02 17:02:02 +01:00
Paul Poulain
4de7b92904 some reindenting & XHTML compliance 2009-10-30 13:49:39 +01:00
Henri-Damien LAURENT
1ec6e3df73 Change in API : ordnum becomes ordernumber 2009-10-30 00:30:47 +01:00
Henri-Damien LAURENT
3ba54d73c9 using SQLHelper in C4/Acquisition
Changing addorder to send orderinfo from input decoding
And using SQLHelper to filter information
2009-10-06 13:34:56 +02:00
Nahuel ANGELINETTI
263961312c (bug #3622) rewrite a lot of basketgrouping
This patch remade a lot of basketgrouping
2009-09-30 11:30:39 +02:00
Paul Poulain
62f184262e (MT #1855) Make an Ajax+JSON search receiving orders
This one, rewrite the SearchOrder function to deal with the
search receiving an order. It implement an AJAX+JSON orders search engine.
2009-09-30 11:30:30 +02:00
Matthias Meusburger
04058ed34b MT 1487 : Ability to cancel orders when receiving shipments
Related items are also suppressed, as well as the record if there are no more items associed with it
2009-09-30 11:30:30 +02:00
Matthias Meusburger
7315f1fa54 MT 1486 : Results filtering, table collapsing / expanding, multiple display enhancements 2009-09-30 11:30:29 +02:00
John Soros
2d90fb22d4 fix for 1431 point 2: orders and orders_items also moved to new biblionumber now 2009-09-30 11:30:27 +02:00
Paul Poulain
aa708232fe partial fix for mantis #1498 2009-09-30 11:30:24 +02:00
Paul Poulain
7f41e027ad Acquisitions.pm
lot of changes everywhere
2009-09-30 11:30:18 +02:00
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