Attachment #27570 for bug #7180

View | Details | Raw Unified | Return to bug 7180
Collapse All | Expand All

Lines 502-507 sub get_infos_syspref { Link Here

(-)a/acqui/addorderiso2709.pl (+1 lines)
502	}	502	}
503	my $r;	503	my $r;
504	for my $field_name ( @$field_list ) {	504	for my $field_name ( @$field_list ) {
		505	next unless exists $yaml->{$field_name};
505	my @fields = split /\\|/, $yaml->{$field_name};	506	my @fields = split /\\|/, $yaml->{$field_name};
506	for my $field ( @fields ) {	507	for my $field ( @fields ) {
507	my ( $f, $sf ) = split /\$/, $field;	508	my ( $f, $sf ) = split /\$/, $field;




            if ( $(this).is(':checked') ) {
                $(container).addClass("selected");
                $(container).removeClass("unselected");
                $(container).find("ol").toggle(true);
            } else {
                $(container).addClass("unselected");
                $(container).removeClass("selected");
                $(container).find("ol").toggle(false);
            }
        } );



            return disableUnchecked($(this));
        });
        $('#tabs').tabs();
    });

    function disableUnchecked(form){
        $("div.biblio.unselected").each(function(){
            $(this).remove();
            $(this).find('input').attr('disabled', 'disabled');
        });
        return 1;
    }

                <h1>Add orders from [% comments %]
                    ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])
                </h1>
                <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
                <div id="tabs" class="toptabs">
                  <ul>
                    <li><a href="#records_to_import">Select to import</a></li>
                    <li><a href="#items_info" class="items_info">Items information</a></li>
                    <li><a href="#accounting_details">Default accounting details</a></li>
                  </ul>

                  <div id="records_to_import">
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
                    <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
                        <input type="hidden" name="op" value="import_records"/>
                        <input type="hidden" name="basketno" value="[% basketno %]" />
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />

                        [% END %]

                        [% FOREACH biblio IN biblio_list %]
                        <fieldset class="biblio unselected rows" style="float:none;">
                          <legend>
                            <label for="record_[% biblio.import_record_id %]" style="width:auto;">
                              <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />

                        </fieldset>
                        [% END %]
                      </div>
                      <div id="items_info">
                        <h2>Items information</h2>
                        <p>Import all the checked items in the basket with the following parameters:</p>

                        [% IF ( items ) %]
                        <fieldset class="rows" style="float:none;">
                            <legend>Item</legend>
                            [% IF ( NoACQframework ) %]
                                <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>

                            [% END %] <!-- /items -->
                        </fieldset>
                        [% END %] <!-- items -->
                      </div>
                      <div id="accounting_details">
                        <fieldset class="rows" style="float:none;">
                            <legend>Accounting details</legend>
                            <ol>
                                <li>

                                </li>
                            </ol>
                        </fieldset>
                      </div>
                      </div>
                        </fieldset>

                      <fieldset class="action">
                          <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
                      </fieldset>
                    </form>
                [% ELSE %]
                <div>




use Test::More tests => 22;

BEGIN {use_ok('C4::Budgets') }
use C4::Context;
use C4::Dates;
use C4::Context;

use YAML;
my $dbh = C4::Context->dbh;
my $dbh = C4::Context->dbh();
$dbh->{AutoCommit} = 0;
$dbh->{RaiseError} = 1;

$dbh->do(q|DELETE FROM aqbudgetperiods|);
$dbh->do(q|DELETE FROM aqbudgets|);

#
# Budget Periods :

ok($del_status=DelBudget($budget_id),
    "DelBudget returned $del_status");

$dbh->rollback;

Return to bug 7180

Lines 76-86 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-17 / +25 lines)
76	if ( $(this).is(':checked') ) {	76	if ( $(this).is(':checked') ) {
77	$(container).addClass("selected");	77	$(container).addClass("selected");
78	$(container).removeClass("unselected");	78	$(container).removeClass("unselected");
79	$(container).find("ol").toggle();	79	$(container).find("ol").toggle(true);
80	} else {	80	} else {
81	$(container).addClass("unselected");	81	$(container).addClass("unselected");
82	$(container).removeClass("selected");	82	$(container).removeClass("selected");
83	$(container).find("ol").toggle();	83	$(container).find("ol").toggle(false);
84	}	84	}
85	} );	85	} );
86		86
Lines 118-129 Link Here
118		118
119	return disableUnchecked($(this));	119	return disableUnchecked($(this));
120	});	120	});
		121	$('#tabs').tabs();
121	});	122	});
122		123
123	function disableUnchecked(form){	124	function disableUnchecked(form){
124	$("div.biblio.unselected").each(function(){	125	$("div.biblio.unselected").each(function(){
125	$(this).find('select').attr('disabled', 'disabled');	126	$(this).remove();
126	$(this).find('input').attr('disabled', 'disabled');
127	});	127	});
128	return 1;	128	return 1;
129	}	129	}
Lines 142-152 Link Here
142	<h1>Add orders from [% comments %]	142	<h1>Add orders from [% comments %]
143	([% file_name %] staged on [% upload_timestamp \| $KohaDates with_hours => 1 %])	143	([% file_name %] staged on [% upload_timestamp \| $KohaDates with_hours => 1 %])
144	</h1>	144	</h1>
145	<div>	145	<form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
		146	<div id="tabs" class="toptabs">
		147	<ul>
		148	<li><a href="#records_to_import">Select to import</a></li>
		149	<li><a href="#items_info" class="items_info">Items information</a></li>
		150	<li><a href="#accounting_details">Default accounting details</a></li>
		151	</ul>
		152
146	<div id="records_to_import">	153	<div id="records_to_import">
147	<span class="checkall"><a id="checkAll" href="#">Check All</a></span>	154	<span class="checkall"><a id="checkAll" href="#">Check All</a></span>
148	<span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>	155	<span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
149	<form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
150	<input type="hidden" name="op" value="import_records"/>	156	<input type="hidden" name="op" value="import_records"/>
151	<input type="hidden" name="basketno" value="[% basketno %]" />	157	<input type="hidden" name="basketno" value="[% basketno %]" />
152	<input type="hidden" name="booksellerid" value="[% booksellerid %]" />	158	<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
Lines 158-164 Link Here
158	[% END %]	164	[% END %]
159		165
160	[% FOREACH biblio IN biblio_list %]	166	[% FOREACH biblio IN biblio_list %]
161	<fieldset class="biblio unselected rows">	167	<fieldset class="biblio unselected rows" style="float:none;">
162	<legend>	168	<legend>
163	<label for="record_[% biblio.import_record_id %]" style="width:auto;">	169	<label for="record_[% biblio.import_record_id %]" style="width:auto;">
164	<input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />	170	<input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
Lines 226-237 Link Here
226	</fieldset>	232	</fieldset>
227	[% END %]	233	[% END %]
228	</div>	234	</div>
229	<div id="import_all">	235	<div id="items_info">
230	<h2>Import all</h2>	236	<h2>Items information</h2>
231	<p>Import all the lines in the basket with the following parameters:</p>	237	<p>Import all the checked items in the basket with the following parameters:</p>
232		238
233	[% IF ( items ) %]	239	[% IF ( items ) %]
234	<fieldset class="rows">	240	<fieldset class="rows" style="float:none;">
235	<legend>Item</legend>	241	<legend>Item</legend>
236	[% IF ( NoACQframework ) %]	242	[% IF ( NoACQframework ) %]
237	<div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>	243	<div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
Lines 263-270 Link Here
263	[% END %] <!-- /items -->	269	[% END %] <!-- /items -->
264	</fieldset>	270	</fieldset>
265	[% END %] <!-- items -->	271	[% END %] <!-- items -->
266		272	</div>
267	<fieldset class="rows">	273	<div id="accounting_details">
		274	<fieldset class="rows" style="float:none;">
268	<legend>Accounting details</legend>	275	<legend>Accounting details</legend>
269	<ol>	276	<ol>
270	<li>	277	<li>
Lines 347-357 Link Here
347	</li>	354	</li>
348	</ol>	355	</ol>
349	</fieldset>	356	</fieldset>
350	<fieldset class="action">	357	</div>
351	<input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>	358	</div>
352	</fieldset>
353		359
354	</div>	360	<fieldset class="action">
		361	<input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
		362	</fieldset>
355	</form>	363	</form>
356	[% ELSE %]	364	[% ELSE %]
357	<div>	365	<div>

Lines 3-18 use warnings; Link Here

(-)a/t/db_dependent/Budgets.t (-4 / +5 lines)
3	use Test::More tests => 22;	3	use Test::More tests => 22;
4		4
5	BEGIN {use_ok('C4::Budgets') }	5	BEGIN {use_ok('C4::Budgets') }
		6	use C4::Context;
6	use C4::Dates;	7	use C4::Dates;
7	use C4::Context;	8	use C4::Context;
8		9
9	use YAML;	10	use YAML;
10		11	my $dbh = C4::Context->dbh;
11	my $dbh = C4::Context->dbh();
12	$dbh->{AutoCommit} = 0;	12	$dbh->{AutoCommit} = 0;
13	$dbh->{RaiseError} = 1;	13	$dbh->{RaiseError} = 1;
14		14
15	$dbh->do('DELETE FROM aqbudgetperiods');	15	$dbh->do(q\|DELETE FROM aqbudgetperiods\|);
		16	$dbh->do(q\|DELETE FROM aqbudgets\|);
16		17
17	#	18	#
18	# Budget Periods :	19	# Budget Periods :
Lines 134-136 ok($budgets->[0]->{budget_name} lt $budgets->[1]->{budget_name}, 'default sort o Link Here
134	ok($del_status=DelBudget($budget_id),	135	ok($del_status=DelBudget($budget_id),
135	"DelBudget returned $del_status");	136	"DelBudget returned $del_status");
136		137
137	-	138	$dbh->rollback;