diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index d99b39aab9..c8bdf1ba83 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -2165,7 +2165,7 @@ sub GetLateOrders { my @query_params = (); my $select = " SELECT aqbasket.basketno, - aqorders.ordernumber, + aqorders.ordernumber AS ordernumber, DATE(aqbasket.closedate) AS orderdate, aqbasket.basketname AS basketname, aqbasket.basketgroupid AS basketgroupid, @@ -2174,6 +2174,8 @@ sub GetLateOrders { aqorders.ecost AS unitpricelib, aqorders.claims_count AS claims_count, aqorders.claimed_date AS claimed_date, + aqorders.order_internalnote AS internalnote, + aqorders.order_vendornote AS vendornote, aqbudgets.budget_name AS budget, borrowers.branchcode AS branch, aqbooksellers.name AS supplier, @@ -2181,6 +2183,7 @@ sub GetLateOrders { biblio.author, biblio.title, biblioitems.publishercode AS publisher, biblioitems.publicationyear, + biblioitems.isbn AS isbn, ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate, "; my $from = " diff --git a/acqui/lateorders-export.pl b/acqui/lateorders-export.pl index c8d86e6be4..332f65296b 100755 --- a/acqui/lateorders-export.pl +++ b/acqui/lateorders-export.pl @@ -53,6 +53,9 @@ for my $ordernumber ( @ordernumbers ) { basketno => $order->{basketno}, claims_count => $order->{claims_count}, claimed_date => $order->{claimed_date}, + internalnote => $order->{internalnote}, + vendornote => $order->{vendornote}, + isbn => $order->{isbn}, } ; } diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl index 9febcf65c9..5232dd7e05 100755 --- a/acqui/lateorders.pl +++ b/acqui/lateorders.pl @@ -53,6 +53,7 @@ use C4::Context; use C4::Acquisition; use C4::Letters; use Koha::DateUtils; +use Koha::Acquisition::Orders; my $input = new CGI; my ($template, $loggedinuser, $cookie) = get_template_and_user( @@ -122,6 +123,28 @@ if ($op and $op eq "send_alert"){ } } +if ($op && $op eq "save"){ + my $listorders; + my @orders = $input->param; + + foreach my $order (@orders){ + if ( $order ne "op"){ + my @split = split (/_/,$order); + $listorders->{$split[0]}->{$split[1]} = $input->param($order); + } + } + + my $orders_rs = Koha::Acquisition::Orders->search({ ordernumber => [ keys %$listorders ] }); + while ( my $order = $orders_rs->next ) { + my $internalnote = $listorders->{$order->ordernumber}->{i}; + my $vendornote = $listorders->{$order->ordernumber}->{v}; + + $order->order_internalnote($internalnote) if defined $internalnote; + $order->order_vendornote($vendornote) if defined $vendornote; + $order->store; + } +} + my @parameters = ( $delay ); push @parameters, $estimateddeliverydatefrom_dt ? $estimateddeliverydatefrom_dt->ymd() diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index e4353226a1..f604f7925e 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -37,6 +37,8 @@ modules: columnname: checkbox cannot_be_toggled: 1 cannot_be_modified: 1 + - + columnname: order_line - columnname: order_date - @@ -59,6 +61,13 @@ modules: columnname: claims_count - columnname: claimed_date + - + columnname: internal_note + - + columnname: vendor_note + - + columnname: isbn + basket: orders: - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt index 8231efbfc1..f15f54586e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt @@ -1,4 +1,4 @@ [%- USE Koha -%] [%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] -[%- BLOCK -%]ORDER DATE[%- delimiter | html -%]ESTIMATED DELIVERY DATE[%- delimiter | html -%]VENDOR[%- delimiter | html -%]INFORMATION[%- delimiter | html -%]TOTAL COST[%- delimiter | html -%]BASKET[%- delimiter | html -%]CLAIMS COUNT[%- delimiter | html -%]CLAIMED DATE[%- END -%] +[%- BLOCK -%]ORDER DATE[%- delimiter | html -%]ESTIMATED DELIVERY DATE[%- delimiter | html -%]VENDOR[%- delimiter | html -%]INFORMATION[%- delimiter | html -%]TOTAL COST[%- delimiter | html -%]BASKET[%- delimiter | html -%]CLAIMS COUNT[%- delimiter | html -%]CLAIMED DATE[%- delimiter | html -%]INTERNAL NOTE[%- delimiter | html -%]VENDOR NOTE[%- delimiter | html -%]ISBN[%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 8773505d17..caa5653c2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -56,6 +56,7 @@ [% ELSE %]
There are no late orders.
@@ -252,6 +263,38 @@ location.href = url; return false; }); + // Update all notes + $("#savenotes").click(function(){ + $("#savenotes").after("