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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-14 / +13 lines)
Lines 104-127 Link Here
104
                    </tr>
104
                    </tr>
105
                </thead>
105
                </thead>
106
                <tbody>
106
                <tbody>
107
                [% FOR order IN orders %]
107
                [% FOR suborder IN orders %]
108
                    <tr>
108
                    <tr>
109
                        <td>
109
                        <td>
110
                        [% IF order.invoice %]
110
                        [% IF suborder.invoice %]
111
                            [% IF CAN_user_acquisition %]
111
                            [% IF CAN_user_acquisition %]
112
                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page">
112
                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% suborder.invoiceid | uri %]" title="Invoice detail page">
113
                                   [% order.invoice.invoicenumber | html %]</a>
113
                                   [% suborder.invoice.invoicenumber | html %]</a>
114
                            [% ELSE %]
114
                            [% ELSE %]
115
                                [% order.invoice.invoicenumber | html %]
115
                                [% suborder.invoice.invoicenumber | html %]
116
                            [% END %]
116
                            [% END %]
117
                        [% END %]
117
                        [% END %]
118
                        </td>
118
                        </td>
119
                        <td>[% order.ordernumber | html %]</td>
119
                        <td>[% suborder.ordernumber | html %]</td>
120
                        <td><span title="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</span></td>
120
                        <td><span title="[% suborder.basket.creationdate | uri %]">[% suborder.basket.creationdate | $KohaDates%]</span></td>
121
                        <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td>
121
                        <td>[% IF suborder.datereceived %]<span title="[% suborder.datereceived | uri %]">[% suborder.datereceived | $KohaDates %]</span>[% END %]</td>
122
                        <td>[% order.quantityreceived | html %]</td>
122
                        <td>[% suborder.quantityreceived | html %]</td>
123
                        <td>
123
                        <td>
124
                          [% SWITCH order.orderstatus %]
124
                          [% SWITCH suborder.orderstatus %]
125
                          [%# FIXME We should only see/display Complete here, right? %]
125
                          [%# FIXME We should only see/display Complete here, right? %]
126
                            [% CASE 'new' %]<span title="status_1">New</span>
126
                            [% CASE 'new' %]<span title="status_1">New</span>
127
                            [% CASE 'ordered' %]<span title="status_2">Ordered</span>
127
                            [% CASE 'ordered' %]<span title="status_2">Ordered</span>
Lines 131-142 Link Here
131
                          [% END %]
131
                          [% END %]
132
                        </td>
132
                        </td>
133
                        <td>
133
                        <td>
134
                            [% IF order.datereceived %][%# FIXME Should only be true, right? %]
134
                            [% IF suborder.datereceived %][%# FIXME Should only be true, right? %]
135
                                [%# FIXME What if unitprice has not been filled? %]
135
                                [%# FIXME What if unitprice has not been filled? %]
136
                                [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
136
                                [% suborder.unitprice_tax_excluded * suborder.quantity | $Price %] / [% suborder.unitprice_tax_included * suborder.quantity | $Price %]
137
                            [% END %]
137
                            [% END %]
138
                        </td>
138
                        </td>
139
                        <td>[% order.order_internalnote | html %]</td>
139
                        <td>[% suborder.order_internalnote | html %]</td>
140
                    </tr>
140
                    </tr>
141
                [% END %]
141
                [% END %]
142
                </tbody>
142
                </tbody>
143
- 

Return to bug 23376