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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-7 / +7 lines)
Lines 40-46 Link Here
40
      [% END %]
40
      [% END %]
41
      <h1>Invoice: [% invoicenumber %]</h1>
41
      <h1>Invoice: [% invoicenumber %]</h1>
42
42
43
      <p>Supplier: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
43
      <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
44
      <form action="" method="post">
44
      <form action="" method="post">
45
        <fieldset>
45
        <fieldset>
46
          <label for="shipmentdate">Shipment date:</label>
46
          <label for="shipmentdate">Shipment date:</label>
Lines 51-59 Link Here
51
          <p></p>
51
          <p></p>
52
          <label for="shipmentcost">Shipment cost:</label>
52
          <label for="shipmentcost">Shipment cost:</label>
53
          <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" />
53
          <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" />
54
          <label for="shipment_budget_id">Budget:</label>
54
          <label for="shipment_budget_id">Fund:</label>
55
          <select id="shipment_budget_id" name="shipment_budget_id">
55
          <select id="shipment_budget_id" name="shipment_budget_id">
56
              <option value="">No budget</option>
56
              <option value="">No fund</option>
57
            [% FOREACH budget IN budgets_loop %]
57
            [% FOREACH budget IN budgets_loop %]
58
              [% IF ( budget.selected ) %]
58
              [% IF ( budget.selected ) %]
59
                <option selected="selected" value="[% budget.budget_id %]">
59
                <option selected="selected" value="[% budget.budget_id %]">
Lines 94-100 Link Here
94
              <tr>
94
              <tr>
95
                <th>Summary</th>
95
                <th>Summary</th>
96
                <th>Publisher</th>
96
                <th>Publisher</th>
97
                <th>Branch</th>
97
                <th>Library</th>
98
                <th>RRP</th>
98
                <th>RRP</th>
99
                <th>Est.</th>
99
                <th>Est.</th>
100
                <th>Qty.</th>
100
                <th>Qty.</th>
Lines 130-136 Link Here
130
            </tbody>
130
            </tbody>
131
            <tfoot>
131
            <tfoot>
132
                <tr>
132
                <tr>
133
                    <th colspan="3">Total Tax Exc.</th>
133
                    <th colspan="3">Total tax exc.</th>
134
                    <th>[% total_rrp_gste %]</th>
134
                    <th>[% total_rrp_gste %]</th>
135
                    <th>&nbsp;</th>
135
                    <th>&nbsp;</th>
136
                    <th>[% total_quantity %]</th>
136
                    <th>[% total_quantity %]</th>
Lines 146-152 Link Here
146
                    <th>&nbsp;</th>
146
                    <th>&nbsp;</th>
147
                </tr>
147
                </tr>
148
                <tr>
148
                <tr>
149
                    <th colspan='3'>Total Tax Inc. ([% currency %])</th>
149
                    <th colspan='3'>Total tax inc. ([% currency %])</th>
150
                    <th>[% total_rrp_gsti %]</th>
150
                    <th>[% total_rrp_gsti %]</th>
151
                    <th>&nbsp;</th>
151
                    <th>&nbsp;</th>
152
                    <th>[% total_quantity %]</th>
152
                    <th>[% total_quantity %]</th>
Lines 154-160 Link Here
154
                    <th>&nbsp;</th>
154
                    <th>&nbsp;</th>
155
                </tr>
155
                </tr>
156
                <tr>
156
                <tr>
157
                    <th colspan="3">Total + Shipment cost ([% currency %])</th>
157
                    <th colspan="3">Total + shipment cost ([% currency %])</th>
158
                    <th>&nbsp;</th>
158
                    <th>&nbsp;</th>
159
                    <th>&nbsp;</th>
159
                    <th>&nbsp;</th>
160
                    <th>[% total_quantity %]</th>
160
                    <th>[% total_quantity %]</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-2 / +2 lines)
Lines 127-133 $(document).ready(function() { Link Here
127
                <li>Publication year: [% publicationyear %]</li>
127
                <li>Publication year: [% publicationyear %]</li>
128
              [% END %]
128
              [% END %]
129
              [% IF ( branch ) %]
129
              [% IF ( branch ) %]
130
                <li>Branch: [% branchname %]</li>
130
                <li>Library: [% branchname %]</li>
131
              [% END %]
131
              [% END %]
132
            </ul>
132
            </ul>
133
          </p>
133
          </p>
Lines 147-153 $(document).ready(function() { Link Here
147
            <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber %]" />
147
            <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber %]" />
148
          </li>
148
          </li>
149
          <li>
149
          <li>
150
            <label for="supplier">Supplier:</label>
150
            <label for="supplier">Vendor:</label>
151
            <select id="supplier" name="supplierid">
151
            <select id="supplier" name="supplierid">
152
              <option value="">All</option>
152
              <option value="">All</option>
153
              [% FOREACH supplier IN suppliers_loop %]
153
              [% FOREACH supplier IN suppliers_loop %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-3 / +2 lines)
Lines 139-147 Link Here
139
            <input type="text" id="shipmentcost" name="shipmentcost" size="10" />
139
            <input type="text" id="shipmentcost" name="shipmentcost" size="10" />
140
        </li>
140
        </li>
141
        <li>
141
        <li>
142
            <label for="shipmentcost_budgetid">Budget: </label>
142
            <label for="shipmentcost_budgetid">Fund: </label>
143
            <select id="shipmentcost_budgetid" name="shipmentcost_budgetid">
143
            <select id="shipmentcost_budgetid" name="shipmentcost_budgetid">
144
                <option value="">No budget</option>
144
                <option value="">No fund</option>
145
                [% FOREACH budget IN budgets %]
145
                [% FOREACH budget IN budgets %]
146
                    <option value="[% budget.budget_id %]">[% budget.budget_name %]</option>
146
                    <option value="[% budget.budget_id %]">[% budget.budget_name %]</option>
147
                [% END %]
147
                [% END %]
148
- 

Return to bug 10046