Commit graph

35 commits

Author SHA1 Message Date
4b69538f9b Fix for Bug 4913 - Budget pages should show currency name instead of symbol
This patch adds a new include file to handle the display of the active
currency name and a warning if no currency is active.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 15:13:55 +13:00
bd28366523 Fix for Bug 4980 - Acq: pull down 'Restrict access to:' for funds not translatable
Applied Owen's patch to current head, updated de-DE translation. The pull down values are now  translated.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:16:50 +13:00
Nicole Engard
d5eb56dd52 bug 5019 remove link to funds
This patch renames the link to budgets to say 'budgets & funds'
and removes the links to funds (which went no where).

This patch also adds the acq menu to the budget pages.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 14:50:02 +13:00
Alex Arnaud
be8c7f9dd1 (bug #4523) possibility to show / hide the filters menu
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 20:37:17 -04:00
Jean-André Santoni
7233544f8b Select in budget add forum
Sorted the branches select.
Modified display to "branchcode - branchname"
Fixed a bug, selection was inverted.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 14:22:34 -04:00
Katrin Fischer
a18bdb0bfe BUG 4883: Staff - remove \n from strings for translation
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:09:09 -04:00
Garry Collum
1e9c425950 Bug 4827: Fixes library drop-down list in aqbudgets.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:11 -04:00
9329c40b6b fix template translation issues
Alternative to Henri-Damien's patch that does not
require putting CSS style information in the Perl code.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 09:28:08 -04:00
Alex Arnaud
e4addf296f (BUG #4388) aqbudgets.pl: add a column in the table for display the total spent of level and sublevels
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 06:42:51 -04:00
Alex Arnaud
8eac9d8180 (BUG #4360) aqbudgets.pl: Adding the hierarchy of budgets in the tooltip
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 06:42:49 -04:00
cd921163c0 Fixes for Bug 3089, Date entry fields should indicate required date format
- Added include, date-format.inc, which shows format, e.g. "(DD/MM/YYYY)"
- Hint shows expected date format based on system preference
- Removing calendar.inc include from templates which don't use it

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:12:18 -05:00
Nicole Engard
2616faf132 follow-up to bug 3854: resolve budget period language issues
top level: "Root Budget" becomes "Budget"
second level: "Budget" becomes "Fund"
third level and below: "Sub-Budget" is also a "Fund", but for things
like the "create sub-budget" link, they'll be changed to "create child
fund".

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:11:19 -05:00
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
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
39904f9415 [MT2343] Changed the name of the Filter button, and lowered it 2010-01-28 15:11:43 +01:00
Jean-André Santoni
e7753ce465 [2343] Fix currency not showing in aqbudgets 2010-01-28 15:11:43 +01:00
a078297d1f Fix for Bugs 3998, 3968. Includes other markup corrections and reformats
Bug 3998: Confusing warning on budget add page
Bug 3968: Empty Blue Box Pop Up

- Removed warning, made budget amount a required field.
- Added conditional logic to prevent display of tooltip when there is no content
- Moved filter form into sidebar
- Changed Budgets.pm to pass an ID to a form field
- Improvements to breadcrumbs and title tags
- Restructured budgets admin toolbar to match existing toolbar patterns:
  "new," "edit," etc.
2010-01-20 22:31:58 +01:00
Nicole Engard
317cd79c4d Bugs 3854 & 3855 Minor title and text fixes 2009-12-22 19:14:52 +01:00
Jean-André Santoni
6f06ae5663 [MT2343] Modified display of Budget Parent to show budget code 2009-12-20 14:31:26 +01:00
Jean-André Santoni
4e2f453e41 [MT2343] Renamed "Budget for period" into "Root Budget" 2009-12-20 14:31:25 +01:00
Jean-André Santoni
1e84ae30c1 [MT2343] Removed the hint for Amount and display Amount as mandatory 2009-12-20 14:31:25 +01:00
Jean-André Santoni
6dcf3f4e9e [MT2343] Added help in the budget adding form 2009-12-20 14:31:25 +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
Garry Collum
df781f3901 Bug 3962: Additional patch to fix XHTML errors in aqbudgets.tmpl. 2009-12-20 14:28:55 +01:00
Garry Collum
cf87a81c06 Bug 3962: Fixes XHTML errors in aqbudgets.tmpl.
Fixes the DOCTYPE, <title> and other XHTML errors in aqbudgets.tmpl.
2009-12-20 14:28:52 +01: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
Nahuel ANGELINETTI
5ddc0e4ad6 [biblibre-newacq](bug #3611) use jquery table sorter
This patch, modify tables to use the jquery plugin to sort tables.
2009-09-30 11:30:32 +02:00
Nahuel ANGELINETTI
c9938f63e2 (bug #3611) some UI fixes
Delete "Select budget period"
and Rename title to "Budget filters"
2009-09-30 11:30:32 +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
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
3e8409147c text change (minor) 2009-09-30 11:30:25 +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
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