|
|
@@ -1679,9 +1679,9 @@ ORDER;
|
|
|
<td>{$unitPriceFormat}</td>
|
|
|
<!-- <td>{$unitBvFormat}</td>-->
|
|
|
<!-- <td>{$totalBvFormat}</td>-->
|
|
|
- <td>{$vatAmountFormat}</td>
|
|
|
+ <td colspan="2">{$vatAmountFormat}</td>
|
|
|
<td>{$vatRateFormat}</td>
|
|
|
- <td>{$taxableAmountFormat}</td>
|
|
|
+ <td colspan="2">{$taxableAmountFormat}</td>
|
|
|
<td>{$totalFormat}</td>
|
|
|
</tr>
|
|
|
EOT;
|
|
|
@@ -1825,9 +1825,9 @@ EOT;
|
|
|
<th style="white-space: normal; word-break: keep-all;">Product Name</th>
|
|
|
<th style="white-space: nowrap;">Quantity</th>
|
|
|
<th style="white-space: normal; word-break: keep-all;">Unit Price ({$currency})</th>
|
|
|
- <th style="white-space: normal; word-break: keep-all;">Taxable Amount ({$currency})</th>
|
|
|
+ <th style="white-space: normal; word-break: keep-all;" colspan="2">Taxable Amount ({$currency})</th>
|
|
|
<th style="white-space: normal; word-break: keep-all;">VAT Rate</th>
|
|
|
- <th style="white-space: normal; word-break: keep-all;">VAT Amount ({$currency})</th>
|
|
|
+ <th style="white-space: normal; word-break: keep-all;" colspan="2">VAT Amount ({$currency})</th>
|
|
|
<th style="white-space: normal; word-break: keep-all;">Total({$currency})</th>
|
|
|
</tr>
|
|
|
{$orderDetails}
|
|
|
@@ -1846,9 +1846,9 @@ EOT;
|
|
|
<td style="text-align: left; background-color: lightslategray;"></td>
|
|
|
<td style="text-align: left; background-color: lightslategray;"></td>
|
|
|
<td style="text-align: left; background-color: lightslategray;">{$orderTotalBv}</td>
|
|
|
- <td style="text-align: left; background-color: lightslategray;">{$orderTotalTaxAmount}</td>
|
|
|
+ <td style="text-align: left; background-color: lightslategray;" colspan="2">{$orderTotalAmount}</td>
|
|
|
<td style="text-align: left; background-color: lightslategray;"></td>
|
|
|
- <td style="text-align: left; background-color: lightslategray;">{$orderTotalAmount}</td>
|
|
|
+ <td style="text-align: left; background-color: lightslategray;" colspan="2">{$orderTotalTaxAmount}</td>
|
|
|
<td style="text-align: left; background-color: lightslategray;">{$orderTotal}</td>
|
|
|
</tr>
|
|
|
</table>
|
ryan