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

(-)a/acqui/addorderiso2709.pl (-1 / +1 lines)
Lines 174-180 if ($op eq ""){ Link Here
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
(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (+6 lines)
Lines 554-559 padding: 0; Link Here
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;
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js (+3 lines)
Lines 215-220 function calcNewsuggTotal(){ Link Here
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;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-10 / +11 lines)
Lines 146-153 Link Here
146
                  </ul>
146
                  </ul>
147
147
148
                  <div id="records_to_import">
148
                  <div id="records_to_import">
149
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
149
                    <span class="checkall"><a id="checkAll" href="#">Check all</a></span>
150
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
150
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck all</a></span>
151
                        <input type="hidden" name="op" value="import_records"/>
151
                        <input type="hidden" name="op" value="import_records"/>
152
                        <input type="hidden" name="basketno" value="[% basketno %]" />
152
                        <input type="hidden" name="basketno" value="[% basketno %]" />
153
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
153
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
Lines 165-173 Link Here
165
                              <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
165
                              <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
166
                              <span class="citation">[% biblio.citation %]</span>
166
                              <span class="citation">[% biblio.citation %]</span>
167
                            </label>
167
                            </label>
168
                            ( 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&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> )
168
                            <span class="links" style="font-weight: normal;">
169
169
                              ( <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> )
170
170
                            </span>
171
                          </legend>
171
                          </legend>
172
                          <ol>
172
                          <ol>
173
                            <li class="status">
173
                            <li class="status">
Lines 196-202 Link Here
196
                            </li>
196
                            </li>
197
                            <li class="discount">
197
                            <li class="discount">
198
                                <label for="discount_record_[% biblio.import_record_id %]">Discount: </label>
198
                                <label for="discount_record_[% biblio.import_record_id %]">Discount: </label>
199
                                <input id="discount_record_[% biblio.import_record_id %]" type="text" value="[% biblio.discount %]" name="discount" />
199
                                <input id="discount_record_[% biblio.import_record_id %]" type="text" value="[% biblio.discount %]" name="discount" size="6" /> %
200
                            </li>
200
                            </li>
201
                            <li class="budget">
201
                            <li class="budget">
202
                                <label for="fund_record_[% biblio.import_record_id %]">Fund: </label>
202
                                <label for="fund_record_[% biblio.import_record_id %]">Fund: </label>
Lines 216-226 Link Here
216
                                [% END %]
216
                                [% END %]
217
                            </li>
217
                            </li>
218
                            <li class="sort1">
218
                            <li class="sort1">
219
                                <label for="sort1_record_[% biblio.import_record_id %]">Planning value 1: </label>
219
                                <label for="sort1_record_[% biblio.import_record_id %]">Statistic 1: </label>
220
                                <input id="sort1_record_[% biblio.import_record_id %]" type="text" id="sort1" size="20" name="sort1" value="[% biblio.sort1 %]" />
220
                                <input id="sort1_record_[% biblio.import_record_id %]" type="text" id="sort1" size="20" name="sort1" value="[% biblio.sort1 %]" />
221
                            </li>
221
                            </li>
222
                            <li class="sort2">
222
                            <li class="sort2">
223
                                <label for="sort2_record_[% biblio.import_record_id %]">Planning value 2: </label>
223
                                <label for="sort2_record_[% biblio.import_record_id %]">Statistic 2: </label>
224
                                <input id="sort2_record_[% biblio.import_record_id %]" type="text" id="sort2" size="20" name="sort2" value="[% biblio.sort2 %]" />
224
                                <input id="sort2_record_[% biblio.import_record_id %]" type="text" id="sort2" size="20" name="sort2" value="[% biblio.sort2 %]" />
225
                            </li>
225
                            </li>
226
                          </ol>
226
                          </ol>
Lines 266-271 Link Here
266
                        [% END %] <!-- items -->
266
                        [% END %] <!-- items -->
267
                      </div>
267
                      </div>
268
                      <div id="accounting_details">
268
                      <div id="accounting_details">
269
                        <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>
269
                        <fieldset class="rows" style="float:none;">
270
                        <fieldset class="rows" style="float:none;">
270
                            <legend>Accounting details</legend>
271
                            <legend>Accounting details</legend>
271
                            <ol>
272
                            <ol>
Lines 314-320 Link Here
314
                                </li>
315
                                </li>
315
                                <li>
316
                                <li>
316
                                    <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
317
                                    <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
317
                                    <label for="sort1">Planning value 1: </label>
318
                                    <label for="sort1">Statistic 1: </label>
318
                                    [% IF CGIsort1 %]
319
                                    [% IF CGIsort1 %]
319
                                        <select id="all_sort1" size="1" name="all_sort1">
320
                                        <select id="all_sort1" size="1" name="all_sort1">
320
                                        [% FOREACH sort_opt IN CGIsort1 %]
321
                                        [% FOREACH sort_opt IN CGIsort1 %]
Lines 331-337 Link Here
331
                                </li>
332
                                </li>
332
                                <li>
333
                                <li>
333
                                  <span id="sort2_zone">
334
                                  <span id="sort2_zone">
334
                                    <label for="sort2">Planning value 2: </label>
335
                                    <label for="sort2">Statistic 2: </label>
335
                                    [% IF CGIsort2 %]
336
                                    [% IF CGIsort2 %]
336
                                        <select id="all_sort2" size="1" name="all_sort1">
337
                                        <select id="all_sort2" size="1" name="all_sort1">
337
                                        [% FOREACH sort_opt IN CGIsort2 %]
338
                                        [% FOREACH sort_opt IN CGIsort2 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-2 / +2 lines)
Lines 49-55 Acquisitions: Link Here
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