Commit graph

240 commits

Author SHA1 Message Date
Ryan Higgins
c9a35c1089 cleanup parcel.pl and tmpl
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 15:07:04 -06:00
Ryan Higgins
4b089e1eee updates to acqui - first of several commits
bug fixes to display and save publishercode and purchase order numbers.
use invoice number in place of parcel code
fix template apparently allowing user to modify biblio details on add/mod order
removing CGI scrolling_list

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 15:07:02 -06:00
Galen Charlton
4ad5df9655 fixed C4::Dates usage that caused crash of orderreceive.pl
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-25 09:08:36 -06:00
Joe Atzberger
ca4ba92f21 basket.pl - conditionalized w/ $debug 3 warnings that would otherwise fire every time!
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-12 07:55:07 -06:00
Joshua Ferraro
d7ec5d8aaa cleanup of acqui/ for Dates, missing format_date 2007-12-04 19:06:05 -06:00
Joe Atzberger
a7d1ef6dff acqui subdir - Dates.pm integration and warnings fixes.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-04 18:21:09 -06:00
Joe Atzberger
bfcc5b00f9 Dates.pm - ongoing integration, acqui/histsearch.pl
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-04 17:28:17 -06:00
aee15ef86f Another fix for But 1165. All taken care of now, I hope.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-26 19:59:25 -06:00
1fb6279ddd A couple of changes towards fixing Bug 1165 (GST in PROG templates)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-26 19:49:17 -06:00
Ryan Higgins
271aa9043d Adding MARC preview to acqui screens
Also cleaning up some missing params and language.
Add another js library: greyox (jquery derivative iiuc).

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-25 22:15:08 -06:00
Paul POULAIN
c903276aec bugfix : we need to give the booksellerid to the biblio search
(otherwise, it will be empty, and a constraint will fail, making the input fail as well)

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-20 16:23:24 -06:00
Paul POULAIN
8b7085a8ab removing useless code
the 3 parameters :
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),

are filled by Auth.pm automatically, removing them in templates

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-24 17:03:38 -05:00
Chris Cormack
606ecb532a Patch from Joe Atzberger to remove $Id$ and $Log$ from scripts
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-18 16:27:04 -05:00
paul
a5bd240321 FIX for Date calculation
Rule :
- always format_date() before sending date to template
- always format_date_in_iso immediatly after reading a date coming from a parameter
- deal internally only with dates in iso

Note that :
- I could not test things related to issues stats due to the my DB -issues.issuedate not filled, see commit about 3.00.00.006
- acquisitions_stats does not work when you filter on date

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-11 11:51:12 -05:00
Paul POULAIN
b81f961b7f acquisition, parcel recieve : Changing column order & title and adding totals
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-26 05:29:53 -05:00
33f8001652 Cleaning up acquisitions, adding breadcrumbs, adding resident search. Other minor corrections.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-25 14:46:51 -05:00
Chris Cormack
c2439d23fd Re-adding the link to the spent budget breakdown
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-07 22:06:22 -05:00
Paul POULAIN
720bc7b37a adding supplier deletion feature.
A supplier can be deleted ONLY if it has NO basket

Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-16 06:56:00 -05:00
Paul POULAIN
ec2ec47418 removing the notes field from parcel recieve.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-09 09:51:43 -05:00
Paul POULAIN
07bb924327 changing permissions of some acqui scripts
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-09 09:49:27 -05:00
kados
40af15d8e6 changing permissions on templates and scripts 2007-08-07 13:20:51 -05:00
jmf@arwen.metavore.com
c0d85e87b4 From 0751ba130288bc69e9e563473e7fc25551edc40e Mon Sep 17 00:00:00 2001
From: kados <jmf@arwen.metavore.com>
Date: Sat, 4 Aug 2007 20:10:51 -0500
Subject: [PATCH] fixing permissions on all scripts

Signed-off-by: Chris Cormack <crc@arwen.metavore.com>
2007-08-04 22:41:41 -05:00
hdl
a7301fdfc6 Adding startdate and enddate parameters to GetBookfundBreakdown call. 2007-05-28 15:28:28 +00:00
tipaul
35fae6a9e4 bugfixes for acquisition module 2007-05-04 13:59:53 +00:00
hdl
3bb7467df9 GetBorrower changed into GetMember 2007-04-25 08:40:51 +00:00
hdl
100e6a9808 functions that were in C4::Interface::CGI::Output are now in C4::Output.
So this implies quite a change for files.
Sorry about conflicts which will be caused.
directory Interface::CGI should now be dropped.
I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
2007-04-24 13:54:28 +00:00
hdl
0b66bd800d Code Cleaning Members.
- checkaccount and getborraccountno => GetBorrowerAcctRecord

Many changes in names,
some changes in function signature.
Will be detailed in a mail to kohadevel.
2007-04-23 13:10:07 +00:00
tipaul
eba2552086 Code cleaning of Biblio.pm (continued)
All subs have be cleaned :
- removed useless
- merged some
- reordering Biblio.pm completly
- using only naming conventions

Seems to have broken nothing, but it still has to be heavily tested.
Note that Biblio.pm is now much more efficient than previously & probably more reliable as well.
2007-03-29 16:45:53 +00:00
tipaul
a481fad4b7 Code cleaning :
== Biblio.pm cleaning (useless) ==
* some sub declaration dropped
* removed modbiblio sub
* removed moditem sub
* removed newitems. It was used only in finishrecieve. Replaced by a Koha2Marc+AddItem, that is better.
* removed MARCkoha2marcItem
* removed MARCdelsubfield declaration
* removed MARCkoha2marcBiblio

== Biblio.pm cleaning (naming conventions) ==
* MARCgettagslib renamed to GetMarcStructure
* MARCgetitems renamed to GetMarcItem
* MARCfind_frameworkcode renamed to GetFrameworkCode
* MARCmarc2koha renamed to TransformMarcToKoha
* MARChtml2marc renamed to TransformHtmlToMarc
* MARChtml2xml renamed to TranformeHtmlToXml
* zebraop renamed to ModZebra

== MARC=OFF ==
* removing MARC=OFF related scripts (in cataloguing directory)
* removed checkitems (function related to MARC=off feature, that is completly broken in head. If someone want to reintroduce it, hard work coming...)
* removed getitemsbybiblioitem (used only by MARC=OFF scripts, that is removed as well)
2007-03-29 13:30:31 +00:00
tipaul
f8e9fb6445 rel_3_0 moved to HEAD (introducing new files) 2007-03-09 15:34:17 +00:00
tipaul
70501283b3 rel_3_0 moved to HEAD 2007-03-09 14:41:32 +00:00
tipaul
2ffd5b7228 rel_3_0 moved to HEAD 2007-03-09 14:28:54 +00:00
tipaul
dde8417990 1st commit for rel_3_0 => HEAD branch move (to test) 2007-03-09 14:27:05 +00:00
tgarip1957
4843e0ee78 Resynching Savannah 2006-11-15 01:41:51 +00:00
tgarip1957
90452ff0cc Add faceted search code 2006-09-28 14:13:37 +00:00
tgarip1957
3818a8dc38 A new acquisition to handle different tax values to each item, receiving multiple baskets as one parcel, stricter rules for biblio and item creation 2006-09-20 21:44:36 +00:00
bob_lyon
212b12972f Adding ability to return biblio results from acquisition search that contain no items
- to aviod making orphan biblios
2006-09-05 21:21:21 +00:00
toins
7be8934406 C4::SearchMarc is deprecated now. 2006-08-10 12:58:17 +00:00
toins
582dff118c POD updated. 2006-08-07 13:17:42 +00:00
toins
d2c5f7f93f fix bad link. 2006-08-02 08:22:53 +00:00
toins
9d09386b39 newordersuggestion.pl replaces suggestion-select.pl 2006-08-02 08:16:46 +00:00
toins
a3834db092 neworderempty.pl replaces newbiblio.pl 2006-08-02 08:06:02 +00:00
toins
baf5ee015e neworderbiblio.pl replaces newbasket2.pl 2006-08-02 07:55:19 +00:00
toins
2de0c38671 fix bad link. 2006-08-01 15:33:52 +00:00
toins
0554a91421 Some SQL code moved into Acquisition.pm 2006-08-01 15:04:33 +00:00
toins
6ea714e0b3 Change link to order.pl to booksellers.pl 2006-08-01 15:03:19 +00:00
toins
04720ffed8 order.pl renamed to booksellers.pl 2006-08-01 14:53:12 +00:00
toins
8f4236e009 POD added. 2006-08-01 10:17:33 +00:00
toins
7181726db0 Fix some broken links & renamed some function.
FIXME : Where is finishreceive.tmpl ?
2006-08-01 08:33:11 +00:00
toins
81940b035b GetBasketContent renamed to GetOrders. 2006-08-01 08:30:58 +00:00
toins
7c986b6872 Add a call to GetOrderNumber 2006-08-01 08:30:15 +00:00
toins
f3c7dbf1cf $selected deleted. 2006-08-01 08:29:36 +00:00
toins
cb21ac2d85 GetAllOrders renamed to GetPendingOrders. 2006-08-01 08:29:02 +00:00
toins
c74eb3afcc Add a call to Acquisition.pm 2006-07-31 16:03:46 +00:00
toins
1d11938205 fix minor bug in POD. 2006-07-31 15:59:03 +00:00
toins
6b4c17318f FIXME added. 2006-07-31 14:49:56 +00:00
toins
7407dd09df POD added, Call to Bookseller.pm added. Some functions has been renamed/changed/rewrited... 2006-07-31 14:45:37 +00:00
toins
5fa061f247 POD added. Call to Bookfund.pm & Bookseller.pm added. Some sub renamed/API changed. 2006-07-31 14:40:54 +00:00
toins
a30329db0b GPL & POD added, 2006-07-31 14:30:45 +00:00
toins
7fdf61bffb Call to Bookfund.pm & Bokkseller.pm added. POD added. 2006-07-31 14:11:57 +00:00
toins
6e5b99c397 Subs renamed 2006-07-31 14:10:59 +00:00
toins
1b7b90cd0d Code cleaned. POD added. Subs renamed/rewrited/added.... 2006-07-31 09:31:58 +00:00
toins
f29cf68086 Code cleaned. POD added & some subs renamed/rewrited/added... 2006-07-31 09:29:45 +00:00
toins
f3bba2c2b3 Code cleaned. POD added & somes sub renamed/rewrited. 2006-07-27 15:08:32 +00:00
toins
228f92e857 Code cleaned. POD added. Some sub renamed & API changed. 2006-07-27 14:20:39 +00:00
toins
fa9ecea842 add a call to Bookseller.pm 2006-07-27 13:32:41 +00:00
toins
6e0de1a68e syntax error fixed. 2006-07-27 13:29:51 +00:00
toins
3fd0bb0ed9 Code cleaned. GPL & POD added. Sub renamed. 2006-07-26 10:27:47 +00:00
toins
bd85aad550 Code cleaned. POD added. Sub renamed. 2006-07-26 09:57:33 +00:00
toins
02e37f2ee6 Call to Bookfund Added. 2006-07-25 12:41:55 +00:00
toins
3eca757a27 Code cleaning : POD added & some functions has been changed. 2006-07-24 07:42:28 +00:00
toins
53b6b7f439 this file has been renamed by orderreceive.pl 2006-07-21 14:55:48 +00:00
toins
514964c751 Code cleaning : POD added, GPL header added, SQL queries moved on modules. 2006-07-21 14:43:37 +00:00
toins
6c9724209f this file has been changed by parcels.pl 2006-07-13 14:49:51 +00:00
toins
98f9060c4d this file has been changed by parcel.pl 2006-07-13 14:49:33 +00:00
toins
6ab4ebf38e this file replaces acquire.pl 2006-07-13 14:25:27 +00:00
toins
1b4addad16 this file replaces recieve.pl 2006-07-13 14:25:01 +00:00
toins
dee72643a8 this file replaces recieveorder.pl 2006-07-13 14:24:18 +00:00
toins
d8babfb6ea bad merge corrected. 2006-07-13 09:30:05 +00:00
sushi
c2822e30ed big change from Katipo.
------------------------------
- Results for 'mutli orders with matching titles attached to same bibitem'  now split into new .tmpl file, "acquire-multi-order.tmpl".
- this script/tmpl does 3 things!?!, pulled search results out of acquire.pl, now points to searchresults.tmpl.
- little fix to display correct supplier info in acquire.pl's 'detail' view.
- Little fix on previous commit, now doesnt break single order acquire view.
- Fix for RT:698 https://staff.katipo.co.nz/rt/Ticket/Display.html?id=698.
- now display correct supplier title when 0 results returned.
- Now pickes up basketno, to display as url to tmpl.
- Adding in fix for bibitems with more than one matching order.
- Rolled back to prod version, added 'create new bib-group' fix.
- Mason's ACQ fixes from HLT-DEV , work in progress
- Now does a lookup in aqorders, for all existing orders matching  biblioitems, then presents all matching orders in a table. this feature can be overridden by calling acquire.pl with multiorderseach=n in url, acquire.pl will instead go to specific order.
- Now catches, and returns to acquire.pl if newitems() fails.
- Now takes a barcodeerror value as arg.
- 'create new biblioitems' checkbox now only apears for bibitems with >= 1 items attached.
- adding stuff to let hlt have an accession date link from moredetail.tmpl
  that actually does something other than break biblioitems - not working yet
- Added output for volume as well as volumeddesc
- Added volume description to output loop
- Making change for bug #3676 displaying date unformatted
- More bugfixing this time a bug not saving volume info
- Fix for bug 3529, allow freight to be distributed among the items
- added a sprintf to get the number displaying in normal notation
- Altered the auto_barcode to actually get something other than 1
  but now got a problem with the result displaying in scientific notation
2006-07-12 14:56:52 +00:00
toins
989ca91339 Sub renamed & GPL Licence added. 2006-07-07 07:51:41 +00:00
toins
21a410129c Sub renamed according to the coding guidelines 2006-07-07 07:51:02 +00:00
toins
b4ce3dbfb7 Head & rel_2_2 merged 2006-07-04 13:35:29 +00:00
sushi
0dd1e735fe OOPS, adding back Joshua's changes.
Adds script support for IntranetNav ... see mail to koha-devel for
details.
Adds support for intranetstylesheet system pref in Koha scripts.
Adds support for intranetcolorstylesheet.
2006-06-07 19:49:11 +00:00
sushi
daa46804dc perltidy before commit. 2006-06-07 19:33:33 +00:00
sushi
4e8e426629 slight change in receiveorder() call, added bookfund arg. bookfund now updated during receive for HLT.
Mason's ACQ fixes from HLT-DEV , work in progress.

Adding code to check existing orders in basket to avoid duplication of rows.

Addorder() now allows the user to select whether: the bibitem for the order will be an existing bibitem, or a newly created  bibitem.

adding back in the part the saves the edit page's changes.

Fix for bug 3589, can now order and receive donations in one go.

Fixing a bug, acquisitions wasnt making a new biblioitem when needed.
2006-06-07 19:25:59 +00:00
sushi
4d97bc7dbc perltidy before next commit. 2006-06-07 19:14:06 +00:00
plg
59ffd549c7 Improve SQL formatting (following coding guidelines) 2006-06-07 11:03:17 +00:00
sushi
16954a80eb Merging Katipo changes.
Fix for bug 3589, can now order and receive donations in one go.
Also a fix to allow user to create a new item, attached to an exisiting bibitem.
2006-06-07 04:29:10 +00:00
sushi
64e9fde761 perltidy before commit. 2006-06-07 04:01:00 +00:00
sushi
48b5cebb0b *** empty log message *** 2006-06-07 03:55:54 +00:00
sushi
7bd1980eca Merging Katipo changes.
call to receiveorder() now takes $bookfund as arg.
Mason's ACQ fixes from HLT-DEV , work in progress
Added regex to convert & to %26 before redirect to receive.pl.
Now has error alert for blank barcode field, and little tidyup.
finishreceive.pl now updates aqorder table's order record with lastest added biblioitem for that order, so ordersearch() now returns the acq-orders most recently created bibitem info, instead of the initally created biblitem info.
Now redirects back to acquire.pl if barcode exists or newitems() fails.
Now allows user to create a new biblioitem/item using a checkbox.
Adding option so magazines make new biblioitems as well as items - in testing stage
adding in the update for the replacement cost on the item table when editing a received order via
adding a bit to allow hlt to edit received order bit and not fail on duplicate barcode
added elsif to handle dup barcode error.
Fix to handle dup barcodes for newitem(), displays error the goes back to acquire.pl.
Now checks to see if newly created item is currently reserved.
Fix for the receive periodicals bit
Catching any errors when making items
More bugfixing this time a bug not saving volume info
Fix for bug 3529, allow freight to be distributed among the items
Now saves modified fields.
2006-06-07 03:47:50 +00:00
sushi
ad249c82d8 Merging Katipo changes. 2006-06-07 03:30:44 +00:00
sushi
14fa887bbe perltidy before commit. 2006-06-07 03:25:01 +00:00
sushi
8b927e8593 perltidy before commit. 2006-06-07 02:59:10 +00:00
sushi
2ee33de5ef Merging Katipo changes.
Got acqui homepage actually displaying suggestions - only displayed count before - need to get the suggestedby diplaying borrowers name rather than id number.
Showing budget breakdowns.
Slight alteration - let $status be an input parameter.
2006-06-07 02:45:26 +00:00
sushi
9d1c8fa9d2 perltidy before next commit. 2006-06-07 02:36:24 +00:00
sushi
1574910cb7 Merging Katipo changes.
adding html highlight toggling.
2006-06-07 02:22:12 +00:00
rangi
90ffdc7dfd Merging Katipo changes
Script to breakdown the amount committed (ordered but not received) of a particular budget
2006-06-07 02:17:54 +00:00
rangi
62053c1686 Merging from Katipo work
Script to show the breakdown of the amount spent in a budget
2006-06-07 01:53:15 +00:00