Commit Graph

547 Commits

Author SHA1 Message Date
Owen Leonard 3f45f621e6 Fix for Bug 3970, Warn user when there is no active currency
- Adds warning to budget admin pages
- Adds warning to currency admin page

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-02 18:43:09 -05:00
Nahuel ANGELINETTI dc9991d9b4 (MT823) add the possibility to have enrolment end date
this patch add the possibility to have an end date of enrolment, instead of a period. Like for a user category, all this category can have the same expiry date.
The librarian can configure one of both, but not both.
2010-01-28 15:11:55 +01:00
Jean-André Santoni 73605d792f [MT2590] Removed root budget duplicate checkings 2010-01-28 15:11:52 +01:00
Matthias Meusburger 0b5cc8f809 MT2345 : Changes on contracts 2010-01-28 15:11:51 +01:00
Paul Poulain c85e22ad53 aqbudget display, minor changes
- removed 2 total that means nothing (and were troubling users)
- reindented a little (removed tab)
2010-01-28 15:11:50 +01:00
Jean-André Santoni 0ed6bcdabb [MT1234] Huge rewritte to use the API instead of hardcoded SQL in the script
Also fixes a bug in the template.
2010-01-28 15:11:44 +01:00
Jean-André Santoni 10c9610058 [MT1234] Code cleaning 2010-01-28 15:11:44 +01:00
Jean-André Santoni 2a84ad3223 [MT1234] Fixed aqcontract breadcrumb 2010-01-28 15:11:44 +01:00
Jean-André Santoni 922ae0b782 [MT1234] Replaced useless selectbox in the title of contact form 2010-01-28 15:11:44 +01:00
Jean-André Santoni e7753ce465 [2343] Fix currency not showing in aqbudgets 2010-01-28 15:11:43 +01:00
Galen Charlton b6c043147f final fix for sysprefs merge, hopefully
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:33:14 -05:00
Galen Charlton 0c3fde5cd3 handle error if no active currency is defined
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:30:22 -05:00
Galen Charlton 2c9e28e63e fix silly typo
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:19:13 -05:00
Galen Charlton 880a2088ad bugfix - fix compilation error
Reflect change of GetLocalCurrency to GetCurrency
in new_acq

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 08:58:26 -05:00
Galen Charlton 8ad2c7d7ac Merge commit 'pianohacker-koha/prefs-submit' into master
Merge in Jesse Weaver's system preference editor changes.

Conflicts:
	C4/Bookfund.pm
	koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
	koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 20:26:17 -05:00
Henri-Damien LAURENT d339abf0bf Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community
Conflicts solved:
	Makefile.PL
	installer/data/mysql/en/mandatory/sysprefs.sql
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2010-01-20 23:16:34 +01:00
Frédéric Demians b407a95fb8 Add OverdueNoticeBcc syspref required by overdue_notices.pl 2010-01-15 10:19:26 +01:00
Chris Cormack 89b3e11356 Can now add rental discounts - wr62194 2010-01-15 10:14:55 +01:00
Chris Nighswonger c44d08bff2 [22/30] Adding a syspref to limit the number of images which can be stored in the db at any one time by the Patron Card image managera
This will keep the db a sane size. Setting this to NULL will result in no
    limit being enforced.
2010-01-11 18:21:16 -05:00
Nahuel ANGELINETTI 5aad8d7591 Authtypecode return an warning even if subfield is ignored
this patch just add a condition to the sql request to return a warning
only if authtypecode is not in an ignored subfield.
2009-12-31 10:54:26 +01:00
Jean-André Santoni 23b356105a [MT2343] Select in budget add forum
Sorted the branches select.
Modified display to "branchcode - branchname"
Fixed a bug, selection was inverted.
2009-12-20 14:31:23 +01:00
Jean-André Santoni b14efbc832 [MT2343] Prevents Koha to format total amount in budget period add/edit form
+ Forgot a "my"
2009-12-20 14:31:21 +01:00
Jean-André Santoni b641eb0fce [MT2338] Fixed the missing content in the "active" column 2009-12-20 14:31:12 +01:00
Nahuel ANGELINETTI 5ed631c850 (bug #3802) fix branch deletion checks
This fix checks that are done when a branch is deleted, and the message shown.
Now it check for borrowers and items attached to the deleted branch.
2009-11-23 10:35:25 +01:00
Nahuel ANGELINETTI e88fbd627b (bug #3801) fix itemtype administration
This delete all code related to renewals allowed in itemtype administration.
2009-11-23 10:34:44 +01:00
Jesse Weaver cdb3d52423 Move jumping functionality to search
This moves the "Jump to name preference functionality" to the search
bar: if your search term is found to be the exact name of a syspref,
then it is jumped to instead of executing a normal search.
2009-11-04 20:36:08 -07:00
Jesse Weaver 870abd703b Fix handling of pref defaults (#3747, #3588) 2009-11-03 21:27:30 -07: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
Henri-Damien LAURENT da49fc77df 3736 enh : Adding syspref RoutingListAddReserves
Adding syspref RoutingListAddReserves
Using it in routing-preview
2009-10-29 15:29:04 +01:00
Paul Poulain 209b614eb1 fixing currency.pl
if active not set, mySQL complains for a missing argument
2009-10-28 17:51:56 +01:00
Paul Poulain ad1e018667 removing warn and reindenting
+ \\n fixes (for error message better display)
2009-10-28 17:51:20 +01:00
Henri-Damien LAURENT fd75507a55 (bug #3370) add keyword to MARC field mapping
This add the support of keyword => MARC field mapping, ton abstract the relation between human readable fields like subtitle, title, authors, location, ... and MARC fields in each framework.
This will allow to koha developper to be more flexible with each framework and don't care about the MARC flavour, just require some "keywords" to the user.

Conflicts solved :
	C4/Biblio.pm
	installer/data/mysql/kohastructure.sql
	installer/data/mysql/updatedatabase30.pl
	kohaversion.pl

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-30 11:30:42 +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 d399ff3494 [biblibre-newacq](bug #3611) fix user interface and others
This big patch, fix xhtml code, and user interface.
It Delete the term of budget period and use it as "Root Budget".
It add improvment on UI, adding tooltip, and table tree.
2009-09-30 11:30:34 +02:00
Henri-Damien LAURENT 0f015abd99 smart-rules : clonerules enhancement
Cloning rules should be available as soon as there is one rule
2009-09-30 11:30:33 +02:00
Nahuel ANGELINETTI 29ed0f384b [biblibre-newacq](bug #3611) fix aqbudgets.pl page
do not show total available if total is zero.
Adding a budget, does not show the available parent budgets.
2009-09-30 11:30:32 +02:00
Henri-Damien LAURENT e3a9d21d6e Improving and bug fixing admin/aqbudgets
Adding FormatData and FormatNumber in C4::Output
Using them
Adding duplication detection for budget periods
Factorizing some code
2009-09-30 11:30:30 +02:00
Henri-Damien LAURENT d1416ed8a7 Removing fines getting from user search on budgets administration 2009-09-30 11:30:29 +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
Matthias Meusburger 96fc46e2e1 MT 1717 : Opac descriptions for authorised values 2009-09-30 11:30:28 +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 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
Mason James 5022a8583a big aqplan commit v2 for mantis:1177 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 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 1d4fb38a27 planning management
for each budget period and budget, the library can enter planning on branches, itemtype, month or any auth_value selected as planning category for a given budget
2009-09-30 11:30:16 +02:00
Paul Poulain 4ec7a86abe Budget management
* budget period management
* budget management (budgets lines are defined for a given budget period)

budget_owner_search is the popup to select a librarian as budget owner
2009-09-30 11:30:16 +02:00
Paul Poulain 25fe55509b removing aqbudget & aqbookfund
* aqbookfund is now useless
* aqbookbudget will be replaced by a aqbudgets, that is a new one.
2009-09-30 11:30:15 +02:00