Attachment #54539 for bug #16258

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

Lines 55-60 use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsBy Link Here

(-)a/acqui/basketgroup.pl (+5 lines)
55	use C4::Branch qw/GetBranches/;	55	use C4::Branch qw/GetBranches/;
56	use C4::Members qw/GetMember/;	56	use C4::Members qw/GetMember/;
57	use Koha::EDI qw/create_edi_order get_edifact_ean/;	57	use Koha::EDI qw/create_edi_order get_edifact_ean/;
		58	use Koha::Database;
58		59
59	use Koha::Acquisition::Bookseller;	60	use Koha::Acquisition::Bookseller;
60		61
Lines 232-237 my $op = $input->param('op') \|\| 'display'; Link Here
232	# - display : display the list of all basketgroups for a vendor	233	# - display : display the list of all basketgroups for a vendor
233	my $booksellerid = $input->param('booksellerid');	234	my $booksellerid = $input->param('booksellerid');
234	$template->param(booksellerid => $booksellerid);	235	$template->param(booksellerid => $booksellerid);
		236	my $schema = Koha::Database->new()->schema();
		237	my $rs = $schema->resultset('VendorEdiAccount')->search(
		238	{ vendor_id => $booksellerid, } );
		239	$template->param( ediaccount => ($rs->count > 0));
235		240
236	if ( $op eq "add" ) {	241	if ( $op eq "add" ) {
237	#	242	#

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/addedifactsyspref.sql (+1 lines)
	1	INSERT IGNORE INTO systempreferences VALUES( 'Edifact', '0', 'Enable Edifact Electronic Ordering', 'Enables use of Edifact electronic ordering', 'YesNo');

Lines 133-138 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
133	('DumpTemplateVarsIntranet', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the staff intranet.', 'YesNo'),	133	('DumpTemplateVarsIntranet', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the staff intranet.', 'YesNo'),
134	('DumpTemplateVarsOpac', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the opac.', 'YesNo'),	134	('DumpTemplateVarsOpac', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the opac.', 'YesNo'),
135	('EasyAnalyticalRecords','0','','If on, display in the catalogue screens tools to easily setup analytical record relationships','YesNo'),	135	('EasyAnalyticalRecords','0','','If on, display in the catalogue screens tools to easily setup analytical record relationships','YesNo'),
		136	('Edifact','0','Enable Edifact Electronic Ordering','Enables use of Edifact electronic ordering','YesNo'),
136	('emailLibrarianWhenHoldIsPlaced','0',NULL,'If ON, emails the librarian whenever a hold is placed','YesNo'),	137	('emailLibrarianWhenHoldIsPlaced','0',NULL,'If ON, emails the librarian whenever a hold is placed','YesNo'),
137	('EnableAdvancedCatalogingEditor','0','','Enable the Rancor advanced cataloging editor','YesNo'),	138	('EnableAdvancedCatalogingEditor','0','','Enable the Rancor advanced cataloging editor','YesNo'),
138	('EnableBorrowerFiles','0',NULL,'If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'),	139	('EnableBorrowerFiles','0',NULL,'If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'),

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (+2 lines)
9	[% IF ( CAN_user_parameters ) %]	9	[% IF ( CAN_user_parameters ) %]
10	<li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>	10	<li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
11	[% END %]	11	[% END %]
		12	[% IF Koha.Preference("Edifact") %]
12	[% IF CAN_user_acquisition_edi_manage %]	13	[% IF CAN_user_acquisition_edi_manage %]
13	<li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>	14	<li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
14	[% END %]	15	[% END %]
		16	[% END %]
15	</ul>	17	</ul>

Lines 144-150 function submitForm(form) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (+2 lines)
144	<div class="btn-group"><a href="[% script_name %]?op=reopen&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]&mode=singlebg" class="btn btn-small" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>	144	<div class="btn-group"><a href="[% script_name %]?op=reopen&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]&mode=singlebg" class="btn btn-small" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
145	<div class="btn-group"><a href="[% script_name %]?op=export&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>	145	<div class="btn-group"><a href="[% script_name %]?op=export&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
146	<div class="btn-group"><a href="[% script_name %]?op=print&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>	146	<div class="btn-group"><a href="[% script_name %]?op=print&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
		147	[% IF ediaccount %]
147	<div class="btn-group"><a href="[% script_name %]?op=ediprint&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>	148	<div class="btn-group"><a href="[% script_name %]?op=ediprint&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
		149	[% END %]
148	</div>	150	</div>
149	[% END %]	151	[% END %]
150	[% IF (name && closedbg) %]	152	[% IF (name && closedbg) %]




                        <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>
                        <dd>Define funds within your budgets</dd>

                  [% IF Koha.Preference("Edifact") %]
                        <dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></dt>
                        <dd>Manage vendor EDI accounts for import/export</dd>
                        <dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>
                        <dd>Manage library EDI EANs</dd>
                  [% END %]
                </dl>

                <h3>Additional parameters</h3>

Lines 68-73 Acquisitions: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-1 / +7 lines)
68	yes: Send	68	yes: Send
69	no: Don't send	69	no: Don't send
70	- blind copy (BCC) to logged in user when sending serial or acquisitions claims notices.	70	- blind copy (BCC) to logged in user when sending serial or acquisitions claims notices.
		71	-
		72	- pref: Edifact
		73	default: no
		74	choices:
		75	yes: Enable
		76	no: Disable
		77	- Enable electronic ordering using EDIFACT format messages
71		78
72	Printing:	79	Printing:
73	-	80	-
74	-

Return to bug 16258

Lines 98-107 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (+2 lines)
98	<dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>	98	<dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>
99	<dd>Define funds within your budgets</dd>	99	<dd>Define funds within your budgets</dd>
100		100
		101	[% IF Koha.Preference("Edifact") %]
101	<dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></dt>	102	<dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></dt>
102	<dd>Manage vendor EDI accounts for import/export</dd>	103	<dd>Manage vendor EDI accounts for import/export</dd>
103	<dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>	104	<dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>
104	<dd>Manage library EDI EANs</dd>	105	<dd>Manage library EDI EANs</dd>
		106	[% END %]
105	</dl>	107	</dl>
106		108
107	<h3>Additional parameters</h3>	109	<h3>Additional parameters</h3>