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

(-)a/acqui/addorderiso2709.pl (-14 / +14 lines)
Lines 144-156 if ($op eq ""){ Link Here
144
    my $duplinbatch;
144
    my $duplinbatch;
145
    my $imported = 0;
145
    my $imported = 0;
146
    my @import_record_id_selected = $input->multi_param("import_record_id");
146
    my @import_record_id_selected = $input->multi_param("import_record_id");
147
    my @quantities = $input->multi_param('quantity');
148
    my @prices = $input->multi_param('price');
149
    my @orderreplacementprices = $input->multi_param('replacementprice');
150
    my @budgets_id = $input->multi_param('budget_id');
151
    my @discount = $input->multi_param('discount');
152
    my @sort1 = $input->multi_param('sort1');
153
    my @sort2 = $input->multi_param('sort2');
154
    my $matcher_id = $input->param('matcher_id');
147
    my $matcher_id = $input->param('matcher_id');
155
    my $active_currency = Koha::Acquisition::Currencies->get_active;
148
    my $active_currency = Koha::Acquisition::Currencies->get_active;
156
    my $biblio_count = 0;
149
    my $biblio_count = 0;
Lines 163-175 if ($op eq ""){ Link Here
163
        my $matches = $import_record->get_import_record_matches({ chosen => 1 });
156
        my $matches = $import_record->get_import_record_matches({ chosen => 1 });
164
        my $match = $matches->count ? $matches->next : undef;
157
        my $match = $matches->count ? $matches->next : undef;
165
        my $biblionumber = $match ? $match->candidate_match_id : 0;
158
        my $biblionumber = $match ? $match->candidate_match_id : 0;
166
        my $c_quantity = shift( @quantities ) || GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) || 1;
159
        my $c_quantity =
167
        my $c_budget_id = shift( @budgets_id ) || $input->param('all_budget_id') || $budget_id;
160
               $input->param( 'quantity_' . $import_record->import_record_id )
168
        my $c_discount = shift ( @discount);
161
            || GetMarcQuantity( $marcrecord, C4::Context->preference('marcflavour') )
169
        my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || '';
162
            || 1;
170
        my $c_sort2 = shift( @sort2 ) || $input->param('all_sort2') || '';
163
        my $c_budget_id =
171
        my $c_replacement_price = shift( @orderreplacementprices );
164
               $input->param( 'budget_id_' . $import_record->import_record_id )
172
        my $c_price = shift( @prices ) || GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
165
            || $input->param('all_budget_id')
166
            || $budget_id;
167
        my $c_discount = $input->param( 'discount_' . $import_record->import_record_id );
168
        my $c_sort1 = $input->param( 'sort1_' . $import_record->import_record_id ) || $input->param('all_sort1') || '';
169
        my $c_sort2 = $input->param( 'sort2_' . $import_record->import_record_id ) || $input->param('all_sort2') || '';
170
        my $c_replacement_price = $input->param( 'replacementprice_' . $import_record->import_record_id );
171
        my $c_price             = $input->param( 'price_' . $import_record->import_record_id )
172
            || GetMarcPrice( $marcrecord, C4::Context->preference('marcflavour') );
173
173
174
        # Insert the biblio, or find it through matcher
174
        # Insert the biblio, or find it through matcher
175
        if ( $biblionumber ) { # If matched during staging we can continue
175
        if ( $biblionumber ) { # If matched during staging we can continue
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-8 / +7 lines)
Lines 188-207 Link Here
188
                                                                </li>
188
                                                                </li>
189
                                                                <li class="quantity">
189
                                                                <li class="quantity">
190
                                                                    <label for="quantity_record_[% biblio.import_record_id | html %]" class="required">Quantity: </label>
190
                                                                    <label for="quantity_record_[% biblio.import_record_id | html %]" class="required">Quantity: </label>
191
                                                                    <input id="quantity_record_[% biblio.import_record_id | html %]" type="text" pattern="[0-9]+" value="[% biblio.quantity.length ? biblio.quantity : 1 | html %]" name="quantity" />
191
                                                                    <input id="quantity_record_[% biblio.import_record_id | html %]" type="text" pattern="[0-9]+" value="[% biblio.quantity.length ? biblio.quantity : 1 | html %]" name="quantity_[% biblio.import_record_id | html %]" />
192
                                                                    <span class="required">Required</span>
192
                                                                    <span class="required">Required</span>
193
                                                                </li>
193
                                                                </li>
194
                                                                <li class="price">
194
                                                                <li class="price">
195
                                                                    <label for="price_record_[% biblio.import_record_id | html %]">Price: </label>
195
                                                                    <label for="price_record_[% biblio.import_record_id | html %]">Price: </label>
196
                                                                    <input id="price_record_[% biblio.import_record_id | html %]" class="decimal" type="text" value="[% biblio.price | $Price on_editing => 1 %]" name="price" />
196
                                                                    <input id="price_record_[% biblio.import_record_id | html %]" class="decimal" type="text" value="[% biblio.price | $Price on_editing => 1 %]" name="price_[% biblio.import_record_id | html %]" />
197
                                                                </li>
197
                                                                </li>
198
                                                                <li class="replacementprice">
198
                                                                <li class="replacementprice">
199
                                                                    <label for="replacementprice_record_[% biblio.import_record_id | html %]">Replacement price: </label>
199
                                                                    <label for="replacementprice_record_[% biblio.import_record_id | html %]">Replacement price: </label>
200
                                                                    <input id="replacementprice_record_[% biblio.import_record_id | html %]" class="decimal" type="text" value="[% biblio.replacementprice | $Price on_editing => 1 %]" name="replacementprice" />
200
                                                                    <input id="replacementprice_record_[% biblio.import_record_id | html %]" class="decimal" type="text" value="[% biblio.replacementprice | $Price on_editing => 1 %]" name="replacementprice_[% biblio.import_record_id | html %]" />
201
                                                                </li>
201
                                                                </li>
202
                                                                <li class="discount">
202
                                                                <li class="discount">
203
                                                                    <label for="discount_record_[% biblio.import_record_id | html %]">Discount: </label>
203
                                                                    <label for="discount_record_[% biblio.import_record_id | html %]">Discount: </label>
204
                                                                    <input id="discount_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.discount | html %]" name="discount" size="6" /> %
204
                                                                    <input id="discount_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.discount | html %]" name="discount_[% biblio.import_record_id | html %]" size="6" /> %
205
                                                                    <div class="hint">If empty, discount rate from vendor will be used</div>
205
                                                                    <div class="hint">If empty, discount rate from vendor will be used</div>
206
                                                                </li>
206
                                                                </li>
207
                                                                <li class="fund">
207
                                                                <li class="fund">
Lines 210-216 Link Here
210
                                                                        <input type="hidden" size="20" name="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %]
210
                                                                        <input type="hidden" size="20" name="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %]
211
                                                                    [% ELSE %]
211
                                                                    [% ELSE %]
212
                                                                        <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label>
212
                                                                        <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label>
213
                                                                        <select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id">
213
                                                                        <select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id_[% biblio.import_record_id | html %]">
214
                                                                            <option value="">Select a fund (will use default if set)</option>
214
                                                                            <option value="">Select a fund (will use default if set)</option>
215
                                                                            [% FOREACH budget IN budget_loop %]
215
                                                                            [% FOREACH budget IN budget_loop %]
216
                                                                                [% IF ( budget.b_id == biblio.budget_id ) %]
216
                                                                                [% IF ( budget.b_id == biblio.budget_id ) %]
Lines 231-241 Link Here
231
                                                                </li>
231
                                                                </li>
232
                                                                <li class="sort1">
232
                                                                <li class="sort1">
233
                                                                    <label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label>
233
                                                                    <label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label>
234
                                                                    <input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1" value="[% biblio.sort1 | html %]" />
234
                                                                    <input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1_[% biblio.import_record_id | html %]" value="[% biblio.sort1 | html %]" />
235
                                                                </li>
235
                                                                </li>
236
                                                                <li class="sort2">
236
                                                                <li class="sort2">
237
                                                                    <label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label>
237
                                                                    <label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label>
238
                                                                    <input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2" value="[% biblio.sort2 | html %]" />
238
                                                                    <input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2_[% biblio.import_record_id | html %]" value="[% biblio.sort2 | html %]" />
239
                                                                </li>
239
                                                                </li>
240
                                                            </ol>
240
                                                            </ol>
241
                                                            [% IF ( biblio.iteminfos.size ) %]
241
                                                            [% IF ( biblio.iteminfos.size ) %]
242
- 

Return to bug 35254