gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15531: (QA followup) Fix several small issues 

* Add `AFTER` to DB update
  * Change "Is standing order basket:" to "Orders are standing:"
  * Disable item creation when adding from a staged file
  * Correctly show is_standing for existing baskets

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jesse Weaver 2016-01-11 16:07:33 -07:00 committed by Kyle M Hall
parent 97d988b54f
commit 26297903e4
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
acqui/addorderiso2709.pl
View File

@ -99,7 +99,8 @@ if ($op eq ""){
"allmatch" => $allmatch,
);
import_biblios_list($template, $cgiparams->{'import_batch_id'});
if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
my $basket = GetBasket($cgiparams->{basketno});
if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
# prepare empty item form
my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
@ -238,7 +239,8 @@ if ($op eq ""){
# 4th, add items if applicable
# parse the item sent by the form, and create an item just for the import_record_id we are dealing with
# this is not optimised, but it's working !
if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
my $basket = GetBasket($cgiparams->{basketno});
if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
my @tags = $input->multi_param('tag');
my @subfields = $input->multi_param('subfield');
my @field_values = $input->multi_param('field_value');

1
acqui/basketheader.pl
View File

@ -123,6 +123,7 @@ if ( $op eq 'add_form' ) {
booksellers => \@booksellers,
deliveryplace => $basket->{deliveryplace},
billingplace => $basket->{billingplace},
is_standing => $basket->{is_standing},
);
my $billingplace = $basket->{'billingplace'} || C4::Context->userenv->{"branch"};

2
installer/data/mysql/atomicupdate/bug_15531-add_is_standing_to_aqbasket.sql
View File

@ -1 +1 @@
ALTER TABLE aqbasket ADD COLUMN is_standing TINYINT(1) NOT NULL DEFAULT 0;
ALTER TABLE aqbasket ADD COLUMN is_standing TINYINT(1) NOT NULL DEFAULT 0 AFTER branch;

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View File

@ -320,7 +320,7 @@
[% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>[% END %]
[% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li>[% END %]
[% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li>[% END %]
<li><span class="label">Is standing order basket:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li>
<li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li>
</ol>

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
View File

@ -115,7 +115,11 @@
[% END %]
<li>
<label for="is_standing">Orders are standing:</label>
<input type="checkbox" id="is_standing" name="is_standing"/>
[% IF is_standing %]
<input type="checkbox" id="is_standing" name="is_standing" checked="checked" />
[% ELSE %]
<input type="checkbox" id="is_standing" name="is_standing"/>
[% END %]
<div class="hint">Standing orders do not close when received.</div>
</li>
</ol>