Commit graph

371 commits

Author SHA1 Message Date
Jean-André Santoni
c6027e73c5 Fixed a major bug in ModReceiveOrder
Orders were not splited correctly.
2010-01-28 15:11:53 +01:00
Jean-André Santoni
022978d4f4 [MT2593] Added "ordered" column in acqui-home budget display 2010-01-28 15:11:52 +01:00
Matthias Meusburger
0b5cc8f809 MT2345 : Changes on contracts 2010-01-28 15:11:51 +01:00
Matthias Meusburger
5f61beed72 MT2408 : UI Changes / CSV Export 2010-01-28 15:11:48 +01:00
Matthias Meusburger
d8a71ebd61 MT 2426 : Default currency is chosen for price calculation when bookseller's listprice is NULL 2010-01-28 15:11:47 +01:00
Nicole Engard
b5312a17cb Bugs: 3965, 3979, 3981 - GST changes in acquisitions
This patch fixes three bugs:

Bug 3965: gist sys pref not taken into account
 changed it so that GST does not show on basket if gist pref set to 0
 changed it so that GST fields don't appear on vendor record if gist pref=0

Bug 3979: gst options not lining up
 fixed layout on vendor add/edit form so GST radio buttons line up right

Bug 3981: GST confusing in en-US
 there is no GST in the US and so GST changed to 'Tax' in templates

Also, a small spacing fix was made to the path on the basket grouping
template.
2009-12-22 19:14:52 +01:00
231ea7c341 Bug 2505 enabling warnings 2009-12-20 14:31:35 +01:00
Matthias Meusburger
9f41fe64be MT 2050, Follow-up, Fast Cataloging
Adds granular permissions for cataloging
Also adds a link from the circulation home to fast cataloging when fast cataloging is active
2009-11-24 10:05:10 +01:00
Henri-Damien LAURENT
a9ae673ba1 followup finishreceive.pl 2009-11-19 17:34:27 +01:00
Paul Poulain
0e91f6ae0f reindenting and removing tmpl_if in doc-head-close 2009-11-17 17:57:41 +01:00
Jean-André Santoni
03c51600a0 [3.2.x](bug #3623) Alternative 2 pages layout for hte PDF
This new template shows the order list of all the baskets in one big table.
2009-11-17 16:27:12 +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
7e872e0a1f [3.2.x](bug #3623) PDF printing enhancements
Renamed pdfformat to OrderPdfFormat and created OrderPdfTemplate to stock the PDF in the database.
Added a new type of syspref nammed "Upload".
Rewritte, translation and cleaning of the PDF template.
2009-11-03 16:35:29 +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
748b9db276 fixing "close basket and create basket group" feature
the checkbox was not functional, now it is.
2009-10-30 13:49:39 +01:00
Henri-Damien LAURENT
b22bde5263 Acquisition : Fixing
neworderempty : problems with data updates
booksellers.tmpl : TMPL_VAR not in comments
list_price becomes listprice in neworderempty script as in acq.js
2009-10-30 01:56:20 +01:00
Henri-Damien LAURENT
1ec6e3df73 Change in API : ordnum becomes ordernumber 2009-10-30 00:30:47 +01:00
Paul Poulain
a1fe8bae96 removing hardcoded value 2009-10-29 17:56:44 +01:00
Paul Poulain
dc85da1830 suggestions improvements and fixes
- reindenting Suggestions.pm
- removing useless code in acqui-home.pl & fixing # of pending suggestion display
- add suggestion to order : displaying for selection suggestions accepted by the librarian (and reindenting)
- XHTMLing acqui-home (& removed useless parts)


NOTE ABOUT XHTML (could be useful) : <tfoot> must be BEFORE <tbody> in a <table>, even if, of course, it is displayed after.
2009-10-29 17:56:44 +01:00
Henri-Damien LAURENT
89b5bf0272 MT 2206 addorder crashing 2009-10-26 15:33:21 +01:00
Henri-Damien LAURENT
7d9cb654b1 Bug Fixing addorder.pl 2009-10-20 12:24:07 +02: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
Henri-Damien LAURENT
d948e8ba42 Merge fixes and removing warnings 2009-09-30 11:30:40 +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
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
Nahuel ANGELINETTI
0659caf40f [biblibre-newacq] fix some merge errors
This patch add some variable definition that have been deleted during merge.
2009-09-30 11:30:31 +02:00
Nahuel ANGELINETTI
fa6d109d35 [biblibre-newacq] (bug #3616) fix neworderempty
if there is no budget, neworderempty dies, this must not happen.
This patchs fix it.
2009-09-30 11:30:31 +02:00
Nahuel ANGELINETTI
ba09e94b80 [biblibre-newacq](bug #3615) fix getmember call
GetMember() is not used well, this fix.
2009-09-30 11:30:31 +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
Henri-Damien LAURENT
38b61303bd Bug Fixing : 1st Step Bookfund has become Budgets
More bug fixing on Suggestions and Budgets
2009-09-30 11:30:29 +02:00
Jean-André Santoni
e62ffd49b0 This adds the Editor Number in the PDF (basketgrouping) 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
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
51fa4a3f6a Chenge database structure to not delete an order line when biblio gets deleted 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
John Soros
89f1d2f0d5 Added displaying of seriestitle and volume in basket content listing page, next to the title, see bug http://suivi.biblibre.com/view.php?id=1410 2009-09-30 11:30:26 +02:00
Paul Poulain
aef645e9e5 removing 2 warnings 2009-09-30 11:30:26 +02:00
Paul Poulain
a84c939253 merge fix 2009-09-30 11:30:26 +02:00
Paul Poulain
9308599dee merge fix : recieving 2009-09-30 11:30:26 +02:00
Paul Poulain
5386a0cab8 (mantis 1475) uncertains price, don't set if we find a price in MARC 2009-09-30 11:30:25 +02:00
Paul Poulain
d347b15163 budgfixing budgets & planning and code cleaning
* fix a bug for new orders budget : the Asort1 was displayed by default. Now, it's the sortN_authcat of the 1st budget (the one selected by default)
* change in GetBudgetAuthCats : returns all auth values used by at least one budget (not Asort* categories, as previously)
* code cleaning in GetAuthvalueDropbox (and select aqbudgets.* instead of *, to avoid data corruption due to duplicate column name)
2009-09-30 11:30:25 +02:00
Paul Poulain
afe4ecb94e sanop specific : sorting itemtype
should not be ported to head, as it's a dirty unimarc hack, that will disappear with itemtype at item level
2009-09-30 11:30:25 +02:00
Mason James
5022a8583a big aqplan commit v2 for mantis:1177 2009-09-30 11:30:25 +02:00
Paul Poulain
1894ea54b2 improvement/bugfix : search budget
* there can be more than 1 active period. This has been added to deal with temporary budgets (like "10000€ to spent in the next 3 months")
* all active budgets are retrieved
* budget available for everyone now displayed correctly

also :
* fixing some hardcoded values
* removing a warn
2009-09-30 11:30:24 +02:00
Paul Poulain
a6e15a3ea3 merge fix : biblionumber lost 2009-09-30 11:30:24 +02:00
Paul Poulain
7fb98fe7fe bugfixing haspermission API 2009-09-30 11:30:24 +02:00
Paul Poulain
5ffb9f6a72 removing warn for empty variable 2009-09-30 11:30:24 +02:00
Paul Poulain
9c002b6b68 bugfixinf haspermission API call 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
cb6def8d4d removing hardcoded reference 2009-09-30 11:30:23 +02:00
Paul Poulain
6954a92632 dealing with login as root (mySQL login)
previously, you got a nasty Perl error
2009-09-30 11:30:23 +02:00
Paul Poulain
a368cb9a3f merge fixes
* BiblioAddAuthorities is moved to Search.pm
* missing param in addorder + 'ITEM' specified
* updatedatabase fix
2009-09-30 11:30:23 +02:00
Paul Poulain
315ce98a7d printing ordergroup
* the .odt contains the pages 1 & 2. Pages 3 to X contains the basket, and are generated on the fly. Page 1 contains a general header, and page 2 contains the list of baskets (with totals)
* the .pdf contains the pdf generated from the .odt
* the .pm contains the sub to generate the PDF from the .pdf file
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
f8c62633f9 updatesupplier
deal with gst at supplier level
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
5a57fb9a10 lateorders, deal with granular perms 2009-09-30 11:30:19 +02:00
Paul Poulain
1247509b2a finishreceive
* deal with granular perms
* deal with AddItem syspref
* fix a little bit API & variable names
2009-09-30 11:30:19 +02:00
Paul Poulain
1dbd3ab96c links on acqui-home, deal with budgets, granular perms and API changes 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
b6d78c5104 newordersuggestion
* deal with granular perms
* deal with uncertain prices
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
e1670255b2 addorder changes
* deal with granular permissions
* deal with uncertain prices
* replace bookfund by budget
* changes in API
* create items if syspref set
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
59d0f2268e Forgotten js & pl webservice 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
615d659364 removal of bookfund.pm references 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
Henri-Damien LAURENT
8802bbf5fe Editing C4::Suggestions.pm
Enhancing C4::SearchSuggestion
And changing its API
Changing C4::Suggestions API taking a hashref for NewSuggestion and ModSuggestion

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-30 11:29:23 +02:00
Henri-Damien LAURENT
4271bbb738 Modifying Members : Add Mod and GetMember
This update the way Member is added and editing so that import and Edition
 could be best automatized
GetMember evolves and allow ppl to serach on a hash of data

Adding SQLHelper A new package to deal with INSERT UPDATE and SELECT

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-30 11:29:23 +02: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
7e49156687 Bug 2553: Fixes drop-down alphabetization in acquisitions - New order and Receive order.
Fixes alphabetization of library dropdown in New Order, and the shelf location, item type, and collection code in the Receive Items pages.  This patch takes care of Joann's original purpose of creating the bug enhancement.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-20 21:14:18 -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
Joe Atzberger
248e0392e2 Multi-bug fix - SetMarcUnicodeFlag for records coming from Koha
This has bearing on bugs 2905, 2665, 2514 and other "wide character" crashes
related to diacritics and Unicode.  This should help open the door for reliable
input of diacriticals via acquisitions.

MARC21_utf8_flag_fix.pl diagnoses and fixes existing problems with MARC data
affected by the bug.

Adding SetMarcUnicodeFlag to TransformKohaToMarc prevents the bug from corrupting
further data.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-18 09:14:43 -05:00
Joe Atzberger
403e96c69b perltidy finishreceive.pl and two comments added
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-08 12:30:57 -05:00
Joe Atzberger
f20a415803 parcel.pl cleanup
It looks like a lot of change, but it isn't much:
perltidy, removed unused "toggle" code, and corrected comments.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-08 12:30:52 -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
ccee815f4a Bug 2617: Add strict (and warnings), partial fix.
These are some of the simpler scripts to add strict to.
Corrected perldoc for Bookfund.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-11 08:36:55 -05:00
James Winter
a6b7e85293 bug 2703: Changed spent.pl select statment to include joins between tables.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-06 10:36:19 -06:00
Joe Atzberger
8b402f82df Prevent js failure if syspref "gist" is undefined.
The javascript is malformed and therefore fails the onsubmit check if
gist does not receive a value.  This patch allows failover to default 0.
Also removed an unused dbh.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-02-02 08:20:54 -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
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
Galen Charlton
4bf76c2d77 bug 2615: remove unneeded 'require Exporter'
Most Perl scripts (as opposed to modules) do
not need to require Exporter.

No user-visible or documentation changes.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-26 09:05:08 -05:00
Paul POULAIN
0f568a8aff fix for #2440 : acquisition recieve & item creation
It has to be reintroduced, as some (most in France) libraries don't create
items on recieve, but after "equipment" step.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-08 15:09:22 -05:00
Chris Nighswonger
a6c829e2bf kohabug 2390 Setting default fund for new orders
If a new order was created and no fund selected, a db error was thrown due to the
'bookfundid' field being set to NULL. This patch sets the first fund retrieved from
available funds as the default selection in the scrolling list.

A further enhancement might be to allow the library to choose which fund is the
default fund.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-27 06:10:09 -05:00
Ryan Higgins
0d7265bd73 Populate items.cn_source in acq receive. However, items.cn_sort is not calculated. See bug 2403.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-27 06:05:22 -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
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
Ryan Higgins
cf3ba2a822 BUGFIX 2387 : Pass vendor id to subsequent pages in neworder search from existing biblio.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-24 11:26:13 -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