Attachment #27576 for bug #7180

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

Lines 174-180 if ($op eq ""){ Link Here

(-)a/acqui/addorderiso2709.pl (-1 / +1 lines)
174	my $c_quantity = shift( @quantities ) \|\| GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) \|\| 1;	174	my $c_quantity = shift( @quantities ) \|\| GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) \|\| 1;
175	my $c_budget_id = shift( @budgets_id ) \|\| $input->param('all_budget_id') \|\| $budget_id;	175	my $c_budget_id = shift( @budgets_id ) \|\| $input->param('all_budget_id') \|\| $budget_id;
176	my $c_discount = shift ( @discount);	176	my $c_discount = shift ( @discount);
177	$c_discount = $c_discount / 100 if $c_discount > 100;	177	$c_discount = $c_discount / 100 if $c_discount > 1;
178	my $c_sort1 = shift( @sort1 ) \|\| $input->param('all_sort1') \|\| '';	178	my $c_sort1 = shift( @sort1 ) \|\| $input->param('all_sort1') \|\| '';
179	my $c_sort2 = shift( @sort2 ) \|\| $input->param('all_sort2') \|\| '';	179	my $c_sort2 = shift( @sort2 ) \|\| $input->param('all_sort2') \|\| '';
180		180

Lines 554-559 padding: 0; Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (+6 lines)
554	width: 100%;	554	width: 100%;
555	}	555	}
556		556
		557	fieldset.rows.unselected {
		558	background-color: white;
		559	border-width : 0px;
		560	border: 0;
		561	}
		562
557	fieldset.rows legend {	563	fieldset.rows legend {
558	margin-left: 1em;	564	margin-left: 1em;
559	font-weight: bold;	565	font-weight: bold;

Lines 215-220 function calcNewsuggTotal(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js (+3 lines)
215	}	215	}
216		216
217	function getAuthValueDropbox( name, cat, destination, selected ) {	217	function getAuthValueDropbox( name, cat, destination, selected ) {
		218	if ( typeof(selected) == 'undefined' ) {
		219	selected = "";
		220	}
218	if (cat == null \|\| cat == "") {	221	if (cat == null \|\| cat == "") {
219	$(destination).replaceWith(' <input type="text" name="' + name + '" value="' + selected + '" />' );	222	$(destination).replaceWith(' <input type="text" name="' + name + '" value="' + selected + '" />' );
220	return;	223	return;




                  </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>
                        <input type="hidden" name="op" value="import_records"/>
                        <input type="hidden" name="basketno" value="[% basketno %]" />
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />

                              <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
                              <span class="citation">[% biblio.citation %]</span>
                            </label>
                            <span class="links" style="font-weight: normal;">
                              ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% biblio.import_record_id %]" title="Card" rel="gb_page_center[600,500]">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;breedingid=[% biblio.import_record_id %]&amp;import_batch_id=[% biblio.import_batch_id %]&amp;biblionumber=[% biblio.match_biblionumber %]">Add order</a> )
                            </span>
                          </legend>
                          <ol>
                            <li class="status">

                            </li>
                            <li class="discount">
                                <label for="discount_record_[% biblio.import_record_id %]">Discount: </label>
                                <input id="discount_record_[% biblio.import_record_id %]" type="text" value="[% biblio.discount %]" name="discount" size="6" /> %
                            </li>
                            <li class="budget">
                                <label for="fund_record_[% biblio.import_record_id %]">Fund: </label>

                                [% END %]
                            </li>
                            <li class="sort1">
                                <label for="sort1_record_[% biblio.import_record_id %]">Statistic 1: </label>
                                <input id="sort1_record_[% biblio.import_record_id %]" type="text" id="sort1" size="20" name="sort1" value="[% biblio.sort1 %]" />
                            </li>
                            <li class="sort2">
                                <label for="sort2_record_[% biblio.import_record_id %]">Statistic 2: </label>
                                <input id="sort2_record_[% biblio.import_record_id %]" type="text" id="sort2" size="20" name="sort2" value="[% biblio.sort2 %]" />
                            </li>
                          </ol>

                        [% END %] <!-- items -->
                      </div>
                      <div id="accounting_details">
                        <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p>
                        <fieldset class="rows" style="float:none;">
                            <legend>Accounting details</legend>
                            <ol>

                                </li>
                                <li>
                                    <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
                                    <label for="sort1">Statistic 1: </label>
                                    [% IF CGIsort1 %]
                                        <select id="all_sort1" size="1" name="all_sort1">
                                        [% FOREACH sort_opt IN CGIsort1 %]

                                </li>
                                <li>
                                  <span id="sort2_zone">
                                    <label for="sort2">Statistic 2: </label>
                                    [% IF CGIsort2 %]
                                        <select id="all_sort2" size="1" name="all_sort1">
                                        [% FOREACH sort_opt IN CGIsort2 %]

Lines 49-55 Acquisitions: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-2 / +2 lines)
49	- Set the mapping values for a new order line created from a marcrecord (staged file).	49	- Set the mapping values for a new order line created from a marcrecord (staged file).
50	- pref: MarcFieldsToOrder	50	- pref: MarcFieldsToOrder
51	type: textarea	51	type: textarea
52	- "For example:<br/>price: 947$a\|947$c<br/>quantity: 969$h<br/>budget_code: 922$a<rb/>"	52	- "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2"
		53	- "<br/>For example:<br/>price: 947$a\|947$c<br/>quantity: 969$h<br/>budget_code: 922$a"
53	Printing:	54	Printing:
54	-	55	-
55	- Use the	56	- Use the
56	-

Return to bug 7180

Lines 151-158 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-10 / +11 lines)
151	</ul>	151	</ul>
152		152
153	<div id="records_to_import">	153	<div id="records_to_import">
154	<span class="checkall"><a id="checkAll" href="#">Check All</a></span>	154	<span class="checkall"><a id="checkAll" href="#">Check all</a></span>
155	<span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>	155	<span class="uncheckall"><a id="unCheckAll" href="#">Uncheck all</a></span>
156	<input type="hidden" name="op" value="import_records"/>	156	<input type="hidden" name="op" value="import_records"/>
157	<input type="hidden" name="basketno" value="[% basketno %]" />	157	<input type="hidden" name="basketno" value="[% basketno %]" />
158	<input type="hidden" name="booksellerid" value="[% booksellerid %]" />	158	<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
Lines 170-178 Link Here
170	<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 %]" />
171	<span class="citation">[% biblio.citation %]</span>	171	<span class="citation">[% biblio.citation %]</span>
172	</label>	172	</label>
173	( Show <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> \| <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% biblio.import_record_id %]" title="Card" rel="gb_page_center[600,500]">Card</a> ; <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&breedingid=[% biblio.import_record_id %]&import_batch_id=[% biblio.import_batch_id %]&biblionumber=[% biblio.match_biblionumber %]">Add order</a> )	173	<span class="links" style="font-weight: normal;">
174		174	( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> \| <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% biblio.import_record_id %]" title="Card" rel="gb_page_center[600,500]">Card</a> \| <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&breedingid=[% biblio.import_record_id %]&import_batch_id=[% biblio.import_batch_id %]&biblionumber=[% biblio.match_biblionumber %]">Add order</a> )
175		175	</span>
176	</legend>	176	</legend>
177	<ol>	177	<ol>
178	<li class="status">	178	<li class="status">
Lines 201-207 Link Here
201	</li>	201	</li>
202	<li class="discount">	202	<li class="discount">
203	<label for="discount_record_[% biblio.import_record_id %]">Discount: </label>	203	<label for="discount_record_[% biblio.import_record_id %]">Discount: </label>
204	<input id="discount_record_[% biblio.import_record_id %]" type="text" value="[% biblio.discount %]" name="discount" />	204	<input id="discount_record_[% biblio.import_record_id %]" type="text" value="[% biblio.discount %]" name="discount" size="6" /> %
205	</li>	205	</li>
206	<li class="budget">	206	<li class="budget">
207	<label for="fund_record_[% biblio.import_record_id %]">Fund: </label>	207	<label for="fund_record_[% biblio.import_record_id %]">Fund: </label>
Lines 221-231 Link Here
221	[% END %]	221	[% END %]
222	</li>	222	</li>
223	<li class="sort1">	223	<li class="sort1">
224	<label for="sort1_record_[% biblio.import_record_id %]">Planning value 1: </label>	224	<label for="sort1_record_[% biblio.import_record_id %]">Statistic 1: </label>
225	<input id="sort1_record_[% biblio.import_record_id %]" type="text" id="sort1" size="20" name="sort1" value="[% biblio.sort1 %]" />	225	<input id="sort1_record_[% biblio.import_record_id %]" type="text" id="sort1" size="20" name="sort1" value="[% biblio.sort1 %]" />
226	</li>	226	</li>
227	<li class="sort2">	227	<li class="sort2">
228	<label for="sort2_record_[% biblio.import_record_id %]">Planning value 2: </label>	228	<label for="sort2_record_[% biblio.import_record_id %]">Statistic 2: </label>
229	<input id="sort2_record_[% biblio.import_record_id %]" type="text" id="sort2" size="20" name="sort2" value="[% biblio.sort2 %]" />	229	<input id="sort2_record_[% biblio.import_record_id %]" type="text" id="sort2" size="20" name="sort2" value="[% biblio.sort2 %]" />
230	</li>	230	</li>
231	</ol>	231	</ol>
Lines 271-276 Link Here
271	[% END %] <!-- items -->	271	[% END %] <!-- items -->
272	</div>	272	</div>
273	<div id="accounting_details">	273	<div id="accounting_details">
		274	<p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p>
274	<fieldset class="rows" style="float:none;">	275	<fieldset class="rows" style="float:none;">
275	<legend>Accounting details</legend>	276	<legend>Accounting details</legend>
276	<ol>	277	<ol>
Lines 319-325 Link Here
319	</li>	320	</li>
320	<li>	321	<li>
321	<div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>	322	<div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
322	<label for="sort1">Planning value 1: </label>	323	<label for="sort1">Statistic 1: </label>
323	[% IF CGIsort1 %]	324	[% IF CGIsort1 %]
324	<select id="all_sort1" size="1" name="all_sort1">	325	<select id="all_sort1" size="1" name="all_sort1">
325	[% FOREACH sort_opt IN CGIsort1 %]	326	[% FOREACH sort_opt IN CGIsort1 %]
Lines 336-342 Link Here
336	</li>	337	</li>
337	<li>	338	<li>
338	<span id="sort2_zone">	339	<span id="sort2_zone">
339	<label for="sort2">Planning value 2: </label>	340	<label for="sort2">Statistic 2: </label>
340	[% IF CGIsort2 %]	341	[% IF CGIsort2 %]
341	<select id="all_sort2" size="1" name="all_sort1">	342	<select id="all_sort2" size="1" name="all_sort1">
342	[% FOREACH sort_opt IN CGIsort2 %]	343	[% FOREACH sort_opt IN CGIsort2 %]