[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.
This commit is contained in:
Nahuel ANGELINETTI
Henri-Damien LAURENT
parent
7e895a17a3
commit
d399ff3494
|
|
@ -532,9 +532,8 @@ sub GetBudgetHierarchy {
|
|||
|
||||
# add indent
|
||||
my $depth = $r->{depth} * 2;
|
||||
my $space = pack "A[$depth]";
|
||||
$r->{budget_code_indent} = $space . $r->{budget_code};
|
||||
$r->{budget_name_indent} = $space . $r->{budget_name};
|
||||
$r->{budget_code_indent} = $r->{budget_code};
|
||||
$r->{budget_name_indent} = $r->{budget_name};
|
||||
foreach my $r3 (@sort) {
|
||||
if ($r3->{budget_id} == $r->{budget_parent_id}) {
|
||||
$parent = $i2;
|
||||
|
|
@ -546,7 +545,7 @@ sub GetBudgetHierarchy {
|
|||
$r->{budget_code_indent} = $r->{budget_code};
|
||||
$r->{budget_name_indent} = $r->{budget_name};
|
||||
}
|
||||
|
||||
|
||||
if (defined $parent) {
|
||||
splice @sort, ($parent + 1), 0, $r;
|
||||
} else {
|
||||
|
|
@ -575,7 +574,7 @@ sub GetBudgetHierarchy {
|
|||
|
||||
$r->{'budget_spent'} = GetBudgetSpent( $r->{'budget_id'} );
|
||||
|
||||
$r->{'budget_amount_total'} = $r->{'budget_amount'} + $r->{'budget_amount_sublevel'} ;
|
||||
$r->{'budget_amount_total'} = $r->{'budget_amount'};
|
||||
|
||||
# foreach sub-levels
|
||||
my $unalloc_count ;
|
||||
|
|
@ -584,14 +583,8 @@ sub GetBudgetHierarchy {
|
|||
my $sub_budget = GetBudget($sub);
|
||||
|
||||
$r->{budget_spent_sublevel} += GetBudgetSpent( $sub_budget->{'budget_id'} );
|
||||
$unalloc_count += $sub_budget->{'budget_amount'} + $sub_budget->{'budget_amount_sublevel'};
|
||||
$unalloc_count += $sub_budget->{'budget_amount'};
|
||||
}
|
||||
|
||||
$r->{budget_unalloc_sublevel} = $r->{'budget_amount_sublevel'} - $unalloc_count;
|
||||
|
||||
if ( scalar @subs_arr == 0 && $r->{budget_amount_sublevel} > 0 ) {
|
||||
$r->{warn_no_subs} = 1;
|
||||
}
|
||||
}
|
||||
return \@sort;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ my $budget_period_hashref= $input->Vars;
|
|||
#my $sort1_authcat = $input->param('sort1_authcat');
|
||||
#my $sort2_authcat = $input->param('sort2_authcat');
|
||||
|
||||
my $pagesize = 10;
|
||||
my $pagesize = 20;
|
||||
$searchfield =~ s/\,//g;
|
||||
|
||||
my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
|
||||
|
|
|
|||
|
|
@ -71,9 +71,11 @@ my $budget_permission = $input->param('budget_permission');
|
|||
my $budget_period_dropbox = $input->param('budget_period_dropbox');
|
||||
#filtering non budget keys
|
||||
delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash;
|
||||
my $filter_budgetname = $input->param('filter_budgetname');
|
||||
my $filter_budgetbranch = $input->param('filter_budgetbranch');
|
||||
|
||||
my $filter_budgetname = $input->param('filter_budgetname');
|
||||
$template->param(
|
||||
notree => ($filter_budgetbranch or $show_mine)
|
||||
);
|
||||
# ' ------- get periods stuff ------------------'
|
||||
# IF PERIODID IS DEFINED, GET THE PERIOD - ELSE JUST GET THE ACTIVE PERIOD BY DEFAULT
|
||||
my $period = GetBudgetPeriod($$budget_hash{budget_period_id});
|
||||
|
|
@ -138,16 +140,14 @@ if ($op eq 'add_form') {
|
|||
}
|
||||
push @values, '';
|
||||
# if no buget_id is passed then its an add
|
||||
my $budget_parent_dropbox;
|
||||
my $budget_parent_id = $budget->{'budget_parent_id'} if $budget;
|
||||
$budget_parent_dropbox = CGI::scrolling_list(
|
||||
-name => 'budget_parent_id',
|
||||
-values => \@values,
|
||||
-default => $budget_parent_id ? $budget_parent_id : undef,
|
||||
-size => 10,
|
||||
-style => "min-width:100px;",
|
||||
-labels => \%labels,
|
||||
);
|
||||
my $budget_parent;
|
||||
my $budget_parent_id;
|
||||
if ($budget){
|
||||
$budget_parent_id = $budget->{'budget_parent_id'} ;
|
||||
}else{
|
||||
$budget_parent_id = $input->param('budget_parent_id');
|
||||
}
|
||||
$budget_parent = GetBudget($budget_parent_id);
|
||||
|
||||
# build branches select
|
||||
my $branches = GetBranches;
|
||||
|
|
@ -187,7 +187,8 @@ if ($op eq 'add_form') {
|
|||
$template->param(
|
||||
add_validate => 1,
|
||||
dateformat => C4::Dates->new()->visual(),
|
||||
budget_dropbox => $budget_parent_dropbox,
|
||||
budget_parent_id => $budget_parent->{'budget_id'},
|
||||
budget_parent_name => $budget_parent->{'budget_name'},
|
||||
budget_perm_dropbox => $budget_perm_dropbox,
|
||||
branchloop_select => \@branchloop_select,
|
||||
%$period,
|
||||
|
|
@ -208,17 +209,16 @@ if ($op eq 'add_form') {
|
|||
);
|
||||
# END $OP eq DELETE_CONFIRM
|
||||
# called by delete_confirm, used to effectively confirm deletion of data in DB
|
||||
} else {
|
||||
} else{
|
||||
if ( $op eq 'delete_confirmed' ) {
|
||||
my $rc = DelBudget($budget_id);
|
||||
}
|
||||
if ( $op eq 'add_validate' ) {
|
||||
}elsif( $op eq 'add_validate' ) {
|
||||
if ( defined $$budget_hash{budget_id} ) {
|
||||
ModBudget( $budget_hash );
|
||||
} else {
|
||||
AddBudget( $budget_hash );
|
||||
}
|
||||
}
|
||||
}
|
||||
my $branches = GetBranches();
|
||||
my $budget_period_dropbox = GetBudgetPeriodsDropbox($$period{budget_period_id} );
|
||||
$template->param(
|
||||
|
|
@ -226,20 +226,20 @@ if ($op eq 'add_form') {
|
|||
budget_id => $budget_id,
|
||||
%$period,
|
||||
);
|
||||
|
||||
my $moo = GetBudgetHierarchy($$period{budget_period_id}, C4::Context->userenv->{branchcode}, $show_mine?$borrower_id:'');
|
||||
my @budgets = @$moo; #FIXME
|
||||
|
||||
my $toggle = 0;
|
||||
my @loop;
|
||||
my $period_total = 0;
|
||||
my ( $period_alloc_total, $base_alloc_total, $sub_alloc_total, $base_spent_total, $base_remaining_total );
|
||||
my ( $period_alloc_total, $base_alloc_total, $base_spent_total, $base_remaining_total );
|
||||
|
||||
use YAML;
|
||||
$debug && warn Dump(@budgets);
|
||||
#This Looks WEIRD to me : should budgets be filtered in such a way ppl who donot own it would not see the amount spent on the budget by others ?
|
||||
|
||||
foreach my $budget (@budgets) {
|
||||
|
||||
# PERMISSIONS
|
||||
unless($staffflags->{'superlibrarian'} % 2 == 1 ) {
|
||||
#IF NO PERMS, THEN DISABLE EDIT/DELETE
|
||||
|
|
@ -280,14 +280,12 @@ if ($op eq 'add_form') {
|
|||
# adds to total - only if budget is a 'top-level' budget
|
||||
$period_alloc_total += $budget->{'budget_amount_total'} if $budget->{'depth'} == 0;
|
||||
$base_alloc_total += $budget->{'budget_amount'};
|
||||
$sub_alloc_total += $budget->{'budget_amount_sublevel'};
|
||||
$base_spent_total += $budget->{'budget_spent'};
|
||||
$budget->{'budget_remaining'} = $budget->{'budget_amount'} - $budget->{'budget_spent'};
|
||||
$base_remaining_total += $budget->{'budget_remaining'};
|
||||
|
||||
# if amount == 0 dont display...
|
||||
delete $budget->{'budget_unalloc_sublevel'} if $budget->{'budget_unalloc_sublevel'} == 0 ;
|
||||
delete $budget->{'budget_amount_sublevel'} if $budget->{'budget_amount_sublevel'} == 0 ;
|
||||
|
||||
$budget->{'remaining_pos'} = 1 if $budget->{'budget_remaining'} > 0;
|
||||
$budget->{'remaining_neg'} = 1 if $budget->{'budget_remaining'} < 0;
|
||||
|
|
@ -312,7 +310,6 @@ if ($op eq 'add_form') {
|
|||
budget_period_total => $budget_period_total,
|
||||
period_alloc_total => $num->format_price($period_alloc_total),
|
||||
base_alloc_total => $num->format_price($base_alloc_total),
|
||||
sub_alloc_total => $num->format_price($sub_alloc_total),
|
||||
base_spent_total => $num->format_price($base_spent_total),
|
||||
base_remaining_total => $num->format_price($base_remaining_total),
|
||||
period_remaining_total => $num->format_price( $period_alloc_total - $base_alloc_total ),
|
||||
|
|
|
|||
|
|
@ -64,33 +64,30 @@ if ($parent) {
|
|||
$sth->execute( $parent->{'budget_id'} );
|
||||
my $sum = $sth->fetchrow_hashref;
|
||||
$sth->finish;
|
||||
|
||||
$sub_unalloc = $parent->{'budget_amount_sublevel'} - $sum->{sum};
|
||||
|
||||
|
||||
$sub_unalloc = $parent->{'budget_amount'} - $sum->{sum};
|
||||
|
||||
# TRICKY.. , IF THE PARENT IS THE CURRENT PARENT - THEN SUBSTRACT CURRENT BUDGET FROM TOTAL
|
||||
if ( $budget->{'budget_parent_id'} == $parent_id ) {
|
||||
$sub_unalloc += ( $budget->{'budget_amount'} + $budget->{'budget_amount_sublevel'} );
|
||||
$budget_period_unalloc += ( $budget->{'budget_amount'} + $budget->{'budget_amount_sublevel'} );
|
||||
}
|
||||
$sub_unalloc += $budget->{'budget_amount'} if ( $budget->{'budget_parent_id'} == $parent_id ) ;
|
||||
}
|
||||
|
||||
# ELSE , IF NO PARENT PASSED, THEN CHECK UNALLOCATED FOR PERIOD, IF NOT THEN RETURN 2
|
||||
else {
|
||||
my $query = qq| SELECT (SUM(budget_amount_sublevel) + SUM(budget_amount)) as sum
|
||||
my $query = qq| SELECT SUM(budget_amount) as sum
|
||||
FROM aqbudgets WHERE budget_period_id = ?|;
|
||||
|
||||
my $sth = $dbh->prepare($query);
|
||||
$sth->execute( $period->{'budget_period_total'} );
|
||||
$sth->execute( $period_id );
|
||||
$period_sum = $sth->fetchrow_hashref;
|
||||
$sth->finish;
|
||||
$budget_period_unalloc = $period->{'budget_period_total'} - $period_sum->{'sum'};
|
||||
$budget_period_unalloc = $period->{'budget_period_total'} - $period_sum->{'sum'} if $period->{'budget_period_total'};
|
||||
}
|
||||
|
||||
if ( $parent_id) {
|
||||
if ( $total > $sub_unalloc ) {
|
||||
if ( ($total > $sub_unalloc ) && $sub_unalloc ) {
|
||||
$returncode = 1;
|
||||
}
|
||||
} elsif ( $total > $budget_period_unalloc ) {
|
||||
} elsif ( ( $total > $budget_period_unalloc ) && $budget_period_unalloc ) {
|
||||
$returncode = 2;
|
||||
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -2320,7 +2320,6 @@ CREATE TABLE `aqbudgets` (
|
|||
`budget_name` varchar(80) default NULL,
|
||||
`budget_branchcode` varchar(10) default NULL,
|
||||
`budget_amount` decimal(28,6) NULL default '0.00',
|
||||
`budget_amount_sublevel` decimal(28,6) NULL default '0.00',
|
||||
`budget_encumb` decimal(28,6) NULL default '0.00',
|
||||
`budget_expend` decimal(28,6) NULL default '0.00',
|
||||
`budget_notes` mediumtext,
|
||||
|
|
|
|||
|
|
@ -3024,6 +3024,12 @@ COMMENT
|
|||
SetVersion ($DBversion);
|
||||
}
|
||||
|
||||
$DBversion = "3.01.00.115";
|
||||
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
|
||||
$dbh->do("ALTER table aqbudgets drop column budget_amount_sublevel;");
|
||||
print "Upgrade to $DBversion done drop column budget_amount_sublevel from aqbudgets\n";
|
||||
SetVersion ($DBversion);
|
||||
}
|
||||
|
||||
|
||||
=item DropAllForeignKeys($table)
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
// YUI Toolbar Functions
|
||||
function yuiToolbar() {
|
||||
var periods_menu = [
|
||||
{ text: _("Display all periods"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl" },
|
||||
{ text: _("New period"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" },
|
||||
{ text: _("Duplicate period"), },
|
||||
{ text: _("Display all root budgets"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl" },
|
||||
{ text: _("New root budget"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" },
|
||||
{ text: _("Duplicate root budget"), },
|
||||
]
|
||||
new YAHOO.widget.Button({
|
||||
type: "menu",
|
||||
label: _("Budget periods"),
|
||||
label: _("Root Budgets"),
|
||||
name: "periods_button",
|
||||
menu: periods_menu,
|
||||
container: "periods_menuc"
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
//]]>
|
||||
</script>
|
||||
<ul class="toolbar">
|
||||
<li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Budget periods</a></li>
|
||||
<li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Root budgets</a></li>
|
||||
<li id="budgets_menuc"><a id="budgets_menu" href="/cgi-bin/koha/cataloguing/addbiblio.pl">Budgets</a></li>
|
||||
<li id="planning_menuc"><a id="planning_menu" href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Budget planning</a></li>
|
||||
|
||||
|
|
|
|||
|
|
@ -65,14 +65,6 @@ YAHOO.util.Event.onContentReady("header_search", function() {
|
|||
<!-- /TMPL_LOOP -->
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<input type="hidden" name="budget_period_id" value="<!-- TMPL_VAR NAME="budget_period_id" -->" />
|
||||
<input type="submit" class="submit" name="filter" value="Submit" />
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@
|
|||
|
||||
function yuiToolbar() {
|
||||
var periods_menu = [
|
||||
{ text: _("Display all periods"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl" },
|
||||
{ text: _("New period"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" },
|
||||
{ text: _("Edit period '<!-- TMPL_VAR NAME="budget_period_description" -->'"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" },
|
||||
{ text: _("Duplicate period"), },
|
||||
{ text: _("Display all root budgets"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl" },
|
||||
{ text: _("New root budget"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" },
|
||||
{ text: _("Edit root budget '<!-- TMPL_VAR NAME="budget_period_description" -->'"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" },
|
||||
{ text: _("Duplicate root budget"), },
|
||||
]
|
||||
|
||||
// IF THERE IS NO BUDGETS DEFINED YET, THEN DISPLAY PERIOD BUTTON *ONLY*
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
new YAHOO.widget.Button({
|
||||
type: "menu",
|
||||
label: _("Budget periods"),
|
||||
label: _("Root Budgets"),
|
||||
name: "periods_button",
|
||||
menu: periods_menu,
|
||||
container: "periods_menuc"
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
</script>
|
||||
<ul class="toolbar">
|
||||
|
||||
<li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Budget periods</a></li>
|
||||
<li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Root Budgets</a></li>
|
||||
|
||||
|
||||
<!-- TMPL_UNLESS NAME="period_button_only" -->
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
13
koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/treetable/jquery.treeTable.min.js
vendored
Normal file
13
koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/treetable/jquery.treeTable.min.js
vendored
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
/* jQuery treeTable Plugin 2.2.3 - http://ludo.cubicphuse.nl/jquery-plugins/treeTable/ */
|
||||
(function($){var options;var defaultPaddingLeft;$.fn.treeTable=function(opts){options=$.extend({},$.fn.treeTable.defaults,opts);return this.each(function(){$(this).addClass("treeTable").find("tbody tr").each(function(){if(!options.expandable||$(this)[0].className.search("child-of-")==-1){if(isNaN(defaultPaddingLeft)){defaultPaddingLeft=parseInt($($(this).children("td")[options.treeColumn]).css('padding-left'),10);}
|
||||
initialize($(this));}else if(options.initialState=="collapsed"){this.style.display="none";}});});};$.fn.treeTable.defaults={childPrefix:"child-of-",clickableNodeNames:false,expandable:true,indent:19,initialState:"collapsed",treeColumn:0};$.fn.collapse=function(){$(this).addClass("collapsed");childrenOf($(this)).each(function(){if(!$(this).hasClass("collapsed")){$(this).collapse();}
|
||||
this.style.display="none";});return this;};$.fn.expand=function(){$(this).removeClass("collapsed").addClass("expanded");childrenOf($(this)).each(function(){initialize($(this));if($(this).is(".expanded.parent")){$(this).expand();}
|
||||
$(this).show();});return this;};$.fn.appendBranchTo=function(destination){var node=$(this);var parent=parentOf(node);var ancestorNames=$.map(ancestorsOf($(destination)),function(a){return a.id;});if($.inArray(node[0].id,ancestorNames)==-1&&(!parent||(destination.id!=parent[0].id))&&destination.id!=node[0].id){indent(node,ancestorsOf(node).length*options.indent*-1);if(parent){node.removeClass(options.childPrefix+parent[0].id);}
|
||||
node.addClass(options.childPrefix+destination.id);move(node,destination);indent(node,ancestorsOf(node).length*options.indent);}
|
||||
return this;};$.fn.reverse=function(){return this.pushStack(this.get().reverse(),arguments);};$.fn.toggleBranch=function(){if($(this).hasClass("collapsed")){$(this).expand();}else{$(this).removeClass("expanded").collapse();}
|
||||
return this;};function ancestorsOf(node){var ancestors=[];while(node=parentOf(node)){ancestors[ancestors.length]=node[0];}
|
||||
return ancestors;};function childrenOf(node){return $("table.treeTable tbody tr."+options.childPrefix+node[0].id);};function getPaddingLeft(node){var paddingLeft=parseInt(node[0].style.paddingLeft,10);return(isNaN(paddingLeft))?defaultPaddingLeft:paddingLeft;}
|
||||
function indent(node,value){var cell=$(node.children("td")[options.treeColumn]);cell[0].style.paddingLeft=getPaddingLeft(cell)+value+"px";childrenOf(node).each(function(){indent($(this),value);});};function initialize(node){if(!node.hasClass("initialized")){node.addClass("initialized");var childNodes=childrenOf(node);if(!node.hasClass("parent")&&childNodes.length>0){node.addClass("parent");}
|
||||
if(node.hasClass("parent")){var cell=$(node.children("td")[options.treeColumn]);var padding=getPaddingLeft(cell)+options.indent;childNodes.each(function(){$(this).children("td")[options.treeColumn].style.paddingLeft=padding+"px";});if(options.expandable){cell.prepend('<span style="margin-left: -'+options.indent+'px; padding-left: '+options.indent+'px" class="expander"></span>');$(cell[0].firstChild).click(function(){node.toggleBranch();});if(options.clickableNodeNames){cell[0].style.cursor="pointer";$(cell).click(function(e){if(e.target.className!='expander'){node.toggleBranch();}});}
|
||||
if(!(node.hasClass("expanded")||node.hasClass("collapsed"))){node.addClass(options.initialState);}
|
||||
if(node.hasClass("expanded")){node.expand();}}}}};function move(node,destination){node.insertAfter(destination);childrenOf(node).reverse().each(function(){move($(this),node[0]);});};function parentOf(node){var classNames=node[0].className.split(' ');for(key in classNames){if(classNames[key].match("child-of-")){return $("#"+classNames[key].substring(9));}}};})(jQuery);
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
/* jQuery TreeTable Core 2.0 stylesheet
|
||||
*
|
||||
* This file contains styles that are used to display the tree table. Each tree
|
||||
* table is assigned the +treeTable+ class.
|
||||
* ========================================================================= */
|
||||
|
||||
/* jquery.treeTable.collapsible
|
||||
* ------------------------------------------------------------------------- */
|
||||
.treeTable tr td .expander {
|
||||
background-position: left center;
|
||||
background-repeat: no-repeat;
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
zoom: 1; /* IE7 Hack */
|
||||
}
|
||||
|
||||
.treeTable tr.collapsed td .expander {
|
||||
background-image: url(../images/toggle-expand-dark.png);
|
||||
}
|
||||
|
||||
.treeTable tr.expanded td .expander {
|
||||
background-image: url(../images/toggle-collapse-dark.png);
|
||||
}
|
||||
|
||||
/* jquery.treeTable.sortable
|
||||
* ------------------------------------------------------------------------- */
|
||||
.treeTable tr.selected, .treeTable tr.accept {
|
||||
background-color: #3875d7;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.treeTable tr.collapsed.selected td .expander, .treeTable tr.collapsed.accept td .expander {
|
||||
background-image: url(../images/toggle-expand-light.png);
|
||||
}
|
||||
|
||||
.treeTable tr.expanded.selected td .expander, .treeTable tr.expanded.accept td .expander {
|
||||
background-image: url(../images/toggle-collapse-light.png);
|
||||
}
|
||||
|
||||
.treeTable .ui-draggable-dragging {
|
||||
color: #000;
|
||||
z-index: 1;
|
||||
}
|
||||
|
|
@ -89,8 +89,8 @@
|
|||
<dt><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></dt>
|
||||
<dd>Define currencies and exchange rates used for acquisitions.</dd>
|
||||
|
||||
<dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budget periods</a></dt>
|
||||
<dd>Define your budget periods</dd>
|
||||
<dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root Budgets</a></dt>
|
||||
<dd>Define your root budgets</dd>
|
||||
|
||||
<dt><a href="/cgi-bin/koha/admin/aqcontract.pl">Acquisition (contracts)</a></dt>
|
||||
<dd>Define the contracts you have with booksellers. Used for stat purposes</dd>
|
||||
|
|
|
|||
|
|
@ -60,14 +60,14 @@
|
|||
|
||||
<!-- TMPL_IF name="add_form" -->›
|
||||
<!-- TMPL_IF name="budget_period_id" -->
|
||||
Modify budget period'<!-- TMPL_VAR name="budget_period_id" -->'
|
||||
Modify root budget'<!-- TMPL_VAR name="budget_period_id" -->'
|
||||
<!-- TMPL_ELSE -->
|
||||
Add budget period
|
||||
Add root budget
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF name="delete_confirm" -->›
|
||||
Delete budget period '<!-- TMPL_VAR name="budget_period_description" -->'?
|
||||
Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'?
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- TMPL_IF name="delete_confirmed" -->›
|
||||
Data Deleted
|
||||
|
|
@ -95,21 +95,21 @@
|
|||
<!-- TMPL_IF name="add_form" -->
|
||||
<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budget periods</a> ›
|
||||
<!-- TMPL_IF name="budget_period_id" -->
|
||||
Modify period <!-- TMPL_VAR name="budget_period_description" -->
|
||||
Modify root budget <!-- TMPL_VAR name="budget_period_description" -->
|
||||
|
||||
<!-- TMPL_ELSE -->
|
||||
Add budget period
|
||||
Add root budget
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- delete a budget period -->
|
||||
<!-- ################################ -->
|
||||
<!-- TMPL_IF name="delete_confirm" -->
|
||||
<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budget periods</a> ›
|
||||
<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root budgets</a> ›
|
||||
<!-- TMPL_IF name="total" -->
|
||||
Cannot Delete budget period '<!-- TMPL_VAR name="budget_period_description" -->'
|
||||
Cannot Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'
|
||||
<!-- TMPL_ELSE -->
|
||||
Delete budget period '<!-- TMPL_VAR name="budget_period_description" -->'?
|
||||
Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'?
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
|
|
@ -131,9 +131,9 @@
|
|||
<!-- add or modify a budget period -->
|
||||
<!--TMPL_IF Name="duplicates"--><!--TMPL_INCLUDE Name="duplicates.inc"--><!--/TMPL_IF-->
|
||||
<!-- TMPL_IF name="budget_period_id" -->
|
||||
<h3>Modify budget period</h3>
|
||||
<h3>Modify root budget</h3>
|
||||
<!-- TMPL_ELSE -->
|
||||
<h3>Add budget period</h3>
|
||||
<h3>Add root budget</h3>
|
||||
<!-- /TMPL_IF -->
|
||||
<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
|
||||
<fieldset class="rows">
|
||||
|
|
@ -195,14 +195,14 @@
|
|||
<li>
|
||||
<!-- ACTIVE -->
|
||||
<!-- ############################## -->
|
||||
<label for="budget_period_active">Make Period Active</label>
|
||||
<label for="budget_period_active">Make Budget Active</label>
|
||||
<!-- TMPL_IF NAME="budget_period_active" --><input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" checked /><!--TMPL_ELSE--> <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> <!--/TMPL_IF-->
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<!-- LOCK -->
|
||||
<!-- ############################## -->
|
||||
<label for="budget_period_locked">Lock Period</label>
|
||||
<label for="budget_period_locked">Lock Budget</label>
|
||||
<!-- TMPL_IF NAME="budget_period_locked" --><input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" /><!--TMPL_ELSE--> <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1"/> <!--/TMPL_IF-->
|
||||
</li>
|
||||
</ol>
|
||||
|
|
@ -227,12 +227,12 @@
|
|||
<!-- TMPL_IF name="delete_confirm" -->
|
||||
<!-- TMPL_IF name="total" -->
|
||||
<div class="dialog message">
|
||||
<h3>Cannot delete budget period</h3>
|
||||
<h3>Cannot delete root budget</h3>
|
||||
<p><strong>This record is used <!-- TMPL_VAR name="total" --> times</strong>
|
||||
. Deletion is not possible.</p>
|
||||
<!-- TMPL_ELSE -->
|
||||
<div class="dialog alert">
|
||||
<h3>Delete budget period '<!-- TMPL_VAR name="budget_period_description" -->'?</h3>
|
||||
<h3>Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'?</h3>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- ###################################################################### -->
|
||||
|
|
@ -275,12 +275,12 @@
|
|||
<!-- /TMPL_IF -->
|
||||
<!-- DEFAULT display budget periods list -->
|
||||
<!-- TMPL_IF name="else" -->
|
||||
<h2>Budget periods administration</h2>
|
||||
<h2>Root budgets administration</h2>
|
||||
<!-- TMPL_IF name="cur" --><b>Currency = <!-- TMPL_VAR name="cur" --></b><!-- /TMPL_IF -->
|
||||
<table id="periodsh">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Period Name</th>
|
||||
<th>Root Budget Name</th>
|
||||
<th>Start Date</th>
|
||||
<th>End Date</th>
|
||||
<th>Active</th>
|
||||
|
|
@ -290,26 +290,29 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<!-- TMPL_LOOP name="period_loop" -->
|
||||
<!-- TMPL_IF NAME="__odd__" -->
|
||||
<tr>
|
||||
<!-- TMPL_ELSE -->
|
||||
<tr class="highlight">
|
||||
<!-- /TMPL_IF -->
|
||||
<td><!-- TMPL_VAR name="budget_period_description" --></td>
|
||||
<td><!-- TMPL_VAR name="budget_period_startdate" --></td>
|
||||
<td><!-- TMPL_VAR name="budget_period_enddate" --></td>
|
||||
<td> <font COLOR="#00FF00"> <!-- TMPL_IF name="budget_period_active" -->✓<!-- /TMPL_IF --> </font> </td>
|
||||
<td> <font COLOR="red"> <!-- TMPL_IF name="budget_period_locked" -->X<!-- /TMPL_IF --> </font> </td>
|
||||
<td align='right'><!-- TMPL_VAR NAME="budget_period_total" --></td>
|
||||
<td>
|
||||
<a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&budget_period_id=<!-- TMPL_VAR name="budget_period_id" escape="HTML" -->">Edit</a>
|
||||
<a href="<!-- TMPL_VAR name="script_name"-->?op=delete_confirm&budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->">Delete</a>
|
||||
<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->">Budgets</a>
|
||||
<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Budget</a>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- /TMPL_LOOP -->
|
||||
<!-- TMPL_LOOP name="period_loop" -->
|
||||
<!-- TMPL_IF NAME="__odd__" -->
|
||||
<tr>
|
||||
<!-- TMPL_ELSE -->
|
||||
<tr class="highlight">
|
||||
<!-- /TMPL_IF -->
|
||||
<td><!-- TMPL_VAR name="budget_period_description" --></td>
|
||||
<td><!-- TMPL_VAR name="budget_period_startdate" --></td>
|
||||
<td><!-- TMPL_VAR name="budget_period_enddate" --></td>
|
||||
<td> <font COLOR="#00FF00"> <!-- TMPL_IF name="budget_period_active" -->✓<!-- /TMPL_IF --> </font> </td>
|
||||
<td> <font COLOR="red"> <!-- TMPL_IF name="budget_period_locked" -->X<!-- /TMPL_IF --> </font> </td>
|
||||
<td align='right'><!-- TMPL_VAR NAME="budget_period_total" --></td>
|
||||
<td>
|
||||
<a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&budget_period_id=<!-- TMPL_VAR name="budget_period_id" escape="HTML" -->">Edit</a>
|
||||
<a href="<!-- TMPL_VAR name="script_name"-->?op=delete_confirm&budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->">Delete</a>
|
||||
<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->">Budgets</a>
|
||||
<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Budget</a>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- /TMPL_LOOP -->
|
||||
<!-- TMPL_UNLESS NAME="period_loop" -->
|
||||
<tr><td colspan="7">No root budget</td></tr>
|
||||
<!-- /TMPL_UNLESS -->
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
|
||||
|
|
|
|||
|
|
@ -28,10 +28,6 @@
|
|||
_alertString += _("- Budget name missing\n");
|
||||
}
|
||||
|
||||
if( ! (isNum(f.budget_amount,0)) && ! (isNum(f.budget_amount_sublevel,0) ) ) {
|
||||
_alertString += _("- Budget base-level and sub-level amount missing or invalid\n");
|
||||
}
|
||||
|
||||
var budgetId;
|
||||
if (typeof(f.budget_id ) != "undefined") {
|
||||
budgetId = f.budget_id.value
|
||||
|
|
@ -41,29 +37,31 @@
|
|||
|
||||
// hack to test if selected parent_id in scrolling-list...
|
||||
// if value == 'undef' its got a selected_parent :/
|
||||
var chkAdd = f.budget_parent_id.value ;
|
||||
if ( typeof(chkAdd ) != "undefined") {
|
||||
newBudgetParent = f.budget_parent_id.value
|
||||
} else {
|
||||
newBudgetParent = f.budget_parent_id.item(0).value
|
||||
}
|
||||
if(f.budget_parent_id){
|
||||
var chkAdd = f.budget_parent_id.value ;
|
||||
if ( typeof(chkAdd ) != "undefined") {
|
||||
newBudgetParent = f.budget_parent_id.value
|
||||
} else {
|
||||
newBudgetParent = f.budget_parent_id.item(0).value
|
||||
}
|
||||
|
||||
if (budgetId > 0) { ; //its a mod ...
|
||||
// if parent eq curent-budget, fail...
|
||||
if ( newBudgetParent == budgetId ) {
|
||||
_alertString += _("- Budget parent is current budget\n");
|
||||
}
|
||||
|
||||
else if (newBudgetParent) {
|
||||
var result = checkBudgetParent( budgetId , newBudgetParent );
|
||||
if (result) {
|
||||
_alertString += result;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (budgetId > 0) { ; //its a mod ...
|
||||
// if parent eq curent-budget, fail...
|
||||
if ( newBudgetParent == budgetId ) {
|
||||
_alertString += _("- Budget parent is current budget\n");
|
||||
}
|
||||
|
||||
else if (newBudgetParent) {
|
||||
var result = checkBudgetParent( budgetId , newBudgetParent );
|
||||
if (result) {
|
||||
_alertString += result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// else do lookup
|
||||
var budgetTotal = Math.abs(f.budget_amount.value) + Math.abs(f.budget_amount_sublevel.value);
|
||||
var budgetTotal = Math.abs(f.budget_amount.value);
|
||||
var result = budgetExceedsParent (budgetTotal, budgetId, newBudgetParent, f.budget_period_id.value)
|
||||
if (result) {
|
||||
_alertString += result;
|
||||
|
|
@ -81,15 +79,50 @@
|
|||
//]]>
|
||||
</script>
|
||||
<!-- TMPL_ELSE -->
|
||||
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
|
||||
<link href="<!-- TMPL_VAR NAME='themelang' -->/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css" rel="stylesheet" type="text/css" />
|
||||
|
||||
<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
|
||||
<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/lib/jquery/plugins/treetable/jquery.treeTable.min.js"></script>
|
||||
<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/lib/jquery/plugins/jquery.qtip.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
//
|
||||
$(document).ready(function() {
|
||||
$("#budgeth").tablesorter({
|
||||
widgets : ['zebra'],
|
||||
sortList: [[0,0]]
|
||||
});
|
||||
$(document).ready(function() {
|
||||
|
||||
$('.tooltiped').each(function (){
|
||||
contentelem = $(this).children().filter('.tooltipcontent');
|
||||
$(this).qtip({
|
||||
content: contentelem.html(),
|
||||
show: 'mouseover',
|
||||
hide: 'mouseout',
|
||||
style: {
|
||||
name: 'light',
|
||||
tip: 'bottomLeft',
|
||||
border: {
|
||||
radius: 8,
|
||||
color: '#6699CC'
|
||||
}
|
||||
},
|
||||
position: {
|
||||
corner: {
|
||||
target: 'topRight',
|
||||
tooltip: 'bottomRight'
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
$('.tooltipcontent').each(function (){
|
||||
$(this).hide();
|
||||
});
|
||||
<!-- TMPL_IF NAME="notree" -->
|
||||
$("#budgeth").tablesorter({
|
||||
widgets : ['zebra'],
|
||||
sortList: [[0,0]]
|
||||
});
|
||||
<!-- TMPL_ELSE -->
|
||||
$("#budgeth").treeTable();
|
||||
<!-- /TMPL_IF -->
|
||||
});
|
||||
//]]>
|
||||
</script>
|
||||
|
|
@ -114,31 +147,34 @@
|
|||
<!-- TMPL_IF name="else" -->
|
||||
|
||||
<h1>Budgets for '<!-- TMPL_VAR name="budget_period_description" -->'</h1>
|
||||
<input type="hidden" name"budget_period_id" value="<!-- TMPL_VAR name= 'budget_period_id' -->" />
|
||||
<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
|
||||
<input type="hidden" name="budget_period_id" value="<!-- TMPL_VAR name= 'budget_period_id' -->" />
|
||||
<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
|
||||
<fieldset>
|
||||
<legend>Budget filters</legend>
|
||||
<li>
|
||||
<label for="budget_branchcode_dropbox">Limit to Branch:</label>
|
||||
<select name="budget_branchcode" >
|
||||
<option value=""></option>
|
||||
<!-- TMPL_LOOP name="branchloop" -->
|
||||
<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
|
||||
<!-- /TMPL_LOOP -->
|
||||
</select>
|
||||
|
||||
<input type="hidden" value="<!-- TMPL_VAR name='budget_period_id' -->" />
|
||||
<li>
|
||||
<!-- TMPL_IF NAME="show_mine" -->
|
||||
<input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
|
||||
<!-- TMPL_ELSE -->
|
||||
<input type="checkbox" id="show_mine" name="show_mine" value="1" />
|
||||
<!-- /TMPL_IF -->
|
||||
<label for="show_mine">Show my budgets only</label>
|
||||
</li>
|
||||
<input type="hidden" name="show" value="1" -->
|
||||
<input type="submit" value="Select" />
|
||||
</fieldset>
|
||||
<legend>Budget filters</legend>
|
||||
<ul>
|
||||
<li>
|
||||
<label for="filter_budgetbranch">Library: </label>
|
||||
<select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
|
||||
<option value=""></option>
|
||||
<!-- TMPL_LOOP name="branchloop" -->
|
||||
<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
|
||||
<!-- /TMPL_LOOP -->
|
||||
</select>
|
||||
</li>
|
||||
<li>
|
||||
<!-- TMPL_IF NAME="show_mine" -->
|
||||
<input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
|
||||
<!-- TMPL_ELSE -->
|
||||
<input type="checkbox" id="show_mine" name="show_mine" value="1" />
|
||||
<!-- /TMPL_IF -->
|
||||
<label for="show_mine">Show my budgets only</label>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<input type="hidden" name="show" value="1" >
|
||||
<input type="hidden" name="budget_period_id" value="<!-- TMPL_VAR NAME="budget_period_id" -->" />
|
||||
<input type="submit" class="submit" name="filter" value="Select" />
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
<table id="budgeth">
|
||||
|
|
@ -146,79 +182,65 @@
|
|||
<tr>
|
||||
<th>Budget hierarchy</th>
|
||||
<th>Budget name</th>
|
||||
<th>Total<br>allocated</th>
|
||||
<th>Base-level<br>allocated</th>
|
||||
<th>Sub-level<br>allocated (unallocated)</th>
|
||||
<th>Base-level<br>spent</th>
|
||||
<th>Base-level<br>remaining</th>
|
||||
<!--
|
||||
<th>Sub-level<br>spent</th>
|
||||
<th>Encum%</th>
|
||||
<th>Expend%</th>
|
||||
-->
|
||||
<th>Owner</th>
|
||||
<th>Total<br />allocated</th>
|
||||
<th>Base-level<br />allocated</th>
|
||||
<th>Base-level<br />spent</th>
|
||||
<th>Base-level<br />remaining</th>
|
||||
<th class="tooltipcontent"> </th>
|
||||
<!-- Owner</th>
|
||||
<th>Branch</th>
|
||||
<th>Note</th>
|
||||
<th>Note</th> -->
|
||||
<th colspan="3">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<!-- TMPL_LOOP name="budget" -->
|
||||
<!-- TMPL_IF NAME="budget" -->
|
||||
<!-- TMPL_LOOP name="budget" -->
|
||||
<!-- TMPL_IF NAME="toggle" -->
|
||||
<tr class="highlight">
|
||||
<tr id="node-<!-- TMPL_VAR NAME="budget_id" -->" class="highlight<!-- TMPL_IF NAME="budget_parent_id" --> child-of-node-<!-- TMPL_VAR NAME="budget_parent_id" --><!-- /TMPL_IF --> tooltiped">
|
||||
<!-- TMPL_ELSE -->
|
||||
<tr>
|
||||
<tr id="node-<!-- TMPL_VAR NAME="budget_id" -->" class="tooltiped <!-- TMPL_IF NAME="budget_parent_id" --> child-of-node-<!-- TMPL_VAR NAME="budget_parent_id" --><!-- /TMPL_IF -->">
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<td><!-- TMPL_VAR NAME="budget_code_indent" --></td>
|
||||
<td><!-- TMPL_VAR NAME="budget_name" --></td>
|
||||
<td align='right'><!-- TMPL_VAR NAME="budget_amount_total" --></td>
|
||||
<td align='right'><!-- TMPL_VAR NAME="budget_amount" --> </td>
|
||||
<!-- TMPL_IF NAME="budget_amount_sublevel" -->
|
||||
<td align='center'><!-- TMPL_VAR NAME="budget_amount_sublevel" -->
|
||||
<!-- TMPL_IF NAME="budget_unalloc_sublevel" -->
|
||||
(<span STYLE="color: green;" > <!-- TMPL_VAR NAME="budget_unalloc_sublevel" --></span>)
|
||||
<!-- /TMPL_IF -->
|
||||
</td>
|
||||
<!-- TMPL_ELSE -->
|
||||
<td align='center'>--</td>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<td align='right'><!-- TMPL_VAR NAME="budget_spent" --> </td>
|
||||
<td align='right'
|
||||
<!-- TMPL_IF NAME="remaining_pos" --> STYLE="color: green;" <!-- /TMPL_IF -->
|
||||
<!-- TMPL_IF NAME="remaining_neg" --> STYLE="color: red;" <!-- /TMPL_IF --> >
|
||||
<!-- TMPL_VAR NAME="budget_remaining" --> </td>
|
||||
|
||||
<!--
|
||||
<td><!-- TMPL_VAR NAME="budget_encumb" --></td>
|
||||
<td><!-- TMPL_VAR NAME="budget_expend" --></td>
|
||||
-->
|
||||
<td> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="budget_owner_id" -->"><!-- TMPL_VAR NAME="budget_owner_name" --></a></td>
|
||||
|
||||
<td><!-- TMPL_VAR NAME="budget_branchcode" --></td>
|
||||
<td><!-- TMPL_VAR NAME="budget_notes" --></td>
|
||||
<td class="tooltipcontent">
|
||||
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="budget_owner_id" -->"><!-- TMPL_VAR NAME="budget_owner_name" --></a>
|
||||
<!-- TMPL_VAR NAME="budget_branchcode" -->
|
||||
<!-- TMPL_VAR NAME="budget_notes" -->
|
||||
</td>
|
||||
<!-- TMPL_IF NAME='budget_lock'-->
|
||||
<td> <span STYLE="color: gray;" > Edit Delete </span> </td>
|
||||
<td colspan="3"> <span STYLE="color: gray;" > Edit Delete </span> </td>
|
||||
<!-- TMPL_ELSE -->
|
||||
<td><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" >Edit</a>
|
||||
<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&budget_id=<!-- TMPL_VAR NAME="budget_id" -->">Delete </a></td>
|
||||
<td colspan="3">
|
||||
<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" >Edit</a>
|
||||
<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&budget_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Delete</a>
|
||||
<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_parent_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Sub-Budget</a>
|
||||
</td>
|
||||
<!-- /TMPL_IF -->
|
||||
</tr>
|
||||
<!-- /TMPL_LOOP -->
|
||||
<!-- /TMPL_LOOP -->
|
||||
<!-- TMPL_ELSE -->
|
||||
<tr><td colspan="12">No budget found</td></tr>
|
||||
<!-- /TMPL_IF -->
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th colspan='2' style='text-align: left;' nowrap>Period allocated <!--TMPL_IF NAME="budget_period_total" --><!-- TMPL_VAR NAME='budget_period_total'--><!-- /TMPL_IF --> </th>
|
||||
<th nowrap style='text-align: right;' > <!-- TMPL_VAR NAME='period_alloc_total'--></th>
|
||||
<th nowrap style='text-align: right;'> <!-- TMPL_VAR NAME='base_alloc_total'--></th>
|
||||
<th nowrap style='text-align: center;'> <!-- TMPL_VAR NAME='sub_alloc_total'--></th>
|
||||
<th style='text-align: right;' ><!-- TMPL_VAR NAME='base_spent_total'--></th>
|
||||
<th style='text-align: right;' ><!-- TMPL_VAR NAME='base_remaining_total'--></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th class="tooltipcontent"></th>
|
||||
<th colspan="3"></th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
|
@ -242,15 +264,13 @@
|
|||
<input type="hidden" name="op" value="add_validate" />
|
||||
<input type="hidden" name="checked" value="0" />
|
||||
<ol>
|
||||
<!-- TMPL_IF NAME="budget_parent_id" -->
|
||||
<li>
|
||||
<label for="parents">Budget Parent: </label>
|
||||
<!-- TMPL_VAR NAME="budget_dropbox" -->
|
||||
|
||||
<!-- TMPL_IF name="budget_id" -->
|
||||
<input type="hidden" name="budget_parent_id" value="<!-- TMPL_VAR NAME="budget_parent_id" -->" />
|
||||
<!-- /TMPL_IF -->
|
||||
<label for="budget_parent_id">Budget Parent: </label>
|
||||
<!-- TMPL_VAR NAME="budget_parent_name" -->
|
||||
<input type="hidden" name="budget_parent_id" value="<!-- TMPL_VAR NAME="budget_parent_id" -->" />
|
||||
</li>
|
||||
|
||||
<!-- /TMPL_IF -->
|
||||
<li>
|
||||
<label style="color: red;" for="budget_code">Budget Code: </label>
|
||||
<input type="text" name="budget_code" id="budget_code" value="<!-- TMPL_VAR NAME="budget_code" -->" size="30" />
|
||||
|
|
@ -261,17 +281,12 @@
|
|||
<input type="text" name="budget_name" id="budget_name" value="<!-- TMPL_VAR NAME="budget_name" -->" size="60" />
|
||||
</li>
|
||||
|
||||
<div class='hint'>base-level and sub-level amount fields cannot both be empty</div>
|
||||
<div class='hint'>budget amount cannot both be empty</div>
|
||||
<li>
|
||||
<label style='white-space: nowrap;' for="budget_amount">Base-level amount: </label>
|
||||
<label style='white-space: nowrap;' for="budget_amount">Amount: </label>
|
||||
<input type="text" name="budget_amount" id="budget_amount" value="<!-- TMPL_VAR NAME="budget_amount" -->" size="8" />
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<label for="budget_amount_sublevel">Sub-level amount: </label>
|
||||
<input type="text" name="budget_amount_sublevel" id="budget_amount_sublevel" value="<!-- TMPL_VAR NAME="budget_amount_sublevel" -->" size="8" />
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<label for="">Encumbrance: </label>
|
||||
<input type="text" name="budget_encumb" id="budget_encumb" value="<!-- TMPL_VAR NAME="budget_encumb" -->" size="8" />
|
||||
|
|
@ -369,7 +384,7 @@
|
|||
<!-- TMPL_IF name="delete_confirm" -->
|
||||
<div class="dialog alert"> <h3>Delete Budget <!-- TMPL_VAR NAME="budget_name" -->?</h3>
|
||||
<table>
|
||||
<<tr>
|
||||
<tr>
|
||||
<th scope="row">Budget Amount:</td>
|
||||
<td><!-- TMPL_VAR NAME="budget_amount" --></td>
|
||||
</tr>
|
||||
|
|
@ -378,6 +393,7 @@
|
|||
<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
|
||||
<input type="hidden" name="op" value="delete_confirmed" />
|
||||
<input type="hidden" name="budget_id" value="<!-- TMPL_VAR NAME="budget_id" -->" />
|
||||
<input type="hidden" name="budget_period_id" value="<!-- TMPL_VAR NAME="budget_period_id" -->" />
|
||||
<input type="submit" value="Delete this budget" class="approve" />
|
||||
</form>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
use strict;
|
||||
|
||||
sub kohaversion {
|
||||
our $VERSION = '3.01.00.113';
|
||||
our $VERSION = '3.01.00.115';
|
||||
# version needs to be set this way
|
||||
# so that it can be picked up by Makefile.PL
|
||||
# during install
|
||||
|
|
|
|||
|
|
@ -88,7 +88,6 @@ ok($budget_id=AddBudget(
|
|||
"AddBudget returned $budget_id");
|
||||
#budget_code | varchar(30) | YES | | NULL | |
|
||||
#| budget_amount | decimal(28,6) | NO | | 0.000000 | |
|
||||
#| budget_amount_sublevel | decimal(28,6) | YES | | NULL | |
|
||||
#| budget_id | int(11) | NO | PRI | NULL | |
|
||||
#| budget_branchcode | varchar(10) | YES | | NULL | |
|
||||
#| budget_parent_id | int(11) | YES | | NULL | |
|
||||
|
|
|
|||
Loading…
Reference in New Issue