Commit graph

119 commits

Author SHA1 Message Date
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
Jean-André Santoni
575b327e80 This fixes GST computation if prices are GST included 2009-09-30 11:30:27 +02:00
Jean-André Santoni
39babb822a Fixes columns alignment in order details table. 2009-09-30 11:30:27 +02:00
Jean-André Santoni
ca6227715f Several improvements to basket display. 2009-09-30 11:30:27 +02:00
John Soros
9a3bf98b8e Fixes for basket closing:
- I user has basket grouping permissions, don't display javascript popup for confirmation
 - if user has basket grouping permissions, after closing the basket redirect him to a page which asks which basketgroup to affect the basket to (with possibility to create a new basketgroup)
  - when done with this, redirect him to basketgrouping.pl to be able to print the basketgroup at once
 - factor out basket closing code from booksellers.pl (what was it doing there anyways?)
2009-09-30 11:30:27 +02:00
John Soros
a456bfd2da small typo fix in basket.pl template 2009-09-30 11:30:27 +02:00
Jean-André Santoni
de83a9fccb This adds pagination on pending orders in acquisitions 2009-09-30 11:30:26 +02:00
Paul Poulain
1d2eec4a60 HTML fixes 2009-09-30 11:30:26 +02:00
Paul Poulain
eba29b259b merge error : reintroducing ajax.tmpl 2009-09-30 11:30:26 +02:00
Paul Poulain
d57230bc3c small typo changes 2009-09-30 11:30:25 +02:00
Paul Poulain
3e8409147c text change (minor) 2009-09-30 11:30:25 +02:00
Paul Poulain
efa5294f98 BUGFIX : colspan wrong 2009-09-30 11:30:24 +02:00
Paul Poulain
aa708232fe partial fix for mantis #1498 2009-09-30 11:30:24 +02:00
Paul Poulain
85c9138b35 removing useless code (copied from addbiblio) 2009-09-30 11:30:23 +02:00
Paul Poulain
8680aa7b9e acqui-home new links to budget and dealing with budget instead of bookfund 2009-09-30 11:30:20 +02:00
Paul Poulain
5d2168303d add order line through z3950 search 2009-09-30 11:30:20 +02:00
Paul Poulain
862822283d uncertainprices
uncertainprice is set on z3950 or staged file import
2009-09-30 11:30:19 +02:00
Paul Poulain
732f54cad4 order recieve
* deal with granular perms
* deal with item creation syspref if applicable
2009-09-30 11:30:18 +02:00
Paul Poulain
d2ddf02705 basketgrouping management
Note: this one will be rewritten very soon (graphically)
2009-09-30 11:30:18 +02:00
Paul Poulain
5ec3a57986 addorderiso2709
add order from a staged iso2709 file
2009-09-30 11:30:18 +02:00
Paul Poulain
f807360373 supplier management changes
* deal with granular permissions
* deal with GST at bookseller level
2009-09-30 11:30:17 +02:00
Paul Poulain
1b757f479a parcels management
* deal with granular perms
* deal with bookseller level GST
2009-09-30 11:30:17 +02:00
Paul Poulain
5a6d8e7f7c basket header management 2009-09-30 11:30:17 +02:00
Paul Poulain
e288d6a738 neworderempty, changes
* deal with import from staged file
* deal with z3950 import
* deal with granular permissions
* deal with uncertain price
* deal with create item if SysPref set to create items on ordering
2009-09-30 11:30:17 +02:00
Paul Poulain
bdbc60a3ba new order management
* manage granular permissions
* deal with z3950 import
2009-09-30 11:30:17 +02:00
Paul Poulain
dee8119996 basket management
lot of new things:
* basket now explicitely created
* they can have a name, a bookseller note, a private (library) note, a contract attached
* deal with granular permissions
* feature to delete a basket
* feature to close/reopen a basket

in template, add link to fill a basket from a z3950 search or from a staged file
2009-09-30 11:30:16 +02:00
Paul Poulain
b7507a4d01 booksellers page, some changes
* deal with granular permissions
* feature to reopen basket
2009-09-30 11:30:16 +02:00
Paul Poulain
d22e1e8a46 removing useless code * bookfund.pl (replaced by budgets.pl) * spent.pl (useless now) 2009-09-30 11:30:16 +02:00
Garry Collum
01760bdf1c Bug 3416: Fixes filter on parcels.tmpl.
Changes the action of the form on parcels.tmpl from "post" to "get."  Otherwise the filter is not functional.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-16 08:17:20 -04:00
Garry Collum
8957376e2e Bug 3415: Adds highlighting to tables in parcel.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-16 08:17:09 -04:00
Garry Collum
e42bb2feac Bug 3414: Cleanup and xhthml correction of parcels.tmpl
Fixes several xhtml in parcels.tmpl and enables highlighting within its data table.  Removes unnecessary variable from parcels.pl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-16 08:17:04 -04:00
Garry Collum
4cd469fe2e Bug 2889: Removed unused toggle variables from booksellers.pl. Added table highlighting to booksellers.tmpl.
Removed unused toggle and line(even) variables from booksellers.pl.  Added highlighting to the two display tables in booksellers.tmpl.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-12 09:58:54 -05:00
74e2741063 Minor markup corrections for validity.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-08 13:50:14 -05:00
Joe Atzberger
d5dbaf2a6d orderreceive cleanup
Convert to GetBranchesLoop, remove unused variables.
Pull out params that are assigned the same value in each loop and just assign them once.
Pull out params that are assigned the same value in each half of the conditional, and just assign them unconditionally.
Remove useless call of $template->param($count).

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-08 12:30:36 -05:00
Joe Atzberger
dc8745c469 Remove unused TMPL variable.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-08 12:30:25 -05:00
Nahuel ANGELINETTI
83dc3588de (bug #3084) in baskets, change the isbn of column
this patch add a new column and put the isbn in it.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-03 18:31:05 -05:00
Joe Atzberger
01230ccd5e Minor rework of template js.
Lines explicitly ended with semicolons.  Allow some better behavior if TMPL_VAR's
are undefined or zero.

Note FIXME added.  I believe this is part of the fragmentary integration of
Katipo code for GST.  Would be obliged if someone with access there can confirm.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-02-02 08:20:50 -06:00
ef612e5667 Providing options for adding to order when existing record search has failed.
I've duplicated the "Add to Order" block on the search results page to display after a user has searched for an existing record to add to an order. This block is displayed whether or not results were found on the assumption that a non-empty result set may not contain the desired result. Changes to neworderbiblio.pl allow supplier name to appear in breadcrumb nav.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-01-06 19:09:29 -06:00
f4fcd9e35a Fix for Bug 2700, Keeping Data When Adding Multiple Items
When cloning the set of inputs, the new js
increments the IDs of each form field (to keep them unique) and automatically
selects the option that was selected in the cloned group.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-01-05 16:37:07 -06:00
755b509cd6 Steamlining javascript for cloning additem block and tweaking style.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-22 16:30:48 -05:00
0a33d4554b Markup corrections, style fixes, and other minor bugs, including fix for Bug 2679 ("Dates Changing on Funds When Editing")
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-22 13:34:36 -05:00
182f9df495 More fixes for Bug 2600, enabling the appearance of HTML tags in item titles. Resubmission.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-26 09:06:13 -05:00
0dcd876e6a Trying again: Standardizing styling of error messages; other markup corrections.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-16 21:23:54 -05:00
7b2e4ebce2 A few more en-US spelling corrections; Markup corrections; Standardizing on "email" instead of "e-mail"; Copying isbn-formatting from opac-detail.pl to detail.pl;
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-09 10:53:02 -05:00
730ef80520 Spelling corrections: organisation->organization, authorise->authorize, catalogue->catalog
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-02 15:43:29 -05:00
Galen Charlton
a670f1817e bug 2509: fix file permissions
Following suggestion by Vincent Danjean for Debian
packaging, 0755 -> 0644 for non-executable
files.

Also removed shebang from a few modules in C4.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-21 18:55:02 -05:00
Ryan Higgins
fa28afba18 BUG 2351 : Add duplicate barcode check prior to receiving multiple items. This patch adds a javascript form check for duplicates in-form, and returns an error if there are duplicates in the catalog.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-27 06:05:18 -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
Andrew Moore
66c420c3d0 bug 1980: updateing calls to SimpleSearch to limit number of things returned
C4::Search::SimpleSearch was alredy patched to let you pass in the number of results you want back.
These instances were not using the new API. This patch makes all calls to SimpleSearch specify a limit.

I improved the documentation of SimpleSearch a bit to include the third returned value.

I believe there's a bug in C4::Output::pagination_bar, in that it doesn't deal well with URLs
with only one pair of parameter=value passed to it. I'm getting around this by passing in a second
pair that does nothing.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-10 09:11:24 -05:00