Commit graph

127 commits

Author SHA1 Message Date
Nahuel ANGELINETTI
6fc455f4b6 (bug #3622) fix supplier url 2009-09-30 11:30:39 +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
Nahuel ANGELINETTI
c9b4e53ed3 Show table text on top. 2009-09-30 11:30:37 +02:00
Paul Poulain
937e0d73df fix for #3620: basket management
- basket.pl: updating display, formatting dates,
- neworderempty: updating display, removing useless code, using ACQ framework if it exist. The ACQ framework will be used for creating items record during acquisitions. If it does not exist, default is used instead (which has many more informations, lot of them being irrelevant during acquisition, like the barcode)
- new order from imported batch: rewrite of the workflow. Now uses neworderempty and changing status of import_record to 'imported'
- s/copyrightdate/publicationyear/ as it's what libraries uses when ordering
- fixing some warnings
-
2009-09-30 11:30:34 +02:00
Paul Poulain
89c0cda081 [replace previous] fix for 3612 (bookseller improvements)
- removing useless fields from aqbooksellers table: specialty, deliverydays,followupdays,followupscancel,nocalc, invoicedisc They were in the DB schema, but unused for years
- reworked bookseller and contract gui
- no warning thrown

NOTE : updatedatabase not done for field removal in aqbooksellers table. Should have:
ALTER TABLE `aqbooksellers`
  DROP `deliverydays`,
  DROP `followupdays`,
  DROP `followupscancel`,
  DROP `specialty`,
  DROP `nocalc`;
2009-09-30 11:30:34 +02:00
Paul Poulain
0e42e52b01 small 1st changes in basketgrouping (#3622)
a lot more to come.
2009-09-30 11:30:34 +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
51fc22831b MT 1496 : Close basket 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
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