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

(-)a/C4/Bookseller.pm (-6 / +9 lines)
Lines 65-71 sub GetBookSeller { Link Here
65
    $searchstring = q{%} . $searchstring . q{%};
65
    $searchstring = q{%} . $searchstring . q{%};
66
    my $query =
66
    my $query =
67
'select aqbooksellers.*, count(*) as basketcount from aqbooksellers left join aqbasket '
67
'select aqbooksellers.*, count(*) as basketcount from aqbooksellers left join aqbasket '
68
      . 'on aqbasket.booksellerid = aqbooksellers.id where name lIke ? group by aqbooksellers.id order by name';
68
      . 'on aqbasket.booksellerid = aqbooksellers.id where name like ? group by aqbooksellers.id order by name';
69
69
70
    my $dbh           = C4::Context->dbh;
70
    my $dbh           = C4::Context->dbh;
71
    my $sth           = $dbh->prepare($query);
71
    my $sth           = $dbh->prepare($query);
Lines 141-160 sub AddBookseller { Link Here
141
        INSERT INTO aqbooksellers
141
        INSERT INTO aqbooksellers
142
            (
142
            (
143
                name,      address1,      address2,   address3,      address4,
143
                name,      address1,      address2,   address3,      address4,
144
                postal,    phone,         fax,        url,           contact,
144
                postal,    phone,         accountnumber,   fax,      url,           
145
                contact,
145
                contpos,   contphone,     contfax,    contaltphone,  contemail,
146
                contpos,   contphone,     contfax,    contaltphone,  contemail,
146
                contnotes, active,        listprice,  invoiceprice,  gstreg,
147
                contnotes, active,        listprice,  invoiceprice,  gstreg,
147
                listincgst,invoiceincgst, gstrate,    discount,
148
                listincgst,invoiceincgst, gstrate,    discount,
148
                notes
149
                notes
149
            )
150
            )
150
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
151
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
151
      ;
152
      ;
152
    my $sth = $dbh->prepare($query);
153
    my $sth = $dbh->prepare($query);
153
    $sth->execute(
154
    $sth->execute(
154
        $data->{'name'},         $data->{'address1'},
155
        $data->{'name'},         $data->{'address1'},
155
        $data->{'address2'},     $data->{'address3'},
156
        $data->{'address2'},     $data->{'address3'},
156
        $data->{'address4'},     $data->{'postal'},
157
        $data->{'address4'},     $data->{'postal'},
157
        $data->{'phone'},        $data->{'fax'},
158
        $data->{'phone'},        $data->{'accountnumber'},
159
        $data->{'fax'},
158
        $data->{'url'},          $data->{'contact'},
160
        $data->{'url'},          $data->{'contact'},
159
        $data->{'contpos'},      $data->{'contphone'},
161
        $data->{'contpos'},      $data->{'contphone'},
160
        $data->{'contfax'},      $data->{'contaltphone'},
162
        $data->{'contfax'},      $data->{'contaltphone'},
Lines 192-198 sub ModBookseller { Link Here
192
    my $dbh    = C4::Context->dbh;
194
    my $dbh    = C4::Context->dbh;
193
    my $query  = 'UPDATE aqbooksellers
195
    my $query  = 'UPDATE aqbooksellers
194
        SET name=?,address1=?,address2=?,address3=?,address4=?,
196
        SET name=?,address1=?,address2=?,address3=?,address4=?,
195
            postal=?,phone=?,fax=?,url=?,contact=?,contpos=?,
197
            postal=?,phone=?,accountnumber=?,fax=?,url=?,contact=?,contpos=?,
196
            contphone=?,contfax=?,contaltphone=?,contemail=?,
198
            contphone=?,contfax=?,contaltphone=?,contemail=?,
197
            contnotes=?,active=?,listprice=?, invoiceprice=?,
199
            contnotes=?,active=?,listprice=?, invoiceprice=?,
198
            gstreg=?,listincgst=?,invoiceincgst=?,
200
            gstreg=?,listincgst=?,invoiceincgst=?,
Lines 203-209 sub ModBookseller { Link Here
203
        $data->{'name'},         $data->{'address1'},
205
        $data->{'name'},         $data->{'address1'},
204
        $data->{'address2'},     $data->{'address3'},
206
        $data->{'address2'},     $data->{'address3'},
205
        $data->{'address4'},     $data->{'postal'},
207
        $data->{'address4'},     $data->{'postal'},
206
        $data->{'phone'},        $data->{'fax'},
208
        $data->{'phone'},        $data->{'accountnumber'},
209
        $data->{'fax'},
207
        $data->{'url'},          $data->{'contact'},
210
        $data->{'url'},          $data->{'contact'},
208
        $data->{'contpos'},      $data->{'contphone'},
211
        $data->{'contpos'},      $data->{'contphone'},
209
        $data->{'contfax'},      $data->{'contaltphone'},
212
        $data->{'contfax'},      $data->{'contaltphone'},
(-)a/acqui/supplier.pl (+2 lines)
Lines 93-98 if ( $op eq 'display' ) { Link Here
93
        address3      => $supplier->{'address3'},
93
        address3      => $supplier->{'address3'},
94
        address4      => $supplier->{'address4'},
94
        address4      => $supplier->{'address4'},
95
        phone         => $supplier->{'phone'},
95
        phone         => $supplier->{'phone'},
96
        accountnumber => $supplier->{'accountnumber'},
96
        fax           => $supplier->{'fax'},
97
        fax           => $supplier->{'fax'},
97
        url           => $supplier->{'url'},
98
        url           => $supplier->{'url'},
98
        contact       => $supplier->{'contact'},
99
        contact       => $supplier->{'contact'},
Lines 142-147 if ( $op eq 'display' ) { Link Here
142
        address3     => $supplier->{'address3'},
143
        address3     => $supplier->{'address3'},
143
        address4     => $supplier->{'address4'},
144
        address4     => $supplier->{'address4'},
144
        phone        => $supplier->{'phone'},
145
        phone        => $supplier->{'phone'},
146
        accountnumber=> $supplier->{'accountnumber'},
145
        fax          => $supplier->{'fax'},
147
        fax          => $supplier->{'fax'},
146
        url          => $supplier->{'url'},
148
        url          => $supplier->{'url'},
147
        contact      => $supplier->{'contact'},
149
        contact      => $supplier->{'contact'},
(-)a/acqui/updatesupplier.pl (+1 lines)
Lines 80-85 $data{'address2'}=$addresses[1]; Link Here
80
$data{'address3'}=$addresses[2];
80
$data{'address3'}=$addresses[2];
81
$data{'address4'}=$addresses[3];
81
$data{'address4'}=$addresses[3];
82
$data{'phone'}=$input->param('company_phone');
82
$data{'phone'}=$input->param('company_phone');
83
$data{'accountnumber'}=$input->param('accountnumber');
83
$data{'fax'}=$input->param('company_fax');
84
$data{'fax'}=$input->param('company_fax');
84
$data{'url'}=$input->param('website');
85
$data{'url'}=$input->param('website');
85
$data{'contact'}=$input->param('company_contact_name');
86
$data{'contact'}=$input->param('company_contact_name');
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-4 / +8 lines)
Lines 53-59 if (f.company.value == "") { Link Here
53
            <li><label for="company_fax">Fax</label>
53
            <li><label for="company_fax">Fax</label>
54
                <input type="text" size="20" id="company_fax" name="company_fax" value="[% fax %]" /></li>
54
                <input type="text" size="20" id="company_fax" name="company_fax" value="[% fax %]" /></li>
55
            <li><label for="website">Website</label>
55
            <li><label for="website">Website</label>
56
                <input type="text" size="40" id="website" name="website" value="[% url %]" /></li></ol>
56
                <input type="text" size="40" id="website" name="website" value="[% url %]" /></li>
57
            <li><label for="accountnumber">Account number</label>
58
                <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber %]" /></li></ol>
57
        </fieldset>
59
        </fieldset>
58
        <fieldset class="rows">
60
        <fieldset class="rows">
59
            <legend>Contact details</legend>
61
            <legend>Contact details</legend>
Lines 136-142 if (f.company.value == "") { Link Here
136
                <input type="text" size="6" id="discount" name="discount" value="[% discount %]" />%</li>
138
                <input type="text" size="6" id="discount" name="discount" value="[% discount %]" />%</li>
137
            <li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="6" value="[% gstrate %]"/>% (leave blank for default tax of [% default_gst_rate %]%)</li>
139
            <li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="6" value="[% gstrate %]"/>% (leave blank for default tax of [% default_gst_rate %]%)</li>
138
            <li><label for="notes">Notes</label>
140
            <li><label for="notes">Notes</label>
139
                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>			
141
                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>
140
        </fieldset>
142
        </fieldset>
141
        <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> [% IF ( id ) %]
143
        <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> [% IF ( id ) %]
142
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
144
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
Lines 154-160 if (f.company.value == "") { Link Here
154
                <p><span class="label">Phone: </span>[% phone %]</p>
156
                <p><span class="label">Phone: </span>[% phone %]</p>
155
                <p><span class="label">Fax: </span>[% fax %]</p>
157
                <p><span class="label">Fax: </span>[% fax %]</p>
156
                [% IF ( url ) %]
158
                [% IF ( url ) %]
157
                    <p><span class="label">Web site: </span><a href="[% url %]">[% url %]</a></p>
159
                    <p><span class="label">Website: </span><a href="[% url %]">[% url %]</a></p>
160
                [% END %]
161
                [% IF ( accountnumber ) %]
162
                    <p><span class="label">Account number: </span>[% accountnumber %]</p>
158
                [% END %]
163
                [% END %]
159
            </div>
164
            </div>
160
            <div id="supplier-contact-details" class="yui-u">
165
            <div id="supplier-contact-details" class="yui-u">
161
- 

Return to bug 3388