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

(-)a/acqui/invoice.pl (-2 / +2 lines)
Lines 81-88 elsif ( $op && $op eq 'mod' ) { Link Here
81
    my $shipment_budget_id = $input->param('shipment_budget_id');
81
    my $shipment_budget_id = $input->param('shipment_budget_id');
82
    ModInvoice(
82
    ModInvoice(
83
        invoiceid             => $invoiceid,
83
        invoiceid             => $invoiceid,
84
        shipmentdate          => output_pref( { str => $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ),
84
        shipmentdate          => output_pref( { str => $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ) || '',
85
        billingdate           => output_pref( { str => $input->param('billingdate'),  dateformat => 'iso', dateonly => 1 } ),
85
        billingdate           => output_pref( { str => $input->param('billingdate'),  dateformat => 'iso', dateonly => 1 } ) || '',
86
        shipmentcost          => $shipmentcost,
86
        shipmentcost          => $shipmentcost,
87
        shipmentcost_budgetid => $shipment_budget_id
87
        shipmentcost_budgetid => $shipment_budget_id
88
    );
88
    );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-3 / +2 lines)
Lines 80-86 Link Here
80
                    <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" /></li>
80
                    <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" /></li>
81
81
82
            <li><label for="shipmentcost">Shipping cost:</label>
82
            <li><label for="shipmentcost">Shipping cost:</label>
83
                    <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /></li>
83
                    <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost | $Price %]" /></li>
84
            <li><label for="shipment_budget_id">Fund:</label>
84
            <li><label for="shipment_budget_id">Fund:</label>
85
                    <select id="shipment_budget_id" name="shipment_budget_id">
85
                    <select id="shipment_budget_id" name="shipment_budget_id">
86
                        <option value="">No fund</option>
86
                        <option value="">No fund</option>
Lines 200-206 Link Here
200
                <th>&nbsp;</th>
200
                <th>&nbsp;</th>
201
              </tr>
201
              </tr>
202
              <tr>
202
              <tr>
203
                <th colspan="2">Total + Shipment cost ([% currency %])</th>
203
                <th colspan="2">Total + Shipping cost ([% currency %])</th>
204
                <th class="gste"></th>
204
                <th class="gste"></th>
205
                <th class="gsti"></th>
205
                <th class="gsti"></th>
206
                <th>[% total_quantity %]</th>
206
                <th>[% total_quantity %]</th>
207
- 

Return to bug 15376