OSB enhancements to date

This commit is contained in:
Deon George
2010-11-30 09:41:08 +11:00
parent 8715a2059b
commit ec6a542bc3
478 changed files with 23423 additions and 9309 deletions

View File

@@ -24,7 +24,11 @@
function accountJumpView(account_id,parent_account_id) {
var module = document.getElementById('JumpView').value;
document.getElementById('JumpView').value = '';
var url = '?_page=core:search&module='+module+'&_next_page_one=view&'+module+'_account_id='+account_id;
if(module == 'discount')
var url = '?_page=core:search&module='+module+'&_next_page_one=view&'+module+'_avail_account_id='+account_id;
else
var url = '?_page=core:search&module='+module+'&_next_page_one=view&'+module+'_account_id='+account_id;
if(module != 'invoice' && module != 'service' && module != 'subaccount' && module != 'parentaccount' ) {
view_show('collapse');
showIFrame('iframe',getPageWidth(600),500,url);
@@ -189,10 +193,8 @@
</tr>
</table>
</td>
<td style="width: 37%;">
<td style="width: 37%; vertical-align: top;">
<table width="100%" border="0" cellspacing="4" cellpadding="0" class="body">
<tr><td>&nbsp;</td></tr>
<!-- Invoices -->
{if $record.invoice}
<tr>
@@ -208,29 +210,32 @@
<img src="themes/{$THEME_NAME}/images/icons/stop_16.gif" style="border: 0px;"/>
{/if}
</td>
<td width="70"><a href="?_page=invoice:view&amp;id={$invoice.id}">{$invoice.id}</a></td>
<td width="70" align="right">
<td width="70" {if ! $invoice.status}style="color: #666666; text-decoration: line-through;"{/if}>
<a href="?_page=invoice:view&amp;id={$invoice.id}">{$invoice.id}</a>
</td>
<td width="70" align="right" {if ! $invoice.status}style="color: #666666; text-decoration: line-through;"{/if}>
{if $invoice.due > 0}
<font color="#666666">{$list->format_currency_num($invoice.total_amt,'')}</font>
{else}
<font color="#006600"><b>{$list->format_currency_num($invoice.total_amt,'')}</b></font>
{/if}
</td>
<td width="100" align="right">
{if $invoice.due > 0}
<td width="100" align="right" {if ! $invoice.status}style="color: #666666; text-decoration: line-through;"{/if}>
{if $invoice.due > 0 && $invoice.status}
<font color="#CC0000"><b>{$list->format_currency_num($invoice.due,'')}</b></font>
{else}
<font color="#999999">{$list->format_currency_num('0','')}</font>
{/if}
</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;{$list->date($invoice.date_orig)}</td>
<td {if ! $invoice.status}style="color: #666666; text-decoration: line-through;"{/if}>&nbsp;&nbsp;&nbsp;&nbsp;{$list->date($invoice.date_orig)}</td>
</tr>
{/foreach}
{/if}
{if $record.service}
<tr><td width="6">&nbsp;</td></tr>
<tr>
<td colspan="6"><b><br/>{t}Service Overview{/t}</b></td>
<td colspan="6"><b>{t}Service Overview{/t}</b></td>
</tr>
{foreach from=$record.service item=service}
<tr valign="middle">
@@ -260,13 +265,45 @@
</table>
</td>
<td style="width: 37%;">
<td style="width: 37%; vertical-align: top;">
<table width="100%" border="0" cellspacing="4" cellpadding="0" class="body">
<tr><td>&nbsp;</td></tr>
{if $record.duesoon}
<!-- Payments-->
{if $record.payment}
<tr>
<td colspan="6"><b><br/>{t}Invoices Due Soon{/t}</b></td>
<td colspan="6"><b>{t}Payments Overview{/t}</b></td>
</tr>
{foreach from=$record.payment item=invoice}
<tr valign="middle">
<td width="6">&nbsp;</td>
<td width="38">
{if $invoice.pending_status == '1'}
<img src="themes/{$THEME_NAME}/images/icons/stop_16.gif" style="border: 0px;"/>
{else}
<img src="themes/{$THEME_NAME}/images/icons/go_16.gif" style="border: 0px;"/>
{/if}
</td>
<td width="70">
<a href="?_page=payment:view&amp;id={$invoice.id}">{$invoice.id}</a>
</td>
<td width="70" align="right">
{if $invoice.total_amt-$invoice.alloc_amt > 0}
<font color="#CC0000">{$list->format_currency_num($invoice.total_amt,'')}</font>
{else}
<font color="#006600"><b>{$list->format_currency_num($invoice.total_amt,'')}</b></font>
{/if}
</td>
<td width="100" align="right">
<font color="#666666"><b>{$list->format_currency_num($invoice.alloc_amt,'')}</b></font>
</td>
<td width="6">&nbsp;</td>
<td>{$list->date($invoice.date_payment)}</td>
</tr>
{/foreach}
{/if}
{if $record.duesoon}
<tr><td width="6">&nbsp;</td></tr>
<tr>
<td colspan="8"><b>{t}Services Invoiced Soon{/t}</b></td>
</tr>
{foreach from=$record.duesoon item=service}
<tr valign="middle">