Attachment #130470 for bug #16258

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

Lines 52-57 use CGI qw ( -utf8 ); Link Here

(-)a/acqui/basketgroup.pl (+1 lines)
52	use File::Spec;	52	use File::Spec;
53		53
54	use C4::Acquisition qw( GetOrders GetOrder get_rounded_price GetBasket GetBasketgroup GetBasketsByBasketgroup GetBasketgroups GetBasketsByBookseller ModBasket CloseBasketgroup GetBasketGroupAsCSV DelBasketgroup ReOpenBasketgroup ModBasketgroup NewBasket NewBasketgroup );	54	use C4::Acquisition qw( GetOrders GetOrder get_rounded_price GetBasket GetBasketgroup GetBasketsByBasketgroup GetBasketgroups GetBasketsByBookseller ModBasket CloseBasketgroup GetBasketGroupAsCSV DelBasketgroup ReOpenBasketgroup ModBasketgroup NewBasket NewBasketgroup );
		55	use Koha::Database;
55	use Koha::EDI qw( get_edifact_ean create_edi_order );	56	use Koha::EDI qw( get_edifact_ean create_edi_order );
56		57
57	use Koha::Biblioitems;	58	use Koha::Biblioitems;




use Modern::Perl;

return {
    bug_number => "16258",
    description => "A preference to enabled/disable edifact",
    up => sub {
        my ($args) = @_;
        my ($dbh, $out) = @$args{qw(dbh out)};

        $dbh->do(q{
            INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
            ('Edifact', '0', NULL, 'Enables edifact acquisitions functions', 'YesNo')
        });
    },
};

Lines 186-191 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
186	('DumpTemplateVarsIntranet', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the staff intranet.', 'YesNo'),	186	('DumpTemplateVarsIntranet', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the staff intranet.', 'YesNo'),
187	('DumpTemplateVarsOpac', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the opac.', 'YesNo'),	187	('DumpTemplateVarsOpac', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the opac.', 'YesNo'),
188	('EasyAnalyticalRecords','0','','If on, display in the catalogue screens tools to easily setup analytical record relationships','YesNo'),	188	('EasyAnalyticalRecords','0','','If on, display in the catalogue screens tools to easily setup analytical record relationships','YesNo'),
		189	('Edifact','0','Enables edifact acquisitions functions','Enables use of Edifact electronic message exchange for acquisitions','YesNo'),
189	('EdifactInvoiceImport', 'automatic', 'automatic\|manual', "If on, don't auto-import EDI invoices, just keep them in the database with the status 'new'", 'Choice'),	190	('EdifactInvoiceImport', 'automatic', 'automatic\|manual', "If on, don't auto-import EDI invoices, just keep them in the database with the status 'new'", 'Choice'),
190	('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL),	191	('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL),
191	('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL),	192	('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL),




[% USE Koha %]
<div id="navmenu">
    <div id="navmenulist">
        <h5>Acquisitions</h5>

            [% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %]
            [% IF ( suggestion && CAN_user_suggestions_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
            <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
            [% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %]
                <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
            [% END %]
        </ul>

                [% END %]
            </ul>
        [% END %]
        [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %]
            <h5>Administration</h5>
            <ul>
                [% IF ( CAN_user_acquisition_period_manage ) %]

                [% IF ( CAN_user_acquisition_currencies_manage ) %]
                    <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
                [% END %]
                [% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %]
                    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
                    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
                [% END %]

Lines 199-205 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-2 / +2 lines)
199	</dl>	199	</dl>
200	[% END %]	200	[% END %]
201		201
202	[% IF ( CAN_user_acquisition_currencies_manage \|\| CAN_user_acquisition_period_manage \|\| CAN_user_acquisition_budget_manage \|\| CAN_user_acquisition_edi_manage ) %]	202	[% IF ( CAN_user_acquisition_currencies_manage \|\| CAN_user_acquisition_period_manage \|\| CAN_user_acquisition_budget_manage \|\| ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) ) %]
203	<h3>Acquisition parameters</h3>	203	<h3>Acquisition parameters</h3>
204	<dl>	204	<dl>
205	[% IF ( CAN_user_acquisition_currencies_manage ) %]	205	[% IF ( CAN_user_acquisition_currencies_manage ) %]
Lines 214-220 Link Here
214	<dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>	214	<dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>
215	<dd>Define funds within your budgets</dd>	215	<dd>Define funds within your budgets</dd>
216	[% END %]	216	[% END %]
217	[% IF ( CAN_user_acquisition_edi_manage ) %]	217	[% IF ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) %]
218	<dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></dt>	218	<dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></dt>
219	<dd>Manage vendor EDI accounts for import/export</dd>	219	<dd>Manage vendor EDI accounts for import/export</dd>
220	<dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>	220	<dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>

Lines 112-117 Acquisitions: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-1 / +8 lines)
112	- 'If you choose <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=EmailAddressForSuggestions">EmailAddressForSuggestions</a> you have to enter a valid email address:'	112	- 'If you choose <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=EmailAddressForSuggestions">EmailAddressForSuggestions</a> you have to enter a valid email address:'
113	- pref: EmailAddressForSuggestions	113	- pref: EmailAddressForSuggestions
114	class: email	114	class: email
		115	-
		116	- pref: Edifact
		117	default: no
		118	choices:
		119	1: Enable
		120	0: Disable
		121	- edifact message exchange for acquisitions
		122
115	Printing:	123	Printing:
116	-	124	-
117	- Use the	125	- Use the
118	-

Return to bug 16258

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_16258.pl (+15 lines)
	1	use Modern::Perl;
	2
	3	return {
	4	bug_number => "16258",
	5	description => "A preference to enabled/disable edifact",
	6	up => sub {
	7	my ($args) = @_;
	8	my ($dbh, $out) = @$args{qw(dbh out)};
	9
	10	$dbh->do(q{
	11	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
	12	('Edifact', '0', NULL, 'Enables edifact acquisitions functions', 'YesNo')
	13	});
	14	},
	15	};

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (-3 / +4 lines)
		1	[% USE Koha %]
1	<div id="navmenu">	2	<div id="navmenu">
2	<div id="navmenulist">	3	<div id="navmenulist">
3	<h5>Acquisitions</h5>	4	<h5>Acquisitions</h5>
Lines 6-12 Link Here
6	[% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %]	7	[% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %]
7	[% IF ( suggestion && CAN_user_suggestions_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]	8	[% IF ( suggestion && CAN_user_suggestions_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
8	<li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>	9	<li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
9	[% IF CAN_user_acquisition_edi_manage %]	10	[% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %]
10	<li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>	11	<li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
11	[% END %]	12	[% END %]
12	</ul>	13	</ul>
Lines 22-28 Link Here
22	[% END %]	23	[% END %]
23	</ul>	24	</ul>
24	[% END %]	25	[% END %]
25	[% IF ( CAN_user_acquisition_period_manage \|\| CAN_user_acquisition_budget_manage \|\| CAN_user_acquisition_currencies_manage \|\| CAN_user_acquisition_edi_manage \|\| CAN_user_parameters_manage_additional_fields ) %]	26	[% IF ( CAN_user_acquisition_period_manage \|\| CAN_user_acquisition_budget_manage \|\| CAN_user_acquisition_currencies_manage \|\| ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) \|\| CAN_user_parameters_manage_additional_fields ) %]
26	<h5>Administration</h5>	27	<h5>Administration</h5>
27	<ul>	28	<ul>
28	[% IF ( CAN_user_acquisition_period_manage ) %]	29	[% IF ( CAN_user_acquisition_period_manage ) %]
Lines 34-40 Link Here
34	[% IF ( CAN_user_acquisition_currencies_manage ) %]	35	[% IF ( CAN_user_acquisition_currencies_manage ) %]
35	<li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>	36	<li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
36	[% END %]	37	[% END %]
37	[% IF CAN_user_acquisition_edi_manage %]	38	[% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %]
38	<li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>	39	<li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
39	<li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>	40	<li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
40	[% END %]	41	[% END %]