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

(-)a/acqui/ordered.pl (+3 lines)
Lines 56-61 SELECT Link Here
56
    quantity-quantityreceived AS tleft,
56
    quantity-quantityreceived AS tleft,
57
    ecost, budgetdate, entrydate,
57
    ecost, budgetdate, entrydate,
58
    aqbasket.booksellerid,
58
    aqbasket.booksellerid,
59
    aqbooksellers.name as vendorname,
59
    itype,
60
    itype,
60
    title
61
    title
61
FROM (aqorders, aqbasket)
62
FROM (aqorders, aqbasket)
Lines 65-70 LEFT JOIN aqorders_items ON Link Here
65
    aqorders.ordernumber=aqorders_items.ordernumber
66
    aqorders.ordernumber=aqorders_items.ordernumber
66
LEFT JOIN items ON
67
LEFT JOIN items ON
67
    items.itemnumber=aqorders_items.itemnumber
68
    items.itemnumber=aqorders_items.itemnumber
69
LEFT JOIN aqbooksellers ON
70
    aqbasket.booksellerid = aqbooksellers.id
68
WHERE
71
WHERE
69
    aqorders.basketno=aqbasket.basketno AND
72
    aqorders.basketno=aqbasket.basketno AND
70
    budget_id=? AND
73
    budget_id=? AND
(-)a/acqui/spent.pl (-1 / +4 lines)
Lines 64-70 SELECT Link Here
64
    aqinvoices.invoicenumber,
64
    aqinvoices.invoicenumber,
65
    quantityreceived,
65
    quantityreceived,
66
    unitprice,
66
    unitprice,
67
    datereceived
67
    datereceived,
68
    aqbooksellers.name as vendorname
68
FROM (aqorders, aqbasket)
69
FROM (aqorders, aqbasket)
69
LEFT JOIN biblio ON
70
LEFT JOIN biblio ON
70
    biblio.biblionumber=aqorders.biblionumber
71
    biblio.biblionumber=aqorders.biblionumber
Lines 74-79 LEFT JOIN items ON Link Here
74
    aqorders_items.itemnumber = items.itemnumber
75
    aqorders_items.itemnumber = items.itemnumber
75
LEFT JOIN aqinvoices ON
76
LEFT JOIN aqinvoices ON
76
    aqorders.invoiceid = aqinvoices.invoiceid
77
    aqorders.invoiceid = aqinvoices.invoiceid
78
LEFT JOIN aqbooksellers ON
79
    aqbasket.booksellerid = aqbooksellers.id
77
WHERE
80
WHERE
78
    aqorders.basketno=aqbasket.basketno AND
81
    aqorders.basketno=aqbasket.basketno AND
79
    budget_id=? AND
82
    budget_id=? AND
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-1 / +1 lines)
Lines 52-58 Link Here
52
        [% END %]
52
        [% END %]
53
	</td>
53
	</td>
54
	<td class="cell">
54
	<td class="cell">
55
	    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.booksellerid | html %]</a>
55
	    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a>
56
	</td>
56
	</td>
57
	<td class="cell">
57
	<td class="cell">
58
        [% ItemTypes.GetDescription( order.itype ) | html %]
58
        [% ItemTypes.GetDescription( order.itype ) | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-2 / +1 lines)
Lines 50-56 Link Here
50
                [% order.ordernumber | html %]
50
                [% order.ordernumber | html %]
51
            </td>
51
            </td>
52
            <td class="cell">
52
            <td class="cell">
53
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.booksellerid | html %]</a>
53
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a>
54
            </td>
54
            </td>
55
            <td class="cell">
55
            <td class="cell">
56
                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a>
56
                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a>
57
- 

Return to bug 19271