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

(-)a/C4/Bookseller.pm (-10 / +13 lines)
Lines 181-194 sub AddBookseller { Link Here
181
    my $query  = q|
181
    my $query  = q|
182
        INSERT INTO aqbooksellers
182
        INSERT INTO aqbooksellers
183
            (
183
            (
184
                name,      address1,      address2,     address3,   address4,
184
                name,      address1,      address2,      address3,       address4,
185
                postal,    phone,         accountnumber,fax,        url,
185
                postal,    phone,         accountnumber, fax,            url,
186
                contact,   contpos,       contphone,    contfax,    contaltphone,
186
                contact,   contpos,       contphone,     contfax,        contaltphone,
187
                contemail, contnotes,     active,       listprice,  invoiceprice,
187
                contemail, contnotes,     active,        listprice,      invoiceprice,
188
                gstreg,    listincgst,    invoiceincgst,gstrate,    discount,
188
                gstreg,    listincgst,    invoiceincgst, shippingincgst,
189
                gstrate,   sgstrate,      discount,
189
                notes,     deliverytime
190
                notes,     deliverytime
190
            )
191
            )
191
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
192
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
192
      ;
193
      ;
193
    my $sth = $dbh->prepare($query);
194
    my $sth = $dbh->prepare($query);
194
    $sth->execute(
195
    $sth->execute(
Lines 204-210 sub AddBookseller { Link Here
204
        $data->{active}       ,$data->{listprice},
205
        $data->{active}       ,$data->{listprice},
205
        $data->{invoiceprice} ,$data->{gstreg},
206
        $data->{invoiceprice} ,$data->{gstreg},
206
        $data->{listincgst}   ,$data->{invoiceincgst},
207
        $data->{listincgst}   ,$data->{invoiceincgst},
207
        $data->{gstrate}      ,$data->{discount},
208
        $data->{shippingincgst}   ,$data->{gstrate},
209
        $data->{sgstrate}      ,$data->{discount},
208
        $data->{notes}        ,$data->{deliverytime},
210
        $data->{notes}        ,$data->{deliverytime},
209
    );
211
    );
210
212
Lines 238-245 sub ModBookseller { Link Here
238
            postal=?,phone=?,accountnumber=?,fax=?,url=?,contact=?,contpos=?,
240
            postal=?,phone=?,accountnumber=?,fax=?,url=?,contact=?,contpos=?,
239
            contphone=?,contfax=?,contaltphone=?,contemail=?,
241
            contphone=?,contfax=?,contaltphone=?,contemail=?,
240
            contnotes=?,active=?,listprice=?, invoiceprice=?,
242
            contnotes=?,active=?,listprice=?, invoiceprice=?,
241
            gstreg=?,listincgst=?,invoiceincgst=?,
243
            gstreg=?,listincgst=?,invoiceincgst=?,shippingincgst=?,
242
            discount=?,notes=?,gstrate=?,deliverytime=?
244
            discount=?,notes=?,gstrate=?,sgstrate=?,deliverytime=?
243
        WHERE id=?';
245
        WHERE id=?';
244
    my $sth = $dbh->prepare($query);
246
    my $sth = $dbh->prepare($query);
245
    return $sth->execute(
247
    return $sth->execute(
Lines 255-262 sub ModBookseller { Link Here
255
        $data->{'active'},       $data->{'listprice'},
257
        $data->{'active'},       $data->{'listprice'},
256
        $data->{'invoiceprice'}, $data->{'gstreg'},
258
        $data->{'invoiceprice'}, $data->{'gstreg'},
257
        $data->{'listincgst'},   $data->{'invoiceincgst'},
259
        $data->{'listincgst'},   $data->{'invoiceincgst'},
260
        $data->{'shippingincgst'},
258
        $data->{'discount'},     $data->{'notes'},
261
        $data->{'discount'},     $data->{'notes'},
259
        $data->{'gstrate'},
262
        $data->{'gstrate'},      $data->{'sgstrate'},
260
        $data->{deliverytime},
263
        $data->{deliverytime},
261
        $data->{'id'}
264
        $data->{'id'}
262
    );
265
    );
(-)a/acqui/invoice.pl (-3 / +9 lines)
Lines 152-175 foreach my $budget (@$budgets) { Link Here
152
    }
152
    }
153
    push @budgets_loop, \%line;
153
    push @budgets_loop, \%line;
154
}
154
}
155
my $total_gste_shipment = $bookseller->{'shippingincgst'}?$total_gste + ((1 - $bookseller->{'sgstrate'}) * $details->{shipmentcost}):$total_gste + $details->{shipmentcost};
156
157
my $total_gsti_shipment = $bookseller->{'shippingincgst'}?$total_gsti + $details->{shipmentcost}:$total_gsti + (($bookseller->{'sgstrate'} + 1) * $details->{shipmentcost});
155
158
156
$template->param(
159
$template->param(
157
    invoiceid        => $details->{'invoiceid'},
160
    invoiceid        => $details->{'invoiceid'},
158
    invoicenumber    => $details->{'invoicenumber'},
161
    invoicenumber    => $details->{'invoicenumber'},
159
    suppliername     => $details->{'suppliername'},
162
    suppliername     => $details->{'suppliername'},
160
    booksellerid     => $details->{'booksellerid'},
163
    booksellerid     => $details->{'booksellerid'},
164
    shippingincgst   => $bookseller->{'shippingincgst'},
161
    datereceived     => $details->{'datereceived'},
165
    datereceived     => $details->{'datereceived'},
162
    billingdate      => $details->{'billingdate'},
166
    billingdate      => $details->{'billingdate'},
163
    invoiceclosedate => $details->{'closedate'},
167
    invoiceclosedate => $details->{'closedate'},
164
    shipmentcost     => $details->{'shipmentcost'},
168
    shipmentcost     => $details->{'shipmentcost'},
169
    shippingincgstval => sprintf( $format, ($bookseller->{'sgstrate'} + 1) * $details->{shipmentcost}),
165
    orders_loop      => \@orders_loop,
170
    orders_loop      => \@orders_loop,
166
    foot_loop        => \@foot_loop,
171
    foot_loop        => \@foot_loop,
167
    total_quantity   => $total_quantity,
172
    total_quantity   => $total_quantity,
168
    total_gste       => sprintf( $format, $total_gste ),
173
    total_gste       => sprintf( $format, $total_gste ),
169
    total_gsti       => sprintf( $format, $total_gsti ),
174
    total_gsti       => sprintf( $format, $total_gsti ),
170
    total_gstvalue   => sprintf( $format, $total_gstvalue ),
175
    total_gstvalue   => sprintf( $format, $total_gstvalue),
171
    total_gste_shipment => sprintf( $format, $total_gste + $details->{shipmentcost}),
176
    total_gstvalue_shipment => sprintf( $format, $total_gstvalue + $bookseller->{'sgstrate'} * $details->{shipmentcost}),
172
    total_gsti_shipment => sprintf( $format, $total_gsti + $details->{shipmentcost}),
177
    total_gste_shipment => sprintf( $format, $total_gste_shipment),
178
    total_gsti_shipment => sprintf( $format, $total_gsti_shipment),
173
    invoiceincgst    => $bookseller->{invoiceincgst},
179
    invoiceincgst    => $bookseller->{invoiceincgst},
174
    currency         => GetCurrency()->{currency},
180
    currency         => GetCurrency()->{currency},
175
    budgets_loop     => \@budgets_loop,
181
    budgets_loop     => \@budgets_loop,
(-)a/acqui/parcels.pl (+1 lines)
Lines 205-210 $template->param( Link Here
205
    dateto                   => $dateto,
205
    dateto                   => $dateto,
206
    resultsperpage           => $resultsperpage,
206
    resultsperpage           => $resultsperpage,
207
    name                     => $bookseller->{'name'},
207
    name                     => $bookseller->{'name'},
208
    shippingincgst           => $bookseller->{'shippingincgst'},
208
    shipmentdate_today       => C4::Dates->new()->output(),
209
    shipmentdate_today       => C4::Dates->new()->output(),
209
    booksellerid             => $booksellerid,
210
    booksellerid             => $booksellerid,
210
    GST                      => C4::Context->preference('gist'),
211
    GST                      => C4::Context->preference('gist'),
(-)a/acqui/supplier.pl (+4 lines)
Lines 97-103 if ( $op eq 'display' ) { Link Here
97
        gstreg        => $supplier->{'gstreg'},
97
        gstreg        => $supplier->{'gstreg'},
98
        listincgst    => $supplier->{'listincgst'},
98
        listincgst    => $supplier->{'listincgst'},
99
        invoiceincgst => $supplier->{'invoiceincgst'},
99
        invoiceincgst => $supplier->{'invoiceincgst'},
100
        shippingincgst => $supplier->{'shippingincgst'},
100
        gstrate       => $supplier->{'gstrate'} + 0.0,
101
        gstrate       => $supplier->{'gstrate'} + 0.0,
102
        sgstreg        => $supplier->{'sgstreg'} + 0.0,
101
        discount      => $supplier->{'discount'},
103
        discount      => $supplier->{'discount'},
102
        deliverytime  => $supplier->{deliverytime},
104
        deliverytime  => $supplier->{deliverytime},
103
        invoiceprice  => $supplier->{'invoiceprice'},
105
        invoiceprice  => $supplier->{'invoiceprice'},
Lines 165-171 if ( $op eq 'display' ) { Link Here
165
        gstreg        => $supplier->{'gstreg'},
167
        gstreg        => $supplier->{'gstreg'},
166
        listincgst    => $supplier->{'listincgst'},
168
        listincgst    => $supplier->{'listincgst'},
167
        invoiceincgst => $supplier->{'invoiceincgst'},
169
        invoiceincgst => $supplier->{'invoiceincgst'},
170
        shippingincgst => $supplier->{'shippingincgst'},
168
        gstrate       => $supplier->{gstrate} ? $supplier->{'gstrate'}+0.0 : 0,
171
        gstrate       => $supplier->{gstrate} ? $supplier->{'gstrate'}+0.0 : 0,
172
        sgstrate       => $supplier->{sgstrate} ? $supplier->{'sgstrate'}+0.0 : 0,
169
        gst_values    => \@gst_values,
173
        gst_values    => \@gst_values,
170
        discount      => $supplier->{'discount'},
174
        discount      => $supplier->{'discount'},
171
        deliverytime  => $supplier->{deliverytime},
175
        deliverytime  => $supplier->{deliverytime},
(-)a/acqui/updatesupplier.pl (+2 lines)
Lines 99-106 $data{'invoiceprice'}=$input->param('invoice_currency'); Link Here
99
$data{'gstreg'}=$input->param('gst');
99
$data{'gstreg'}=$input->param('gst');
100
$data{'listincgst'}=$input->param('list_gst');
100
$data{'listincgst'}=$input->param('list_gst');
101
$data{'invoiceincgst'}=$input->param('invoice_gst');
101
$data{'invoiceincgst'}=$input->param('invoice_gst');
102
$data{'shippingincgst'}=$input->param('shipping_gst');
102
#have to transform this into fraction so it's easier to use
103
#have to transform this into fraction so it's easier to use
103
$data{'gstrate'} = $input->param('gstrate');
104
$data{'gstrate'} = $input->param('gstrate');
105
$data{'sgstrate'} = $input->param('sgstrate');
104
$data{'discount'} = $input->param('discount');
106
$data{'discount'} = $input->param('discount');
105
$data{deliverytime} = $input->param('deliverytime');
107
$data{deliverytime} = $input->param('deliverytime');
106
$data{'active'}=$input->param('status');
108
$data{'active'}=$input->param('status');
(-)a/installer/data/mysql/kohastructure.sql (-11 / +12 lines)
Lines 2174-2183 CREATE TABLE `suggestions` ( -- purchase suggestions Link Here
2174
   branchcode VARCHAR(10) default NULL, -- foreign key linking the suggested branch to the branches table
2174
   branchcode VARCHAR(10) default NULL, -- foreign key linking the suggested branch to the branches table
2175
   collectiontitle text default NULL, -- collection name for the suggested item
2175
   collectiontitle text default NULL, -- collection name for the suggested item
2176
   itemtype VARCHAR(30) default NULL, -- suggested item type 
2176
   itemtype VARCHAR(30) default NULL, -- suggested item type 
2177
	quantity SMALLINT(6) default NULL, -- suggested quantity to be purchased
2177
    quantity SMALLINT(6) default NULL, -- suggested quantity to be purchased
2178
	currency VARCHAR(3) default NULL, -- suggested currency for the suggested price
2178
    currency VARCHAR(3) default NULL, -- suggested currency for the suggested price
2179
	price DECIMAL(28,6) default NULL, -- suggested price
2179
    price DECIMAL(28,6) default NULL, -- suggested price
2180
	total DECIMAL(28,6) default NULL, -- suggested total cost (price*quantity updated for currency)
2180
    total DECIMAL(28,6) default NULL, -- suggested total cost (price*quantity updated for currency)
2181
  PRIMARY KEY  (`suggestionid`),
2181
  PRIMARY KEY  (`suggestionid`),
2182
  KEY `suggestedby` (`suggestedby`),
2182
  KEY `suggestedby` (`suggestedby`),
2183
  KEY `managedby` (`managedby`)
2183
  KEY `managedby` (`managedby`)
Lines 2475-2486 CREATE TABLE `permissions` ( Link Here
2475
2475
2476
DROP TABLE IF EXISTS `serialitems`;
2476
DROP TABLE IF EXISTS `serialitems`;
2477
CREATE TABLE `serialitems` (
2477
CREATE TABLE `serialitems` (
2478
	`itemnumber` int(11) NOT NULL,
2478
    `itemnumber` int(11) NOT NULL,
2479
	`serialid` int(11) NOT NULL,
2479
    `serialid` int(11) NOT NULL,
2480
	UNIQUE KEY `serialitemsidx` (`itemnumber`),
2480
    UNIQUE KEY `serialitemsidx` (`itemnumber`),
2481
	KEY `serialitems_sfk_1` (`serialid`),
2481
    KEY `serialitems_sfk_1` (`serialid`),
2482
	CONSTRAINT `serialitems_sfk_1` FOREIGN KEY (`serialid`) REFERENCES `serial` (`serialid`) ON DELETE CASCADE ON UPDATE CASCADE,
2482
    CONSTRAINT `serialitems_sfk_1` FOREIGN KEY (`serialid`) REFERENCES `serial` (`serialid`) ON DELETE CASCADE ON UPDATE CASCADE,
2483
	CONSTRAINT `serialitems_sfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
2483
    CONSTRAINT `serialitems_sfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
2484
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2484
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2485
2485
2486
--
2486
--
Lines 2879-2885 CREATE TABLE `aqbooksellers` ( -- information about the vendors listed in acquis Link Here
2879
  `gstreg` tinyint(4) default NULL, -- is your library charged tax (1 for yes, 0 for no)
2879
  `gstreg` tinyint(4) default NULL, -- is your library charged tax (1 for yes, 0 for no)
2880
  `listincgst` tinyint(4) default NULL, -- is tax included in list prices (1 for yes, 0 for no)
2880
  `listincgst` tinyint(4) default NULL, -- is tax included in list prices (1 for yes, 0 for no)
2881
  `invoiceincgst` tinyint(4) default NULL, -- is tax included in invoice prices (1 for yes, 0 for no)
2881
  `invoiceincgst` tinyint(4) default NULL, -- is tax included in invoice prices (1 for yes, 0 for no)
2882
  `shippingincgst` tinyint(4) NOT NULL DEFAULT '0', -- is tax included in shipping prices (1 for yes, 0 for no)
2882
  `gstrate` decimal(6,4) default NULL, -- the tax rate the library is charged
2883
  `gstrate` decimal(6,4) default NULL, -- the tax rate the library is charged
2884
  `sgstrate` decimal(6,4) default NULL, -- the shipping tax rate is charged
2883
  `discount` float(6,4) default NULL, -- discount offered on all items ordered from this vendor
2885
  `discount` float(6,4) default NULL, -- discount offered on all items ordered from this vendor
2884
  `fax` varchar(50) default NULL, -- vendor fax number
2886
  `fax` varchar(50) default NULL, -- vendor fax number
2885
  deliverytime int(11) default NULL, -- vendor delivery time
2887
  deliverytime int(11) default NULL, -- vendor delivery time
Lines 3430-3433 CREATE TABLE IF NOT EXISTS `misc_files` ( -- miscellaneous files attached to rec Link Here
3430
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
3432
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
3431
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
3433
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
3432
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
3434
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
3433
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 8560-8565 if ( CheckVersion($DBversion) ) { Link Here
8560
    SetVersion($DBversion);
8560
    SetVersion($DBversion);
8561
}
8561
}
8562
8562
8563
$DBversion = "3.17.00.XXX";
8564
if (CheckVersion($DBversion)) {
8565
    $dbh->do("ALTER TABLE aqbooksellers ADD shippingincgst tinyint(4) NOT NULL DEFAULT '0'");
8566
    $dbh->do("ALTER TABLE aqbooksellers ADD sgstrate decimal(6,4) default NULL");
8567
    print "Upgrade to $DBversion done (Bug 11062 - Invoice's shipment/shipping cost should be included PRE-gst tax (as an option))\n";
8568
    SetVersion($DBversion);
8569
}
8570
8563
=head1 FUNCTIONS
8571
=head1 FUNCTIONS
8564
8572
8565
=head2 TableExists($table)
8573
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +4 lines)
Lines 80-85 Link Here
80
80
81
            <li><label for="shipmentcost">Shipping cost:</label>
81
            <li><label for="shipmentcost">Shipping cost:</label>
82
                    <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /></li>
82
                    <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /></li>
83
            [% IF (shippingincgst == 0) %]
84
            <li><span class="label">Shipping cost:</span>[% shippingincgstval %] (tax inc)</li>
85
            [% END %]
83
            <li><label for="shipment_budget_id">Fund:</label>
86
            <li><label for="shipment_budget_id">Fund:</label>
84
                    <select id="shipment_budget_id" name="shipment_budget_id">
87
                    <select id="shipment_budget_id" name="shipment_budget_id">
85
                        <option value="">No fund</option>
88
                        <option value="">No fund</option>
Lines 203-209 Link Here
203
                <th class="gste">[% total_gste_shipment %]</th>
206
                <th class="gste">[% total_gste_shipment %]</th>
204
                <th class="gsti">[% total_gsti_shipment %]</th>
207
                <th class="gsti">[% total_gsti_shipment %]</th>
205
                <th>&nbsp;</th>
208
                <th>&nbsp;</th>
206
                <th>[% total_gstvalue %]</th>
209
                <th>[% total_gstvalue_shipment %]</th>
207
                <th>&nbsp;</th>
210
                <th>&nbsp;</th>
208
              </tr>
211
              </tr>
209
            </tfoot>
212
            </tfoot>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-1 / +1 lines)
Lines 177-183 Link Here
177
        </li>
177
        </li>
178
        <li>
178
        <li>
179
            <label for="shipmentcost">Shipping cost: </label>
179
            <label for="shipmentcost">Shipping cost: </label>
180
            <input type="text" id="shipmentcost" name="shipmentcost" size="10" />
180
            <input type="text" id="shipmentcost" name="shipmentcost" size="10" /> [% IF (shippingincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
181
        </li>
181
        </li>
182
        <li>
182
        <li>
183
            <label for="shipmentcost_budgetid">Fund: </label>
183
            <label for="shipmentcost_budgetid">Fund: </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-1 / +23 lines)
Lines 140-145 function confirm_deletion() { Link Here
140
                    <label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" />
140
                    <label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" />
141
                    <label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
141
                    <label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
142
                [% END %]</li>
142
                [% END %]</li>
143
            <li><label for="shipping_gstyes" class="radio">Shipping prices:</label>
144
                [% IF ( shippingincgst ) %]
145
                    <label for="shipping_gstyes">Include tax</label> <input type="radio" id="shipping_gstyes" name="shipping_gst" value="1" checked="checked" />
146
                    <label for="shipping_gstno">Don't include tax</label> <input type="radio" id="shipping_gstno" name="shipping_gst" value="0" />
147
                    [% ELSE %]
148
                    <label for="shipping_gstyes">Include tax</label> <input type="radio" id="shipping_gstyes" name="shipping_gst" value="1" />
149
                    <label for="shipping_gstno">Don't include tax</label> <input type="radio" id="shipping_gstno" name="shipping_gst" value="0" checked="checked" />
150
                [% END %]</li>
143
            </ol>
151
            </ol>
144
            [% IF gst_values %]
152
            [% IF gst_values %]
145
                <ol>
153
                <ol>
Lines 155-160 function confirm_deletion() { Link Here
155
                    [% END %]
163
                    [% END %]
156
                    </select>
164
                    </select>
157
                  </li>
165
                  </li>
166
                  <li>
167
                    <label for="sgstrate">Shipping tax rate: </label>
168
                    <select name="sgstrate" id="sgstrate">
169
                    [% FOREACH gst IN gst_values %]
170
                      [% IF ( sgstrate == gst.option ) %]
171
                        <option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format ("%.1f") %] %</option>
172
                      [% ELSE %]
173
                        <option value="[% gst.option %]">[% gst.option * 100 | format ("%.1f") %] %</option>
174
                      [% END %]
175
                    [% END %]
176
                    </select>
177
                  </li>
158
                </ol>
178
                </ol>
159
            [% ELSE %]
179
            [% ELSE %]
160
                <input type="hidden" name="gstrate" value="0" />
180
                <input type="hidden" name="gstrate" value="0" />
Lines 221-227 function confirm_deletion() { Link Here
221
            <p><strong>List item price includes tax: </strong>
241
            <p><strong>List item price includes tax: </strong>
222
                    [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
242
                    [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
223
            <p><strong>Invoice item price includes tax: </strong>
243
            <p><strong>Invoice item price includes tax: </strong>
224
                    [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
244
                    [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>
245
            <p><strong>Shipping price includes tax: </strong>
246
                    [% IF ( shippingincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
225
            <p><strong>Discount: </strong>
247
            <p><strong>Discount: </strong>
226
                [% discount | format("%.1f") %] %</p>
248
                [% discount | format("%.1f") %] %</p>
227
            <p><strong>Tax rate: </strong>
249
            <p><strong>Tax rate: </strong>
(-)a/t/db_dependent/Bookseller.t (-2 / +11 lines)
Lines 62-68 my $sample_supplier1 = { Link Here
62
    gstreg        => 1,
62
    gstreg        => 1,
63
    listincgst    => 1,
63
    listincgst    => 1,
64
    invoiceincgst => 1,
64
    invoiceincgst => 1,
65
    shippingincgst => 1,
65
    gstrate       => '1.0000',
66
    gstrate       => '1.0000',
67
    sgstrate      => '1.0000',
66
    discount      => '1.0000',
68
    discount      => '1.0000',
67
    notes         => 'notes1',
69
    notes         => 'notes1',
68
    deliverytime  => undef
70
    deliverytime  => undef
Lines 89-95 my $sample_supplier2 = { Link Here
89
    gstreg        => 1,
91
    gstreg        => 1,
90
    listincgst    => 1,
92
    listincgst    => 1,
91
    invoiceincgst => 1,
93
    invoiceincgst => 1,
94
    shippingincgst => 1,
92
    gstrate       => '2.0000',
95
    gstrate       => '2.0000',
96
    sgstrate      => '2.0000',
93
    discount      => '2.0000',
97
    discount      => '2.0000',
94
    notes         => 'notes2',
98
    notes         => 'notes2',
95
    deliverytime  => 2,
99
    deliverytime  => 2,
Lines 243-249 $sample_supplier2 = { Link Here
243
    gstreg        => 1,
247
    gstreg        => 1,
244
    listincgst    => 1,
248
    listincgst    => 1,
245
    invoiceincgst => 1,
249
    invoiceincgst => 1,
246
    gstrate       => '2.0000 ',
250
    shippingincgst => 1,
251
    gstrate       => '2.0000',
252
    sgstrate      => '2.0000',
247
    discount      => '2.0000',
253
    discount      => '2.0000',
248
    notes         => 'notes2 modified',
254
    notes         => 'notes2 modified',
249
    deliverytime  => 2,
255
    deliverytime  => 2,
Lines 290-296 my $sample_supplier3 = { Link Here
290
    gstreg        => 1,
296
    gstreg        => 1,
291
    listincgst    => 1,
297
    listincgst    => 1,
292
    invoiceincgst => 1,
298
    invoiceincgst => 1,
299
    shippingincgst => 1,
293
    gstrate       => '3.0000',
300
    gstrate       => '3.0000',
301
    sgstrate      => '3.0000',
294
    discount      => '3.0000',
302
    discount      => '3.0000',
295
    notes         => 'notes3',
303
    notes         => 'notes3',
296
    deliverytime  => 3
304
    deliverytime  => 3
Lines 317-323 my $sample_supplier4 = { Link Here
317
    gstreg        => 1,
325
    gstreg        => 1,
318
    listincgst    => 1,
326
    listincgst    => 1,
319
    invoiceincgst => 1,
327
    invoiceincgst => 1,
328
    shippingincgst => 1,
320
    gstrate       => '3.0000',
329
    gstrate       => '3.0000',
330
    sgstrate      => '3.0000',
321
    discount      => '3.0000',
331
    discount      => '3.0000',
322
    notes         => 'notes3',
332
    notes         => 'notes3',
323
};
333
};
324
- 

Return to bug 11062