Bugzilla – Attachment 45701 Details for
Bug 15376
Edit invoices: Can not change Shipping cost.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15376: Edit invoices: Can not change Shipping cost
Bug-15376-Edit-invoices-Can-not-change-Shipping-co.patch (text/plain), 3.20 KB, created by
Marc Véron
on 2015-12-15 14:43:35 UTC
(
hide
)
Description:
Bug 15376: Edit invoices: Can not change Shipping cost
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2015-12-15 14:43:35 UTC
Size:
3.20 KB
patch
obsolete
>From 6c8ae5af59507e161da4e101cd62010370b6ff59 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Tue, 15 Dec 2015 15:14:47 +0100 >Subject: [PATCH] Bug 15376: Edit invoices: Can not change Shipping cost > >To reproduce: >- Go to Home > Acquisitions >- Edit an invoice that has no shipping date >- Change shipment cost. Leave shipping date empty >- Save >Result: Page reloads, shipment cost keeps old value. > Warnings in intranet-error.log > >To test: >- Apply patch >- Follow steps above >Result: Shipment costs are changed as expected > No warnings in intrante-error.log > >Additionally, verify that the input field 'Shipping cost' is >properly formatted and that in invoice details 'Shipment cost' >is replaced by 'Shipping cost' >--- > acqui/invoice.pl | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/acqui/invoice.pl b/acqui/invoice.pl >index f56afcc..05b3689 100755 >--- a/acqui/invoice.pl >+++ b/acqui/invoice.pl >@@ -81,8 +81,8 @@ elsif ( $op && $op eq 'mod' ) { > my $shipment_budget_id = $input->param('shipment_budget_id'); > ModInvoice( > invoiceid => $invoiceid, >- shipmentdate => output_pref( { str => $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ), >- billingdate => output_pref( { str => $input->param('billingdate'), dateformat => 'iso', dateonly => 1 } ), >+ shipmentdate => output_pref( { str => $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ) || '', >+ billingdate => output_pref( { str => $input->param('billingdate'), dateformat => 'iso', dateonly => 1 } ) || '', > shipmentcost => $shipmentcost, > shipmentcost_budgetid => $shipment_budget_id > ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 6a0c9cf..71cacfb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -80,7 +80,7 @@ > <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" /></li> > > <li><label for="shipmentcost">Shipping cost:</label> >- <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /></li> >+ <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost | $Price %]" /></li> > <li><label for="shipment_budget_id">Fund:</label> > <select id="shipment_budget_id" name="shipment_budget_id"> > <option value="">No fund</option> >@@ -200,7 +200,7 @@ > <th> </th> > </tr> > <tr> >- <th colspan="2">Total + Shipment cost ([% currency %])</th> >+ <th colspan="2">Total + Shipping cost ([% currency %])</th> > <th class="gste"></th> > <th class="gsti"></th> > <th>[% total_quantity %]</th> >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15376
:
45700
|
45701
|
45709
|
45718