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

(-)a/Koha/Schema/Result/EdifactEan.pm (-9 / +11 lines)
Lines 26-35 __PACKAGE__->table("edifact_ean"); Link Here
26
=head2 ee_id
26
=head2 ee_id
27
27
28
  data_type: 'integer'
28
  data_type: 'integer'
29
  extra: {unsigned => 1}
30
  is_auto_increment: 1
29
  is_auto_increment: 1
31
  is_nullable: 0
30
  is_nullable: 0
32
31
32
=head2 description
33
34
  data_type: 'varchar'
35
  is_nullable: 1
36
  size: 128
37
33
=head2 branchcode
38
=head2 branchcode
34
39
35
  data_type: 'varchar'
40
  data_type: 'varchar'
Lines 54-65 __PACKAGE__->table("edifact_ean"); Link Here
54
59
55
__PACKAGE__->add_columns(
60
__PACKAGE__->add_columns(
56
  "ee_id",
61
  "ee_id",
57
  {
62
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
58
    data_type => "integer",
63
  "description",
59
    extra => { unsigned => 1 },
64
  { data_type => "varchar", is_nullable => 1, size => 128 },
60
    is_auto_increment => 1,
61
    is_nullable => 0,
62
  },
63
  "branchcode",
65
  "branchcode",
64
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 },
66
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 },
65
  "ean",
67
  "ean",
Lines 98-105 __PACKAGE__->belongs_to( Link Here
98
);
100
);
99
101
100
102
101
# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-06-12 10:22:04
103
# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-11 12:04:29
102
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WWcMBSXeuzgCPqM0KMxfBg
104
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wziFbge4g2Ek1lc8Anto+Q
103
105
104
106
105
# You can replace this text with custom code or comments, and it will be preserved on regeneration
107
# You can replace this text with custom code or comments, and it will be preserved on regeneration
(-)a/admin/edi_ean_accounts.pl (+3 lines)
Lines 118-123 sub addsubmit { Link Here
118
    my $new_ean = $schema->resultset('EdifactEan')->new(
118
    my $new_ean = $schema->resultset('EdifactEan')->new(
119
        {
119
        {
120
            branchcode        => $input->param('branchcode'),
120
            branchcode        => $input->param('branchcode'),
121
            description       => $input->param('description'),
121
            ean               => $input->param('ean'),
122
            ean               => $input->param('ean'),
122
            id_code_qualifier => $input->param('id_code_qualifier'),
123
            id_code_qualifier => $input->param('id_code_qualifier'),
123
        }
124
        }
Lines 127-132 sub addsubmit { Link Here
127
}
128
}
128
129
129
sub editsubmit {
130
sub editsubmit {
131
    warn "DESC: " . $input->param('description');
130
    $schema->resultset('EdifactEan')->search(
132
    $schema->resultset('EdifactEan')->search(
131
        {
133
        {
132
            branchcode => $input->param('oldbranchcode'),
134
            branchcode => $input->param('oldbranchcode'),
Lines 135-140 sub editsubmit { Link Here
135
      )->update_all(
137
      )->update_all(
136
        {
138
        {
137
            branchcode        => $input->param('branchcode'),
139
            branchcode        => $input->param('branchcode'),
140
            description       => $input->param('description'),
138
            ean               => $input->param('ean'),
141
            ean               => $input->param('ean'),
139
            id_code_qualifier => $input->param('id_code_qualifier'),
142
            id_code_qualifier => $input->param('id_code_qualifier'),
140
        }
143
        }
(-)a/installer/data/mysql/atomicupdate/edifact.sql (-33 / +34 lines)
Lines 1-23 Link Here
1
-- Holds details for vendors supplying goods by EDI
1
-- Holds details for vendors supplying goods by EDI
2
CREATE TABLE IF NOT EXISTS vendor_edi_accounts (
2
CREATE TABLE IF NOT EXISTS vendor_edi_accounts (
3
  id int(11) NOT NULL auto_increment,
3
  id INT(11) NOT NULL auto_increment,
4
  description text NOT NULL,
4
  description TEXT NOT NULL,
5
  host varchar(40),
5
  host VARCHAR(40),
6
  username varchar(40),
6
  username VARCHAR(40),
7
  password varchar(40),
7
  password VARCHAR(40),
8
  last_activity date,
8
  last_activity DATE,
9
  vendor_id int(11) references aqbooksellers( id ),
9
  vendor_id INT(11) REFERENCES aqbooksellers( id ),
10
  download_directory text,
10
  download_directory TEXT,
11
  upload_directory text,
11
  upload_directory TEXT,
12
  san varchar(20),
12
  san VARCHAR(20),
13
  id_code_qualifier varchar(3) default '14',
13
  id_code_qualifier VARCHAR(3) default '14',
14
  transport varchar(6) default 'FTP',
14
  transport VARCHAR(6) default 'FTP',
15
  quotes_enabled tinyint(1) not null default 0,
15
  quotes_enabled TINYINT(1) not null default 0,
16
  invoices_enabled tinyint(1) not null default 0,
16
  invoices_enabled TINYINT(1) not null default 0,
17
  orders_enabled tinyint(1) not null default 0,
17
  orders_enabled TINYINT(1) not null default 0,
18
  responses_enabled tinyint(1) not null default 0,
18
  responses_enabled TINYINT(1) not null default 0,
19
  auto_orders tinyint(1) not null default 0,
19
  auto_orders TINYINT(1) not null default 0,
20
  shipment_budget integer(11) references aqbudgets( budget_id ),
20
  shipment_budget INTEGER(11) REFERENCES aqbudgets( budget_id ),
21
  PRIMARY KEY  (id),
21
  PRIMARY KEY  (id),
22
  KEY vendorid (vendor_id),
22
  KEY vendorid (vendor_id),
23
  KEY shipmentbudget (shipment_budget),
23
  KEY shipmentbudget (shipment_budget),
Lines 27-42 CREATE TABLE IF NOT EXISTS vendor_edi_accounts ( Link Here
27
27
28
-- Hold the actual edifact messages with links to associated baskets
28
-- Hold the actual edifact messages with links to associated baskets
29
CREATE TABLE IF NOT EXISTS edifact_messages (
29
CREATE TABLE IF NOT EXISTS edifact_messages (
30
  id int(11) NOT NULL auto_increment,
30
  id INT(11) NOT NULL auto_increment,
31
  message_type varchar(10) NOT NULL,
31
  message_type VARCHAR(10) NOT NULL,
32
  transfer_date date,
32
  transfer_date DATE,
33
  vendor_id int(11) references aqbooksellers( id ),
33
  vendor_id INT(11) REFERENCES aqbooksellers( id ),
34
  edi_acct  integer references vendor_edi_accounts( id ),
34
  edi_acct  INTEGER REFERENCES vendor_edi_accounts( id ),
35
  status text,
35
  status TEXT,
36
  basketno int(11) REFERENCES aqbasket( basketno),
36
  basketno INT(11) REFERENCES aqbasket( basketno),
37
  raw_msg mediumtext,
37
  raw_msg MEDIUMTEXT,
38
  filename text,
38
  filename TEXT,
39
  deleted boolean not null default 0,
39
  deleted BOOLEAN NOT NULL DEFAULT 0,
40
  PRIMARY KEY  (id),
40
  PRIMARY KEY  (id),
41
  KEY vendorid ( vendor_id),
41
  KEY vendorid ( vendor_id),
42
  KEY ediacct (edi_acct),
42
  KEY ediacct (edi_acct),
Lines 54-72 ALTER TABLE aqinvoices ADD CONSTRAINT edifact_msg_fk FOREIGN KEY ( message_id ) Link Here
54
54
55
-- Hold the supplier ids from quotes for ordering
55
-- Hold the supplier ids from quotes for ordering
56
-- although this is an EAN-13 article number the standard says 35 characters ???
56
-- although this is an EAN-13 article number the standard says 35 characters ???
57
ALTER TABLE aqorders ADD COLUMN line_item_id varchar(35);
57
ALTER TABLE aqorders ADD COLUMN line_item_id VARCHAR(35);
58
58
59
-- The suppliers unique reference usually a quotation line number ('QLI')
59
-- The suppliers unique reference usually a quotation line number ('QLI')
60
-- Otherwise Suppliers unique orderline reference ('SLI')
60
-- Otherwise Suppliers unique orderline reference ('SLI')
61
ALTER TABLE aqorders ADD COLUMN suppliers_reference_number varchar(35);
61
ALTER TABLE aqorders ADD COLUMN suppliers_reference_number VARCHAR(35);
62
ALTER TABLE aqorders ADD COLUMN suppliers_reference_qualifier varchar(3);
62
ALTER TABLE aqorders ADD COLUMN suppliers_reference_qualifier VARCHAR(3);
63
ALTER TABLE aqorders ADD COLUMN suppliers_report text;
63
ALTER TABLE aqorders ADD COLUMN suppliers_report text;
64
64
65
-- hold the EAN/SAN used in ordering
65
-- hold the EAN/SAN used in ordering
66
CREATE TABLE IF NOT EXISTS edifact_ean (
66
CREATE TABLE IF NOT EXISTS edifact_ean (
67
  ee_id integer(11) unsigned not null auto_increment primary key,
67
  ee_id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
68
  description VARCHAR(128) NULL DEFAULT NULL,
68
  branchcode VARCHAR(10) NOT NULL REFERENCES branches (branchcode),
69
  branchcode VARCHAR(10) NOT NULL REFERENCES branches (branchcode),
69
  ean varchar(15) NOT NULL,
70
  ean VARCHAR(15) NOT NULL,
70
  id_code_qualifier VARCHAR(3) NOT NULL DEFAULT '14',
71
  id_code_qualifier VARCHAR(3) NOT NULL DEFAULT '14',
71
  CONSTRAINT efk_branchcode FOREIGN KEY ( branchcode ) REFERENCES branches ( branchcode )
72
  CONSTRAINT efk_branchcode FOREIGN KEY ( branchcode ) REFERENCES branches ( branchcode )
72
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
73
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
(-)a/installer/data/mysql/kohastructure.sql (-33 / +33 lines)
Lines 3178-3201 CREATE TABLE aqorders_transfers ( Link Here
3178
3178
3179
DROP TABLE IF EXISTS vendor_edi_accounts;
3179
DROP TABLE IF EXISTS vendor_edi_accounts;
3180
CREATE TABLE IF NOT EXISTS vendor_edi_accounts (
3180
CREATE TABLE IF NOT EXISTS vendor_edi_accounts (
3181
  id int(11) NOT NULL auto_increment,
3181
  id INT(11) NOT NULL auto_increment,
3182
  description text NOT NULL,
3182
  description TEXT NOT NULL,
3183
  host varchar(40),
3183
  host VARCHAR(40),
3184
  username varchar(40),
3184
  username VARCHAR(40),
3185
  password varchar(40),
3185
  password VARCHAR(40),
3186
  last_activity date,
3186
  last_activity DATE,
3187
  vendor_id int(11) references aqbooksellers( id ),
3187
  vendor_id INT(11) REFERENCES aqbooksellers( id ),
3188
  download_directory text,
3188
  download_directory TEXT,
3189
  upload_directory text,
3189
  upload_directory TEXT,
3190
  san varchar(20),
3190
  san VARCHAR(20),
3191
  id_code_qualifier varchar(3) default '14',
3191
  id_code_qualifier VARCHAR(3) default '14',
3192
  transport varchar(6) default 'FTP',
3192
  transport VARCHAR(6) default 'FTP',
3193
  quotes_enabled tinyint(1) not null default 0,
3193
  quotes_enabled TINYINT(1) not null default 0,
3194
  invoices_enabled tinyint(1) not null default 0,
3194
  invoices_enabled TINYINT(1) not null default 0,
3195
  orders_enabled tinyint(1) not null default 0,
3195
  orders_enabled TINYINT(1) not null default 0,
3196
  responses_enabled tinyint(1) NOT NULL DEFAULT '0',
3196
  responses_enabled TINYINT(1) not null default 0,
3197
  auto_orders tinyint(1) NOT NULL DEFAULT '0',
3197
  auto_orders TINYINT(1) not null default 0,
3198
  shipment_budget integer(11) references aqbudgets( budget_id ),
3198
  shipment_budget INTEGER(11) REFERENCES aqbudgets( budget_id ),
3199
  PRIMARY KEY  (id),
3199
  PRIMARY KEY  (id),
3200
  KEY vendorid (vendor_id),
3200
  KEY vendorid (vendor_id),
3201
  KEY shipmentbudget (shipment_budget),
3201
  KEY shipmentbudget (shipment_budget),
Lines 3209-3224 CREATE TABLE IF NOT EXISTS vendor_edi_accounts ( Link Here
3209
3209
3210
DROP TABLE IF EXISTS edifact_messages;
3210
DROP TABLE IF EXISTS edifact_messages;
3211
CREATE TABLE IF NOT EXISTS edifact_messages (
3211
CREATE TABLE IF NOT EXISTS edifact_messages (
3212
  id int(11) NOT NULL auto_increment,
3212
  id INT(11) NOT NULL auto_increment,
3213
  message_type varchar(10) NOT NULL,
3213
  message_type VARCHAR(10) NOT NULL,
3214
  transfer_date date,
3214
  transfer_date DATE,
3215
  vendor_id int(11) references aqbooksellers( id ),
3215
  vendor_id INT(11) REFERENCES aqbooksellers( id ),
3216
  edi_acct  integer references vendor_edi_accounts( id ),
3216
  edi_acct  INTEGER REFERENCES vendor_edi_accounts( id ),
3217
  status text,
3217
  status TEXT,
3218
  basketno int(11) references aqbasket( basketno),
3218
  basketno INT(11) REFERENCES aqbasket( basketno),
3219
  raw_msg mediumtext,
3219
  raw_msg MEDIUMTEXT,
3220
  filename text,
3220
  filename TEXT,
3221
  deleted boolean not null default 0,
3221
  deleted BOOLEAN NOT NULL DEFAULT 0,
3222
  PRIMARY KEY  (id),
3222
  PRIMARY KEY  (id),
3223
  KEY vendorid ( vendor_id),
3223
  KEY vendorid ( vendor_id),
3224
  KEY ediacct (edi_acct),
3224
  KEY ediacct (edi_acct),
Lines 3713-3723 CREATE TABLE audio_alerts ( Link Here
3713
3713
3714
DROP TABLE IF EXISTS edifact_ean;
3714
DROP TABLE IF EXISTS edifact_ean;
3715
CREATE TABLE IF NOT EXISTS edifact_ean (
3715
CREATE TABLE IF NOT EXISTS edifact_ean (
3716
  ee_id int(11) NOT NULL AUTO_INCREMENT,
3716
  ee_id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
3717
  branchcode varchar(10) not null references branches (branchcode),
3717
  description VARCHAR(128) NULL DEFAULT NULL,
3718
  ean varchar(15) NOT NULL,
3718
  branchcode VARCHAR(10) NOT NULL REFERENCES branches (branchcode),
3719
  id_code_qualifier varchar(3) NOT NULL default '14',
3719
  ean VARCHAR(15) NOT NULL,
3720
  PRIMARY KEY (ee_id),
3720
  id_code_qualifier VARCHAR(3) NOT NULL DEFAULT '14',
3721
  CONSTRAINT efk_branchcode FOREIGN KEY ( branchcode ) REFERENCES branches ( branchcode )
3721
  CONSTRAINT efk_branchcode FOREIGN KEY ( branchcode ) REFERENCES branches ( branchcode )
3722
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3722
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3723
3723
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt (-5 / +6 lines)
Lines 15-33 Link Here
15
    <div id="yui-main">
15
    <div id="yui-main">
16
    <div class="yui-b">
16
    <div class="yui-b">
17
17
18
    <h2>Identify the branch account submitting the EDI order</h2>
18
    <h2>Select the library account submitting the EDI order</h2>
19
    <br />
19
    <br />
20
    <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
20
    <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
21
         <p>Select ordering branch account: </p>
21
         <p>Select ordering library account: </p>
22
         <select id="ean" name="ean">
22
         <select id="ean" name="ean">
23
             [% FOREACH eanacct IN eans %]
23
             [% FOREACH eanacct IN eans %]
24
             <option value="[% eanacct.ean %]">[% eanacct.branch.branchname %] ([% eanacct.ean %])</option>
24
             <option value="[% eanacct.ean %]">[% eanacct.branch.branchname %] ([% eanacct.ean %]) [% IF eanacct.description %][[% eanacct.description %]][% END %]</option>
25
             [% END %]
25
             [% END %]
26
        </select>
26
        </select>
27
        <br />
28
        <input type="hidden" id="basketno" value="[% basketno %]" name="basketno" />
27
        <input type="hidden" id="basketno" value="[% basketno %]" name="basketno" />
29
        <input type="hidden" value="ediorder" name="op" />
28
        <input type="hidden" value="ediorder" name="op" />
30
        <input type="submit" value="Send EDI order" />
29
        <p>
30
            <input type="submit" value="Send EDI order" />
31
        </p>
31
    </form>
32
    </form>
32
</div>
33
</div>
33
</div>
34
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt (-4 / +9 lines)
Lines 52-59 Link Here
52
<form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" name="Eanform" method="post">
52
<form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" name="Eanform" method="post">
53
  <input type="hidden" name="op" value="save" />
53
  <input type="hidden" name="op" value="save" />
54
  [% IF ean %]
54
  [% IF ean %]
55
      <input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
55
      <input type="hidden" name="oldbranchcode" value="[% ean.branch.branchcode %]" />
56
      <input type="hidden" name="oldean" value="[% ean %]" />
56
      <input type="hidden" name="oldean" value="[% ean.ean %]" />
57
  [% END %]
57
  [% END %]
58
58
59
  <fieldset class="rows">
59
  <fieldset class="rows">
Lines 79-86 Link Here
79
              </select>
79
              </select>
80
          </li>
80
          </li>
81
          <li>
81
          <li>
82
             <label for="description">Description: </label>
83
             <input type="text" name="description" id="description" size="30" maxlength="64" value="[% ean.description %]" />
84
          </li>
85
          <li>
82
             <label for="ean">EAN: </label>
86
             <label for="ean">EAN: </label>
83
             <input type="text" name="ean" id="ean`" size="20" maxlength="90" value="[% ean.ean %]" />
87
             <input type="text" name="ean" id="ean" size="20" maxlength="90" value="[% ean.ean %]" />
84
          </li>
88
          </li>
85
          <li>
89
          <li>
86
             <label for="id_code_qualifier">Qualifier: </label>
90
             <label for="id_code_qualifier">Qualifier: </label>
Lines 128-133 Link Here
128
    <table>
132
    <table>
129
        <tr>
133
        <tr>
130
            <th>Library</th>
134
            <th>Library</th>
135
            <th>Description</th>
131
            <th>EAN</th>
136
            <th>EAN</th>
132
            <th>Qualifier</th>
137
            <th>Qualifier</th>
133
            <th>Actions</th>
138
            <th>Actions</th>
Lines 135-140 Link Here
135
        [% FOREACH ean IN eans %]
140
        [% FOREACH ean IN eans %]
136
            [% IF loop.even %]<tr>[% ELSE %]<tr class="highlight">[% END %]
141
            [% IF loop.even %]<tr>[% ELSE %]<tr class="highlight">[% END %]
137
                <td>[% ean.branch.branchname %]</td>
142
                <td>[% ean.branch.branchname %]</td>
143
                <td>[% ean.description %]</td>
138
                <td>[% ean.ean %]</td>
144
                <td>[% ean.ean %]</td>
139
                <td>
145
                <td>
140
                 [% FOREACH qualifier IN code_qualifiers %]
146
                 [% FOREACH qualifier IN code_qualifiers %]
141
- 

Return to bug 7736