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

(-)a/acqui/invoice.pl (+5 lines)
Lines 79-84 elsif ( $op && $op eq 'mod' ) { Link Here
79
        shipmentcost          => $shipmentcost,
79
        shipmentcost          => $shipmentcost,
80
        shipmentcost_budgetid => $shipment_budget_id
80
        shipmentcost_budgetid => $shipment_budget_id
81
    );
81
    );
82
    if ($input->param('reopen')) {
83
        ReopenInvoice($invoiceid);
84
    } elsif ($input->param('close')) {
85
        CloseInvoice($invoiceid);
86
    }
82
    $template->param( modified => 1 );
87
    $template->param( modified => 1 );
83
}
88
}
84
89
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-36 / +38 lines)
Lines 42-87 Link Here
42
42
43
      <p>Supplier: [% suppliername %]</p>
43
      <p>Supplier: [% suppliername %]</p>
44
      <form action="" method="post">
44
      <form action="" method="post">
45
        <label for="shipmentdate">Shipment date:</label>
45
        <fieldset>
46
        <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" readonly="readonly" class="datepicker" />
46
          <label for="shipmentdate">Shipment date:</label>
47
        <p></p>
47
          <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" readonly="readonly" class="datepicker" />
48
        <label for="billingdate">Billing date:</label>
48
          <p></p>
49
        <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" />
49
          <label for="billingdate">Billing date:</label>
50
        <p></p>
50
          <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" />
51
        <label for="shipmentcost">Shipment cost:</label>
51
          <p></p>
52
        <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" />
52
          <label for="shipmentcost">Shipment cost:</label>
53
        <label for="shipment_budget_id">Budget:</label>
53
          <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" />
54
        <select id="shipment_budget_id" name="shipment_budget_id">
54
          <label for="shipment_budget_id">Budget:</label>
55
            <option value="">No budget</option>
55
          <select id="shipment_budget_id" name="shipment_budget_id">
56
          [% FOREACH budget IN budgets_loop %]
56
              <option value="">No budget</option>
57
            [% IF ( budget.selected ) %]
57
            [% FOREACH budget IN budgets_loop %]
58
              <option selected="selected" value="[% budget.budget_id %]">
58
              [% IF ( budget.selected ) %]
59
            [% ELSE %]
59
                <option selected="selected" value="[% budget.budget_id %]">
60
              <option value="[% budget.budget_id %]">
60
              [% ELSE %]
61
                <option value="[% budget.budget_id %]">
62
              [% END %]
63
                [% budget.budget_name %]
64
              </option>
61
            [% END %]
65
            [% END %]
62
              [% budget.budget_name %]
66
          </select>
63
            </option>
67
          <p></p>
68
          <label>Status:</label>
69
          [% IF ( invoiceclosedate ) %]
70
            Closed on [% invoiceclosedate | $KohaDates %].
71
            <p></p>
72
            <input type="checkbox" name="reopen" id="reopen" />
73
            <label for="reopen">Reopen</label>
74
          [% ELSE %]
75
            Open.
76
            <p></p>
77
            <input type="checkbox" name="close" id="close" />
78
            <label for="close">Close</label>
64
          [% END %]
79
          [% END %]
65
        </select>
80
          <input type="hidden" name="op" value="mod" />
66
        <input type="hidden" name="op" value="mod" />
81
          <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
67
        <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
82
          <fieldset class="action">
68
        <fieldset class="action">
83
              <input type="submit" value="Save">
69
            <input type="submit" value="Save">
84
          </fieldset>
70
        </fieldset>
85
        </fieldset>
71
      </form>
86
      </form>
72
      <p>Status:
73
        [% IF ( invoiceclosedate ) %]
74
          Closed on [% invoiceclosedate | $KohaDates %].
75
          <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid %]">
76
            Reopen
77
          </a>
78
        [% ELSE %]
79
          Open.
80
          <a href="/cgi-bin/koha/acqui/invoice.pl?op=close&invoiceid=[% invoiceid %]">
81
            Close
82
          </a>
83
        [% END %]
84
      </p>
85
      <p>
87
      <p>
86
          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Go to receipt page</a>
88
          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Go to receipt page</a>
87
      </p>
89
      </p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-4 / +2 lines)
Lines 192-198 Link Here
192
192
193
<div id="acqui_receive_summary">
193
<div id="acqui_receive_summary">
194
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
194
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
195
<p><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">Go to invoice details</a></p>
196
</div>
195
</div>
197
[% UNLESS (invoiceclosedate) %]
196
[% UNLESS (invoiceclosedate) %]
198
<div id="acqui_receive_search">
197
<div id="acqui_receive_search">
Lines 405-412 Link Here
405
</div>
404
</div>
406
405
407
<!--<form action="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" method="post">-->
406
<!--<form action="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" method="post">-->
408
<form action="parcels.pl?booksellerid=[% booksellerid %]" method="post">
407
<form action="/cgi-bin/koha/acqui/invoice.pl" method="get">
409
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
408
    <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
410
    <fieldset class="action">
409
    <fieldset class="action">
411
        <input type="submit" value="Finish receiving" />
410
        <input type="submit" value="Finish receiving" />
412
    </fieldset>
411
    </fieldset>
413
- 

Return to bug 5339