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

(-)a/installer/data/mysql/atomicupdate/Bug-12395-add-column-aqorders.created_by.sql (+1 lines)
Lines 1-2 Link Here
1
ALTER TABLE aqorders ADD COLUMN created_by int(11) NULL DEFAULT NULL AFTER quantityreceived;
1
ALTER TABLE aqorders ADD COLUMN created_by int(11) NULL DEFAULT NULL AFTER quantityreceived;
2
ALTER TABLE aqorders ADD CONSTRAINT aqorders_created_by FOREIGN KEY (created_by) REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE;
2
UPDATE aqorders, aqbasket SET aqorders.created_by = aqbasket.authorisedby  WHERE aqorders.basketno = aqbasket.basketno;
3
UPDATE aqorders, aqbasket SET aqorders.created_by = aqbasket.authorisedby  WHERE aqorders.basketno = aqbasket.basketno;
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 3202-3207 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
3202
  KEY `budget_id` (`budget_id`),
3202
  KEY `budget_id` (`budget_id`),
3203
  KEY `parent_ordernumber` (`parent_ordernumber`),
3203
  KEY `parent_ordernumber` (`parent_ordernumber`),
3204
  KEY `orderstatus` (`orderstatus`),
3204
  KEY `orderstatus` (`orderstatus`),
3205
  CONSTRAINT aqorders_created_by FOREIGN KEY (created_by) REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE,
3205
  CONSTRAINT `aqorders_budget_id_fk` FOREIGN KEY (`budget_id`) REFERENCES `aqbudgets` (`budget_id`) ON DELETE CASCADE ON UPDATE CASCADE,
3206
  CONSTRAINT `aqorders_budget_id_fk` FOREIGN KEY (`budget_id`) REFERENCES `aqbudgets` (`budget_id`) ON DELETE CASCADE ON UPDATE CASCADE,
3206
  CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE,
3207
  CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE,
3207
  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE,
3208
  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-6 / +1 lines)
Lines 176-187 Link Here
176
       <li>
176
       <li>
177
        <label for="creator">Ordered by: </label>
177
        <label for="creator">Ordered by: </label>
178
        <span>
178
        <span>
179
          [% IF creator and (creator.firstname or creator.surname) %]
179
            [% INCLUDE 'patron-title.inc' patron = creator %]
180
            [% creator.firstname %]
181
            [% creator.surname %]
182
          [% ELSE %]
183
            No name
184
          [% END %]
185
        </span>
180
        </span>
186
       </li>
181
       </li>
187
       <li><label for="quantity_to_receive">Quantity to receive: </label><span class="label">
182
       <li><label for="quantity_to_receive">Quantity to receive: </label><span class="label">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt (-2 / +1 lines)
Lines 13-19 Link Here
13
                    </li>
13
                    </li>
14
                    <li>
14
                    <li>
15
                        <span class="label">Ordered by: </span>
15
                        <span class="label">Ordered by: </span>
16
                        [% creator.firstname %] [% creator.surname %]
16
                        [% INCLUDE 'patron-title.inc' patron = creator %]
17
                    </li>
17
                    </li>
18
                    <li>
18
                    <li>
19
                        <span class="label">Claims count: </span>
19
                        <span class="label">Claims count: </span>
20
- 

Return to bug 12395