@@ -, +, @@ - Menu appears when booksellerid variable is present - Redundant heading removed - Additional variables added to enable proper display of the toolbar - Revision corrects broken links pointed out by QA. - Revision adds check of existing baskets and subscriptions as a condition on display of the vendor delete button. --- acqui/booksellers.pl | 3 +- acqui/invoice.pl | 2 +- acqui/invoices.pl | 11 +-- acqui/uncertainprice.pl | 2 + admin/aqcontract.pl | 2 + .../prog/en/includes/acquisitions-toolbar.inc | 45 +++------- .../intranet-tmpl/prog/en/includes/vendor-menu.inc | 15 ++++ .../prog/en/modules/acqui/basketheader.tt | 78 ++--------------- .../prog/en/modules/acqui/booksellers.tt | 7 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../prog/en/modules/acqui/invoices.tt | 14 +-- .../prog/en/modules/acqui/supplier.tt | 7 +- .../prog/en/modules/acqui/uncertainprice.tt | 89 +++++++++++--------- .../prog/en/modules/admin/aqcontract.tt | 33 +++----- 14 files changed, 130 insertions(+), 180 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc --- a/acqui/booksellers.pl +++ a/acqui/booksellers.pl @@ -87,7 +87,8 @@ my $supplier_count = @suppliers; if ( $supplier_count == 1 ) { $template->param( supplier_name => $suppliers[0]->{'name'}, - booksellerid => $suppliers[0]->{'booksellerid'} + booksellerid => $suppliers[0]->{'id'}, + basketcount => $suppliers[0]->{'basketcount'} ); } --- a/acqui/invoice.pl +++ a/acqui/invoice.pl @@ -185,7 +185,7 @@ $template->param( invoiceid => $details->{'invoiceid'}, invoicenumber => $details->{'invoicenumber'}, suppliername => $details->{'suppliername'}, - supplierid => $details->{'booksellerid'}, + booksellerid => $details->{'booksellerid'}, datereceived => $details->{'datereceived'}, shipmentdate => $details->{'shipmentdate'}, billingdate => $details->{'billingdate'}, --- a/acqui/invoices.pl +++ a/acqui/invoices.pl @@ -50,7 +50,7 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( ); my $invoicenumber = $input->param('invoicenumber'); -my $supplier = $input->param('supplier'); +my $supplierid = $input->param('supplierid'); my $shipmentdatefrom = $input->param('shipmentdatefrom'); my $shipmentdateto = $input->param('shipmentdateto'); my $billingdatefrom = $input->param('billingdatefrom'); @@ -71,7 +71,7 @@ if ( $op and $op eq "do_search" ) { my $billingdateto_iso = C4::Dates->new($billingdateto)->output("iso"); my @invoices = GetInvoices( invoicenumber => $invoicenumber, - suppliername => $supplier, + supplierid => $supplierid, shipmentdatefrom => $shipmentdatefrom_iso, shipmentdateto => $shipmentdateto_iso, billingdatefrom => $billingdatefrom_iso, @@ -89,6 +89,7 @@ if ( $op and $op eq "do_search" ) { billingdate => $_->{billingdate}, invoicenumber => $_->{invoicenumber}, suppliername => $_->{suppliername}, + booksellerid => $_->{booksellerid}, receivedbiblios => $_->{receivedbiblios}, receiveditems => $_->{receiveditems}, subscriptionid => $_->{subscriptionid}, @@ -104,13 +105,13 @@ my @suppliers_loop = (); my $suppliername; foreach (@suppliers) { my $selected = 0; - if ( $supplier && $supplier == $_->{'id'} ) { + if ( $supplierid && $supplierid == $_->{'id'} ) { $selected = 1; $suppliername = $_->{'name'}; } my %row = ( suppliername => $_->{'name'}, - supplierid => $_->{'id'}, + booksellerid => $_->{'id'}, selected => $selected, ); push @suppliers_loop, \%row; @@ -138,7 +139,7 @@ $template->param( do_search => ( $op and $op eq "do_search" ) ? 1 : 0, results_loop => \@results_loop, invoicenumber => $invoicenumber, - supplier => $supplier, + booksellerid => $supplierid, suppliername => $suppliername, billingdatefrom => $billingdatefrom, billingdateto => $billingdateto, --- a/acqui/uncertainprice.pl +++ a/acqui/uncertainprice.pl @@ -127,6 +127,8 @@ $template->param( uncertainpriceorders => \@orders, booksellercontemail => $bookseller->{'contemail'}, booksellercontnotes => $bookseller->{'contnotes'}, booksellernotes => $bookseller->{'notes'}, + basketcount => $bookseller->{'basketcount'}, + subscriptioncount => $bookseller->{'subscriptioncount'}, owner => $owner, scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl"); output_html_with_http_headers $input, $cookie, $template->output; --- a/admin/aqcontract.pl +++ a/admin/aqcontract.pl @@ -51,6 +51,8 @@ $template->param( contractnumber => $contractnumber, booksellerid => $booksellerid, booksellername => $bookseller->{name}, + basketcount => $bookseller->{'basketcount'}, + subscriptioncount => $bookseller->{'subscriptioncount'}, ); #ADD_FORM: called if $op is 'add_form'. Used to create form to add or modify a record --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -9,38 +9,20 @@ // YUI Toolbar Functions - function yuiToolbar() { - - new YAHOO.widget.Button("newperiod"); - new YAHOO.widget.Button("newbudget"); - new YAHOO.widget.Button("newsupplier"); - new YAHOO.widget.Button("newbasket"); + function yuiToolbar() { new YAHOO.widget.Button("editsupplier"); new YAHOO.widget.Button("deletesupplier"); new YAHOO.widget.Button("receive"); - new YAHOO.widget.Button("newcontract"); - new YAHOO.widget.Button("editcontracts"); + [% UNLESS ( booksellerid ) %]new YAHOO.widget.Button("newvendor");[% END %] - var manageorders = [ + var newmenu = [ [% IF ( CAN_user_acquisition_order_manage ) %] - [% IF (active) %] - { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"}, - [% END %] - { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"}, - { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]"}, - [% END %] - { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" }, - [% IF ( basketno ) %] - { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&owner=1"} - [% ELSE %] - { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1"} + { text: _("Basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"}, [% END %] + [% IF ( CAN_user_acquisition_contracts_manage ) %]{ text: _("Contract"), url: "/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]"},[% END %] + { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?op=enter"} ] - [% IF ( booksellerid ) %] - [% IF ( basketcount ) %] - new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"}); - [% END %] - [% END %] + new YAHOO.widget.Button({type: "menu", label: _("New"), name: "newmenu", menu: newmenu, container: "newmenuc"}); } //]]> @@ -48,18 +30,15 @@ --- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc @@ -0,0 +1,15 @@ +[% IF ( booksellerid ) %] + +[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -1,8 +1,8 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › +<title>Koha › Acquisitions › [% IF ( add_form ) %] [% IF ( basketno ) %]Edit basket '[% basketname %]' - [% ELSE %]add a basket to [% booksellername %] + [% ELSE %]Add a basket to [% booksellername %] [% END %] [% END %] @@ -28,61 +28,6 @@ function Check(ff) { } //]]> - - [% INCLUDE 'header.inc' %] @@ -94,18 +39,16 @@ li.list2 { [% booksellername %] › [% IF ( add_form ) %] [% IF ( basketno ) %]Edit basket '[% basketname %]' - [% ELSE %]add a basket to [% booksellername %] + [% ELSE %]Add a basket to [% booksellername %] [% END %] [% END %] -
+
- +
- -
- + [% IF ( add_form ) %] [% IF ( basketno ) %]

Edit basket [% basketname %]

@@ -126,7 +69,7 @@ li.list2 {
  • - +
  • - + + Cancel [% END %]
  • -
    - [% INCLUDE 'acquisitions-menu.inc' %] -
    -
    [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -47,9 +47,7 @@ $(document).ready(function() {
    [% INCLUDE 'acquisitions-toolbar.inc' %] -[% IF ( count == 1 ) %] -

    [% supplier_name %]

    -[% ELSE %] +[% UNLESS ( count == 1 ) %]

    You searched on vendor [% supplier %], [% count %] results found

    [% END %] [% IF ( loop_suppliers.size ) %] @@ -139,6 +137,9 @@ $(document).ready(function() {
    +[% IF ( booksellerid ) %] +[% INCLUDE 'vendor-menu.inc' %] +[% END %] [% INCLUDE 'acquisitions-menu.inc' %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -40,7 +40,7 @@ [% END %]

    Invoice: [% invoicenumber %]

    -

    Supplier: [% suppliername %]

    +

    Supplier: [% suppliername %]

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -57,8 +57,8 @@ $(document).ready(function() { [% FOREACH result IN results_loop %] - [% result.invoicenumber %] - [% result.suppliername %] + [% result.invoicenumber %] + [% result.suppliername %] [% IF (result.billingdate) %] [% result.billingdate | $KohaDates %] @@ -76,9 +76,9 @@ $(document).ready(function() { Details / [% IF ( result.closedate ) %] - Reopen + Reopen [% ELSE %] - Close + Close [% END %] @@ -148,13 +148,13 @@ $(document).ready(function() {
  • - [% FOREACH supplier IN suppliers_loop %] [% IF ( supplier.selected ) %] - + [% ELSE %] - + [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -47,10 +47,11 @@ if (f.company.value == "") { -
    +
    +
    [% IF ( enter ) %] [% IF ( booksellerid ) %]

    Update: [% name %]

    @@ -284,4 +285,8 @@ if (f.company.value == "") {
    +
    +[% INCLUDE 'vendor-menu.inc' %] +
    +
    [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Orders with uncertain prices for Vendor [% booksellername %] +Koha › Acquisitions › [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -30,41 +30,48 @@ function check(form) { [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + -
    -
    -
    +
    + +
    +
    +
    + +[% INCLUDE 'acquisitions-toolbar.inc' %] [% IF ( validate ) %] [% ELSE %] -

    Orders with uncertain prices for vendor [% booksellername %] (edit)

    -

    Contact information

    -

    Address: - [% booksellerpostal %] - [% bookselleraddress1 %] - [% bookselleraddress2 %] - [% bookselleraddress3 %] - [% bookselleraddress4 %] - [% booksellerurl %] -

    -

    Phone: - [% booksellerphone %] / Fax: - [% booksellerfax %]

    -
    -
    Contact:
    -
    [% booksellercontact %] - [% booksellercontpos %] - [% booksellercontphone %] - [% booksellercontaltphone %] - [% booksellercontemail %] - [% booksellercontnotes %] -
    -
    - [% IF ( booksellernotes ) %] -

    Notes: - [% booksellernotes %]

    + [% IF ( booksellername ) %] +

    Orders with uncertain prices for vendor [% booksellername %]

    +

    Contact information

    +

    Address: + [% booksellerpostal %] + [% bookselleraddress1 %] + [% bookselleraddress2 %] + [% bookselleraddress3 %] + [% bookselleraddress4 %] + [% booksellerurl %] +

    +

    Phone: + [% booksellerphone %] / Fax: + [% booksellerfax %]

    +
    +
    Contact:
    +
    [% booksellercontact %] + [% booksellercontpos %] + [% booksellercontphone %] + [% booksellercontaltphone %] + [% booksellercontemail %] + [% booksellercontnotes %] +
    +
    + [% IF ( booksellernotes ) %] +

    Notes: + [% booksellernotes %]

    + [% END %] [% END %] +

    Orders with uncertain prices

    @@ -86,12 +93,12 @@ function check(form) { - - - - - - + + + + + + @@ -128,5 +135,11 @@ function check(form) {
    [% END %] + + + +
    +[% INCLUDE 'vendor-menu.inc' %] +
    -[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -83,9 +83,13 @@ function Check(ff) { [% IF ( else ) %]Contracts[% END %] -
    +
    +
    -
    +
    +
    + +[% INCLUDE 'acquisitions-toolbar.inc' %] [% IF ( add_form ) %]
    @@ -161,23 +165,6 @@ function Check(ff) { [% END %] [% IF ( else ) %] -
    - - -

    Contract(s) of [% booksellername %]

    [% IF ( loop ) %]
    basketorderbyuncertainpricequantityBasketOrderByUncertainPriceQuantity
    @@ -202,9 +189,13 @@ function Check(ff) { [% END %]
    [% ELSE %] -
    There are no contracts with this vendor.
    +
    There are no contracts with this vendor. Add a contract.
    [% END %] [% END %] -
    +
    +
    +
    +[% INCLUDE 'vendor-menu.inc' %] +
    [% INCLUDE 'intranet-bottom.inc' %] --