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

(-)a/C4/Acquisition.pm (-5 / +9 lines)
Lines 1859-1865 sub GetParcels { Link Here
1859
1859
1860
=head3 GetLateOrders
1860
=head3 GetLateOrders
1861
1861
1862
  @results = &GetLateOrders;
1862
  $results = &GetLateOrders($delay, $supplierid, $branch, $estimateddeliverydatefrom, $estimateddeliverydateto);
1863
1863
1864
Searches for bookseller with late orders.
1864
Searches for bookseller with late orders.
1865
1865
Lines 1885-1890 sub GetLateOrders { Link Here
1885
    SELECT aqbasket.basketno,
1885
    SELECT aqbasket.basketno,
1886
        aqorders.ordernumber,
1886
        aqorders.ordernumber,
1887
        DATE(aqbasket.closedate)  AS orderdate,
1887
        DATE(aqbasket.closedate)  AS orderdate,
1888
        aqbasket.basketname       AS basketname,
1889
        aqbasket.basketgroupid    AS basketgroupid,
1890
        aqbasketgroups.name       AS basketgroupname,
1888
        aqorders.rrp              AS unitpricesupplier,
1891
        aqorders.rrp              AS unitpricesupplier,
1889
        aqorders.ecost            AS unitpricelib,
1892
        aqorders.ecost            AS unitpricelib,
1890
        aqorders.claims_count     AS claims_count,
1893
        aqorders.claims_count     AS claims_count,
Lines 1905-1910 sub GetLateOrders { Link Here
1905
        LEFT JOIN aqbudgets           ON aqorders.budget_id          = aqbudgets.budget_id,
1908
        LEFT JOIN aqbudgets           ON aqorders.budget_id          = aqbudgets.budget_id,
1906
        aqbasket LEFT JOIN borrowers  ON aqbasket.authorisedby       = borrowers.borrowernumber
1909
        aqbasket LEFT JOIN borrowers  ON aqbasket.authorisedby       = borrowers.borrowernumber
1907
        LEFT JOIN aqbooksellers       ON aqbasket.booksellerid       = aqbooksellers.id
1910
        LEFT JOIN aqbooksellers       ON aqbasket.booksellerid       = aqbooksellers.id
1911
        LEFT JOIN aqbasketgroups      ON aqbasket.basketgroupid      = aqbasketgroups.id
1908
        WHERE aqorders.basketno = aqbasket.basketno
1912
        WHERE aqorders.basketno = aqbasket.basketno
1909
        AND ( datereceived = ''
1913
        AND ( datereceived = ''
1910
            OR datereceived IS NULL
1914
            OR datereceived IS NULL
Lines 1918-1927 sub GetLateOrders { Link Here
1918
        $select .= "
1922
        $select .= "
1919
        aqorders.quantity - COALESCE(aqorders.quantityreceived,0)                 AS quantity,
1923
        aqorders.quantity - COALESCE(aqorders.quantityreceived,0)                 AS quantity,
1920
        (aqorders.quantity - COALESCE(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
1924
        (aqorders.quantity - COALESCE(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
1921
        DATEDIFF(CAST(now() AS date),closedate) AS latesince
1925
        DATEDIFF(CAST(now() AS date),aqbasket.closedate) AS latesince
1922
        ";
1926
        ";
1923
        if ( defined $delay ) {
1927
        if ( defined $delay ) {
1924
            $from .= " AND (closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? DAY)) " ;
1928
            $from .= " AND (aqbasket.closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? DAY)) " ;
1925
            push @query_params, $delay;
1929
            push @query_params, $delay;
1926
        }
1930
        }
1927
        $having = "
1931
        $having = "
Lines 1934-1943 sub GetLateOrders { Link Here
1934
        $select .= "
1938
        $select .= "
1935
                aqorders.quantity                AS quantity,
1939
                aqorders.quantity                AS quantity,
1936
                aqorders.quantity * aqorders.rrp AS subtotal,
1940
                aqorders.quantity * aqorders.rrp AS subtotal,
1937
                (CAST(now() AS date) - closedate)            AS latesince
1941
                (CAST(now() AS date) - aqbasket.closedate)            AS latesince
1938
        ";
1942
        ";
1939
        if ( defined $delay ) {
1943
        if ( defined $delay ) {
1940
            $from .= " AND (closedate <= (CAST(now() AS date) -(INTERVAL ? DAY)) ";
1944
            $from .= " AND (aqbasket.closedate <= (CAST(now() AS date) -(INTERVAL ? DAY)) ";
1941
            push @query_params, $delay;
1945
            push @query_params, $delay;
1942
        }
1946
        }
1943
    }
1947
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-7 / +13 lines)
Lines 117-122 $(document).ready(function() { Link Here
117
            <th>Information</th>
117
            <th>Information</th>
118
            <th>Total cost</th>
118
            <th>Total cost</th>
119
            <th>Basket</th>
119
            <th>Basket</th>
120
            <th>Basket group</th>
121
            <th>Branch</th>
122
            <th>Fund</th>
120
            <th>Claims count</th>
123
            <th>Claims count</th>
121
            <th>Claimed date</th>
124
            <th>Claimed date</th>
122
        </tr>
125
        </tr>
Lines 154-167 $(document).ready(function() { Link Here
154
            <td>
157
            <td>
155
                   [% lateorder.unitpricesupplier %]x[% lateorder.quantity %] = 
158
                   [% lateorder.unitpricesupplier %]x[% lateorder.quantity %] = 
156
                   [% lateorder.subtotal %]
159
                   [% lateorder.subtotal %]
157
                    <p title="budget">[% lateorder.budget %]</p>
158
            </td>
160
            </td>
159
            <td>
161
            <td>
160
                 <p><a href="basket.pl?basketno=[% lateorder.basketno %]" title="basket">
162
                 <p><a href="basket.pl?basketno=[% lateorder.basketno %]" title="basket">
161
                        [% lateorder.basketno %]
163
                        [% lateorder.basketname %] ([% lateorder.basketno %])
162
                 	</a>
164
                        </a>
163
                 </p>
165
                 </p>                 
164
                 <p title="branch">[% lateorder.branch %]</p>
166
            </td>
167
            <td>[% lateorder.basketgroupname %] ([% lateorder.basketgroupid %])
168
            </td>
169
            <td>[% lateorder.branch %]
170
            </td>
171
            <td>[% lateorder.budget %]
165
            </td>
172
            </td>
166
            <td>[% lateorder.claims_count %]</td>
173
            <td>[% lateorder.claims_count %]</td>
167
            <td>[% lateorder.claimed_date %]</td>
174
            <td>[% lateorder.claimed_date %]</td>
Lines 172-178 $(document).ready(function() { Link Here
172
        <tr>
179
        <tr>
173
            <th colspan="5">Total</th>
180
            <th colspan="5">Total</th>
174
            <th>[% total %]</th>
181
            <th>[% total %]</th>
175
            <th colspan="3">&nbsp;</th>
182
            <th colspan="6">&nbsp;</th>
176
        </tr>
183
        </tr>
177
      </tfoot>
184
      </tfoot>
178
    </table>
185
    </table>
179
- 

Return to bug 11027