Commit graph

10702 commits

Author SHA1 Message Date
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
2d90fb22d4 fix for 1431 point 2: orders and orders_items also moved to new biblionumber now 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
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
Paul Poulain
1d2eec4a60 HTML fixes 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
b147973091 fixing acqui-search.pl
removing useless & bugguy code (reference to bookfund)
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
eba29b259b merge error : reintroducing ajax.tmpl 2009-09-30 11:30:26 +02:00
Paul Poulain
521bb9654d code cleaning
* removed unused sub in Budgets.pm
* lot of cleaning in aqplan.pl
* typo changes in aqplan.tmpl
2009-09-30 11:30:25 +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
1664c47420 bugfixing & improving budgets managements
* the budget hierarchy had been removed by the merge by mistake
* don't limit the authorized_values list, show all of them
* cleaning & reindenting
2009-09-30 11:30:25 +02:00
Paul Poulain
d57230bc3c small typo changes 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
3e8409147c text change (minor) 2009-09-30 11:30:25 +02:00
Paul Poulain
7486cdea99 bugfix: haspermission API 2009-09-30 11:30:24 +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
efa5294f98 BUGFIX : colspan wrong 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
f2c14ed083 BUGFIX new_acq (Javascript error under certain circumstances)
the parent_id must be displayed even for the 1st budget, otherwise, javascript error
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
fa13689c2d removing use strict problem 2009-09-30 11:30:23 +02:00
Paul Poulain
cb6def8d4d removing hardcoded reference 2009-09-30 11:30:23 +02:00
Paul Poulain
85c9138b35 removing useless code (copied from addbiblio) 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
80227720fe merging new_acq fix: budget_parent dropbox was wrong
(Probably need to patch SAN-OP branch as well)
2009-09-30 11:30:23 +02:00
Paul Poulain
d3256680a2 merging new_acq fix: missing links 2009-09-30 11:30:23 +02:00
Paul Poulain
92c4f24f34 merging new_acq fix: error in SQL files 2009-09-30 11:30:22 +02:00
Paul Poulain
90141c2b32 Test script, removing Bookfund references 2009-09-30 11:30:22 +02:00
Paul Poulain
9389c0becc Suggestions.pm, probably useless & not working (check with hdl) 2009-09-30 11:30:22 +02:00
Paul Poulain
74302d7570 Serials, use Budget instead of Bookfund 2009-09-30 11:30:22 +02:00
Paul Poulain
95e571df60 check errors (not new_acq related) 2009-09-30 11:30:22 +02:00
Paul Poulain
11eb4b57af replace bookfunds by budgets & remove warns 2009-09-30 11:30:22 +02:00
Paul Poulain
03d9a79878 suggestions changes (probably useless)
and incompatible with hdl stuff
2009-09-30 11:30:22 +02:00
Paul Poulain
1b854fab9d changing form to post method (not new_acq related) 2009-09-30 11:30:21 +02:00
Paul Poulain
fb8131e531 replacing links to bookfunds into budgets 2009-09-30 11:30:21 +02:00
Paul Poulain
7b088a1590 moredetails, link to basket if applicable 2009-09-30 11:30:21 +02:00
Paul Poulain
1f343690b2 additem.js (not sure it's related to new_acq) 2009-09-30 11:30:21 +02:00
Paul Poulain
0284aa9f95 contract admin search
(forgotten file)
2009-09-30 11:30:21 +02:00
Paul Poulain
332e09b3cb changes in acquisition toolbar to deal with new features 2009-09-30 11:30:21 +02:00
Paul Poulain
a33e1ad9cb Change links to budgets instead of bookfunds 2009-09-30 11:30:21 +02:00