@@ -, +, @@
spelling
---
admin/edi_accounts.pl | 42 +++---
.../prog/en/modules/admin/admin-home.tt | 2 +-
.../prog/en/modules/admin/edi_accounts.tt | 21 ++-
.../prog/en/modules/admin/edi_ean_accounts.tt | 141 +++++++++++----------
4 files changed, 108 insertions(+), 98 deletions(-)
--- a/admin/edi_accounts.pl
+++ a/admin/edi_accounts.pl
@@ -51,27 +51,6 @@ if ( $op eq 'acct_form' ) {
}
);
$template->param( vendors => \@vendors );
- $template->param(
- code_qualifiers => [
- {
- code => '14',
- description => 'EAN International',
- },
- {
- code => '31B',
- description => 'US SAN Agency',
- },
- {
- code => '91',
- description => 'Assigned by supplier',
- },
- {
- code => '92',
- description => 'Assigned by buyer',
- },
- ]
- );
-
}
elsif ( $op eq 'delete_confirm' ) {
show_account();
@@ -129,6 +108,27 @@ else {
$template->param( ediaccounts => \@ediaccounts );
}
+$template->param(
+ code_qualifiers => [
+ {
+ code => '14',
+ description => 'EAN International',
+ },
+ {
+ code => '31B',
+ description => 'US SAN Agency',
+ },
+ {
+ code => '91',
+ description => 'Assigned by supplier',
+ },
+ {
+ code => '92',
+ description => 'Assigned by buyer',
+ },
+ ]
+);
+
output_html_with_http_headers( $input, $cookie, $template->output );
sub get_account {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -101,7 +101,7 @@
EDI Accounts
Manage vendor EDI accounts for import/export
EDI EANs
- Manage Branch EDI EANs
+ Manage library EDI EANs
Additional parameters
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
@@ -127,11 +127,11 @@
[% FOREACH qualifier IN code_qualifiers %]
[% IF qualifier.code == account.id_code_qualifier %]
[% ELSE %]
[% END %]
[% END %]
@@ -174,7 +174,7 @@
[% END %]
-
+
[% IF account.auto_orders %]
[% ELSE %]
@@ -233,8 +233,8 @@
Password |
Download Directory |
Upload Directory |
- id_code_type |
- id_code |
+ Qualifier |
+ SAN |
Quotes |
Orders |
Invoices |
@@ -252,10 +252,17 @@
[% account.transport %] |
[% account.host %] |
[% account.username %] |
- [% IF account.password %]xxxxx[% END %] |
+ [% IF account.password %]*****[% END %] |
[% account.download_directory %] |
[% account.upload_directory %] |
- [% account.id_code_qualifier %] |
+
+ [% FOREACH qualifier IN code_qualifiers %]
+ [% IF qualifier.code == account.id_code_qualifier %]
+ [% qualifier.description %]
+ [% END %]
+ [% END %]
+ ([% account.id_code_qualifier %])
+ |
[% account.san %] |
[% IF account.quotes_enabled %]
Y |
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
@@ -2,9 +2,9 @@
Koha › Administration › EDI EANs
[% IF ean_form %]
[% IF ean %]
- ’ Modify branch EAN
+ ’ Modify library EAN
[% ELSE %]
- ’ Add new branch EAN
+ ’ Add new library EAN
[% END %]
[% END %]
[% IF delete_confirm %]
@@ -23,14 +23,14 @@
› EDI EANs
[% IF ean_form %]
[% IF ean %]
- › Modify branch EAN
+ › Modify library EAN
[% ELSE %]
- › Add new branch EAN
+ › Add new library EAN
[% END %]
[% ELSIF delete_confirm %]
› Confirm deletion of Ean
[% ELSE %]
- › Branch EANs
+ › Library EANs
[% END %]
@@ -52,52 +52,53 @@
-
[% END %]
+
[% IF delete_confirm %]
-
Delete EAN [% ean.ean %] for branch [% ean.branch.branchname %]?
+Delete EAN [% ean.ean %] for [% ean.branch.branchname %]?
[% END %]
+
[% IF display %]
-Branch EANs
-
-
- Branch |
- EAN |
- Code Type |
- Actions |
-
- [% FOREACH ean IN eans %]
- [% IF loop.even %]
- [% ELSE %]
- [% END %]
- [% ean.branch.branchname %] |
- [% ean.ean %] |
- [% ean.id_code_qualifier %] |
-
- Edit | Delete |
-
- [% END %]
+ Library EANs
+
+
+ Library |
+ EAN |
+ Qualifier |
+ Actions |
+
+ [% FOREACH ean IN eans %]
+ [% IF loop.even %][% ELSE %]
[% END %]
+ [% ean.branch.branchname %] |
+ [% ean.ean %] |
+ [% ean.id_code_qualifier %] |
+
+ Edit
+ |
+ Delete
+ |
+
+ [% END %]
[% END %]
--