Attachment #3725 for bug #6072

View | Details | Raw Unified | Return to bug 6072
Collapse All | Expand All

Lines 66-72 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/acqui/booksellers.pl (-1 / +1 lines)
66	query => $query,	66	query => $query,
67	type => 'intranet',	67	type => 'intranet',
68	authnotrequired => 0,	68	authnotrequired => 0,
69	flagsrequired => { acquisition => 'vendors_manage' },	69	flagsrequired => { acquisition => '*' },
70	debug => 1,	70	debug => 1,
71	}	71	}
72	);	72	);

Lines 91-97 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/acqui/parcels.pl (-1 / +1 lines)
91	query => $input,	91	query => $input,
92	type => 'intranet',	92	type => 'intranet',
93	authnotrequired => 0,	93	authnotrequired => 0,
94	flagsrequired => { acquisition => 1 },	94	flagsrequired => { acquisition => 'order_receive' },
95	debug => 1,	95	debug => 1,
96	}	96	}
97	);	97	);

Lines 64-70 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/acqui/supplier.pl (-1 / +1 lines)
64	query => $query,	64	query => $query,
65	type => 'intranet',	65	type => 'intranet',
66	authnotrequired => 0,	66	authnotrequired => 0,
67	flagsrequired => { acquisition => 'vendors_manage' },	67	flagsrequired => { acquisition => '*' },
68	debug => 1,	68	debug => 1,
69	}	69	}
70	);	70	);

Lines 21-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-9 / +13 lines)
21	new YAHOO.widget.Button("editcontracts");	21	new YAHOO.widget.Button("editcontracts");
22		22
23	var manageorders = [	23	var manageorders = [
24	{ text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&op=add_form"},	24	<!-- TMPL_IF name="CAN_user_acquisition_order_manage" -->
25	{ text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->"},	25	{ text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&op=add_form"},
26	{ text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->"},	26	{ text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->"},
		27	{ text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->"},
		28	<!-- /TMPL_IF -->
27	{ text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->" },	29	{ text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->" },
28	<!-- TMPL_IF name="basketno" -->	30	<!-- TMPL_IF name="basketno" -->
29	{ text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&basketno=<!--TMPL_VAR name="basketno" -->&owner=1"}	31	{ text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&basketno=<!--TMPL_VAR name="basketno" -->&owner=1"}
Lines 42-53 Link Here
42	</script>	44	</script>
43	<ul id="toolbar-list" class="toolbar">	45	<ul id="toolbar-list" class="toolbar">
44	<!-- TMPL_IF NAME="id" -->	46	<!-- TMPL_IF NAME="id" -->
45	<li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">Edit</a></li>	47	<!-- TMPL_IF name="CAN_user_acquisition_vendors_manage" -->
46	<li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=<!-- TMPL_VAR name="id" -->">New Contract</a></li>	48	<li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">Edit</a></li>
47	<li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR name="id" -->">Contracts</a></li>	49	<li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=<!-- TMPL_VAR name="id" -->">New Contract</a></li>
48	<!-- TMPL_UNLESS NAME="basketcount" -->	50	<li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR name="id" -->">Contracts</a></li>
49	<li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR name="id" -->&op=add_form">New Basket</a></li>	51	<!-- TMPL_UNLESS NAME="basketcount" -->
50	<!-- /TMPL_UNLESS -->	52	<li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR name="id" -->&op=add_form">New Basket</a></li>
		53	<!-- /TMPL_UNLESS -->
		54	<!-- /TMPL_IF -->
51	<!-- TMPL_ELSE -->	55	<!-- TMPL_ELSE -->
52	<li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Vendor</a></li>	56	<li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Vendor</a></li>
53	<!-- /TMPL_IF -->	57	<!-- /TMPL_IF -->




        <!-- TMPL_ELSE -->
            <tr>
        <!-- /TMPL_UNLESS -->
                <td><!-- TMPL_IF name="CAN_user_acquisition_order_manage" -->
                    <!-- TMPL_IF name="active" -->
                        <a href="basketheader.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&amp;op=add_form">New basket</a>
                    <!-- TMPL_ELSE -->
                        Inactive
                    <!-- /TMPL_IF -->
                    <!-- /TMPL_IF -->
                </td>
                <td>	<a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive shipment</a>
                </td>
- 

Return to bug 6072

Lines 58-68 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl (-2 / +3 lines)
58	<!-- TMPL_ELSE -->	58	<!-- TMPL_ELSE -->
59	<tr>	59	<tr>
60	<!-- /TMPL_UNLESS -->	60	<!-- /TMPL_UNLESS -->
61	<td> <!-- TMPL_IF name="active" -->	61	<td><!-- TMPL_IF name="CAN_user_acquisition_order_manage" -->
		62	<!-- TMPL_IF name="active" -->
62	<a href="basketheader.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&op=add_form">New basket</a>	63	<a href="basketheader.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&op=add_form">New basket</a>
63	<!-- TMPL_ELSE -->	64	<!-- TMPL_ELSE -->
64	Inactive	65	Inactive
65	<!-- /TMPL_IF -->	66	<!-- /TMPL_IF -->
		67	<!-- /TMPL_IF -->
66	</td>	68	</td>
67	<td> <a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive shipment</a>	69	<td> <a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive shipment</a>
68	</td>	70	</td>
69	-