Attachment #130842 for bug #16258

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

Lines 9-15 return { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_16258.pl (-1 / +1 lines)
9		9
10	$dbh->do(q{	10	$dbh->do(q{
11	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES	11	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
12	('Edifact', '1', NULL, 'Enables edifact acquisitions functions', 'YesNo')	12	('EDIFACT', '1', NULL, 'Enables EDIFACT acquisitions functions', 'YesNo')
13	});	13	});
14	},	14	},
15	};	15	};

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

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +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',NULL,'Enables edifact acquisitions functions','YesNo'),	189	('EDIFACT','0',NULL,'Enables EDIFACT acquisitions functions','YesNo'),
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	('EdifactInvoiceImport', 'automatic', 'automatic\|manual', "If on, don't auto-import EDI invoices, just keep them in the database with the status 'new'", 'Choice'),
191	('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL),	191	('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL),
192	('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL),	192	('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL),




            [% 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 106-112 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (-2 / +2 lines)
106	</ul>	106	</ul>
107	[% END %]	107	[% END %]
108		108
109	[% IF ( CAN_user_acquisition_currencies_manage \|\| CAN_user_acquisition_period_manage \|\| CAN_user_acquisition_budget_manage \|\| ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) ) %]	109	[% IF ( CAN_user_acquisition_currencies_manage \|\| CAN_user_acquisition_period_manage \|\| CAN_user_acquisition_budget_manage \|\| ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) %]
110	<h5>Acquisition parameters</h5>	110	<h5>Acquisition parameters</h5>
111		111
112	<ul>	112	<ul>
Lines 119-125 Link Here
119	[% IF ( CAN_user_acquisition_budget_manage ) %]	119	[% IF ( CAN_user_acquisition_budget_manage ) %]
120	<li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>	120	<li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
121	[% END %]	121	[% END %]
122	[% IF ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) %]	122	[% IF ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) %]
123	<li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>	123	<li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
124	<li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>	124	<li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
125	[% END %]	125	[% END %]





                    [% PROCESS csv_export %]

                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div>
                        [% END %]


                        <th>GST %</th>
                        <th>GST</th>
                        <th>Fund</th>
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
                        <th>Supplier report</th>
                        [% END %]
                        [% IF ( active ) %]

                        <th>&nbsp;</th>
                        <th>[% foot_loo.tax_value | $Price %]</th>
                        <th>&nbsp;</th>
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
                        <th>&nbsp;</th>
                        [% END %]
                        [% IF ( active ) %]

                    <th>&nbsp;</th>
                    <th>[% total_tax_value | $Price %]</th>
                    <th>&nbsp;</th>
                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
                    <th>&nbsp;</th>
                    [% END %]
                    [% IF ( active ) %]

                        <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
                        <td>[% books_loo.budget_name | html %]</td>
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
                        <td>[% books_loo.suppliers_report | html %]</td>
                        [% END %]
                        [% IF ( active ) %]

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 \|\| ( Koha.Preference('Edifact') && 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 ( Koha.Preference('Edifact') && 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>




            - layout when printing basket groups.
    EDIFACT:
        -
            - pref: EDIFACT
              default: no
              choices:
                1: Enable
                0:  Disable
            - EDIFACT message exchange for acquisitions
        -
            - pref: EdifactInvoiceImport
              default: no

Lines 38-44 use Koha::Edifact::Transport; Link Here

(-)a/misc/cronjobs/edi_cron.pl (-2 / +1 lines)
38	use Koha::Plugins::Handler;	38	use Koha::Plugins::Handler;
39	use Fcntl qw( LOCK_EX O_CREAT O_RDWR SEEK_SET );	39	use Fcntl qw( LOCK_EX O_CREAT O_RDWR SEEK_SET );
40		40
41	die "Syspref 'Edifact' is disabled" unless C4::Context->preference('Edifact');	41	die "Syspref 'EDIFACT' is disabled" unless C4::Context->preference('EDIFACT');
42		42
43	my $logdir = C4::Context->config('logdir');	43	my $logdir = C4::Context->config('logdir');
44		44
45	-

Return to bug 16258

Lines 99-105 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-5 / +5 lines)
99		99
100	[% PROCESS csv_export %]	100	[% PROCESS csv_export %]
101		101
102	[% IF Koha.Preference('Edifact') && ediaccount %]	102	[% IF Koha.Preference('EDIFACT') && ediaccount %]
103	<div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno \| uri %]&booksellerid=[% booksellerid \| uri %]" class="btn btn-default" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div>	103	<div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno \| uri %]&booksellerid=[% booksellerid \| uri %]" class="btn btn-default" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div>
104	[% END %]	104	[% END %]
105		105
Lines 448-454 Link Here
448	<th>GST %</th>	448	<th>GST %</th>
449	<th>GST</th>	449	<th>GST</th>
450	<th>Fund</th>	450	<th>Fund</th>
451	[% IF Koha.Preference('Edifact') && ediaccount %]	451	[% IF Koha.Preference('EDIFACT') && ediaccount %]
452	<th>Supplier report</th>	452	<th>Supplier report</th>
453	[% END %]	453	[% END %]
454	[% IF ( active ) %]	454	[% IF ( active ) %]
Lines 477-483 Link Here
477	<th> </th>	477	<th> </th>
478	<th>[% foot_loo.tax_value \| $Price %]</th>	478	<th>[% foot_loo.tax_value \| $Price %]</th>
479	<th> </th>	479	<th> </th>
480	[% IF Koha.Preference('Edifact') && ediaccount %]	480	[% IF Koha.Preference('EDIFACT') && ediaccount %]
481	<th> </th>	481	<th> </th>
482	[% END %]	482	[% END %]
483	[% IF ( active ) %]	483	[% IF ( active ) %]
Lines 504-510 Link Here
504	<th> </th>	504	<th> </th>
505	<th>[% total_tax_value \| $Price %]</th>	505	<th>[% total_tax_value \| $Price %]</th>
506	<th> </th>	506	<th> </th>
507	[% IF Koha.Preference('Edifact') && ediaccount %]	507	[% IF Koha.Preference('EDIFACT') && ediaccount %]
508	<th> </th>	508	<th> </th>
509	[% END %]	509	[% END %]
510	[% IF ( active ) %]	510	[% IF ( active ) %]
Lines 590-596 Link Here
590	<td class="number">[% books_loo.tax_rate * 100 \| html %]</td>	590	<td class="number">[% books_loo.tax_rate * 100 \| html %]</td>
591	<td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value \| $Price %]</td>	591	<td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value \| $Price %]</td>
592	<td>[% books_loo.budget_name \| html %]</td>	592	<td>[% books_loo.budget_name \| html %]</td>
593	[% IF Koha.Preference('Edifact') && ediaccount %]	593	[% IF Koha.Preference('EDIFACT') && ediaccount %]
594	<td>[% books_loo.suppliers_report \| html %]</td>	594	<td>[% books_loo.suppliers_report \| html %]</td>
595	[% END %]	595	[% END %]
596	[% IF ( active ) %]	596	[% IF ( active ) %]

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (-3 / +3 lines)
7	[% 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 %]
8	[% 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 %]
9	<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>
10	[% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %]	10	[% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
11	<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>
12	[% END %]	12	[% END %]
13	</ul>	13	</ul>
Lines 23-29 Link Here
23	[% END %]	23	[% END %]
24	</ul>	24	</ul>
25	[% END %]	25	[% END %]
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	[% 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 ) %]
27	<h5>Administration</h5>	27	<h5>Administration</h5>
28	<ul>	28	<ul>
29	[% IF ( CAN_user_acquisition_period_manage ) %]	29	[% IF ( CAN_user_acquisition_period_manage ) %]
Lines 35-41 Link Here
35	[% IF ( CAN_user_acquisition_currencies_manage ) %]	35	[% IF ( CAN_user_acquisition_currencies_manage ) %]
36	<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>
37	[% END %]	37	[% END %]
38	[% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %]	38	[% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
39	<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>
40	<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>
41	[% END %]	41	[% END %]

Lines 125-136 Acquisitions: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-2 / +2 lines)
125	- layout when printing basket groups.	125	- layout when printing basket groups.
126	EDIFACT:	126	EDIFACT:
127	-	127	-
128	- pref: Edifact	128	- pref: EDIFACT
129	default: no	129	default: no
130	choices:	130	choices:
131	1: Enable	131	1: Enable
132	0: Disable	132	0: Disable
133	- edifact message exchange for acquisitions	133	- EDIFACT message exchange for acquisitions
134	-	134	-
135	- pref: EdifactInvoiceImport	135	- pref: EdifactInvoiceImport
136	default: no	136	default: no