@@ -, +, @@ --- 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 --- 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 @@ -110,7 +110,7 @@ foreach (@suppliers) { } my %row = ( suppliername => $_->{'name'}, - supplierid => $_->{'id'}, + booksellerid => $_->{'id'}, selected => $selected, ); push @suppliers_loop, \%row; --- 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' %] -Supplier: [% suppliername %]
+Supplier: [% suppliername %]