From e3a00688ebf61cf6e74974a91d7e4965663dda23 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 12 Oct 2012 15:55:16 -0400 Subject: [PATCH] Bug 8913 - Improve acquisitions navigation Content-Type: text/plain; charset="utf-8" This patch adds a new menu for vendor-related pages in which vendor related "views" can be linked to: baskets, basket groups, contracts, invoices, uncertain prices. The acquisitions toolbar is pared down to vendor-related actions: New basket, contract, or vendor; edit vendor, delete vendor, receive shipment. Other small improvements have been made to other pages: corrections to breadcrumbs and title tags, adding useful links betweeen pages. --- acqui/invoice.pl | 2 +- acqui/invoices.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 +++----------------- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../prog/en/modules/acqui/invoices.tt | 12 +-- .../prog/en/modules/acqui/supplier.tt | 7 +- .../prog/en/modules/acqui/uncertainprice.tt | 24 ++++-- .../prog/en/modules/admin/aqcontract.tt | 33 +++------ 10 files changed, 80 insertions(+), 140 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc diff --git a/acqui/invoice.pl b/acqui/invoice.pl index 7c51ebc..a79287d 100755 --- a/acqui/invoice.pl +++ b/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'}, diff --git a/acqui/invoices.pl b/acqui/invoices.pl index 4b45e31..ae4971e 100755 --- a/acqui/invoices.pl +++ b/acqui/invoices.pl @@ -110,7 +110,7 @@ foreach (@suppliers) { } my %row = ( suppliername => $_->{'name'}, - supplierid => $_->{'id'}, + booksellerid => $_->{'id'}, selected => $selected, ); push @suppliers_loop, \%row; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index 0c52cc2..c0654fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/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 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc new file mode 100644 index 0000000..d2a8862 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc @@ -0,0 +1,15 @@ +[% IF ( booksellerid ) %] + +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index e1061da..07db148 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/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' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 7b28b87..d357e18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -40,7 +40,7 @@ [% END %]

    Invoice: [% invoicenumber %]

    -

    Supplier: [% suppliername %]

    +

    Supplier: [% suppliername %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index c324882..b34c250 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -54,8 +54,8 @@ $(document).ready(function() { [% FOREACH result IN results_loop %] - [% result.invoicenumber %] - [% result.suppliername %] + [% result.invoicenumber %] + [% result.suppliername %] [% IF (result.billingdate) %] [% result.billingdate | $KohaDates %] @@ -73,9 +73,9 @@ $(document).ready(function() { Details / [% IF ( result.closedate ) %] - Reopen + Reopen [% ELSE %] - Close + Close [% END %] @@ -149,9 +149,9 @@ $(document).ready(function() { [% FOREACH supplier IN suppliers_loop %] [% IF ( supplier.selected ) %] - + [% ELSE %] - + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 9cbc169..36fbb37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -47,10 +47,11 @@ if (f.company.value == "") { -
    +
    +
    [% IF ( enter ) %] [% IF ( booksellerid ) %]

    Update: [% name %]

    @@ -280,4 +281,8 @@ if (f.company.value == "") {
    +
    +[% INCLUDE 'vendor-menu.inc' %] +
    +
    [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 0902d07..5f53550 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/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 › Orders with uncertain prices for vendor [% booksellername %] [% INCLUDE 'doc-head-close.inc' %] @@ -30,15 +30,19 @@ 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)

    +

    Orders with uncertain prices for vendor [% booksellername %]

    Contact information

    Address: [% booksellerpostal %] @@ -129,5 +133,11 @@ function check(form) {

    [% END %] + +
    +
    +
    +[% INCLUDE 'vendor-menu.inc' %] +
    -
    [% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index e723ed4..969869c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/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 ) %] @@ -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' %] -- 1.7.9.5