Commit graph

300 commits

Author SHA1 Message Date
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