diff options
| author | jeff <jeff> | 2006-08-27 19:30:38 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2006-08-27 19:30:38 +0000 |
| commit | 4142ac8edaafd2791cd89116e2a6883f0be99366 (patch) | |
| tree | 861a91c14f19c8811d99fca1f6db4932348f286b /httemplate/edit | |
| parent | 6af1b1bfa25e5ececef5e0dcd38b55917121cee2 (diff) | |
correct bad conflict resolution
Diffstat (limited to 'httemplate/edit')
| -rwxr-xr-x | httemplate/edit/cust_bill_pay.cgi | 2 | ||||
| -rwxr-xr-x | httemplate/edit/cust_credit.cgi | 4 | ||||
| -rwxr-xr-x | httemplate/edit/cust_credit_bill.cgi | 8 |
3 files changed, 0 insertions, 14 deletions
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi index 90292ebc1..498d477cd 100755 --- a/httemplate/edit/cust_bill_pay.cgi +++ b/httemplate/edit/cust_bill_pay.cgi @@ -36,7 +36,6 @@ function changed(what) { <BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)"> <OPTION VALUE=""> -% foreach my $cust_bill ( @cust_bill ) { % foreach my $cust_bill ( @cust_bill ) { <OPTION<% $cust_bill->invnum eq $invnum ? ' SELECTED' : '' %> VALUE="<% $cust_bill->invnum %>"><% $cust_bill->invnum %> - <% time2str("%D", $cust_bill->_date) %> - $<% $cust_bill->owed %> @@ -84,4 +83,3 @@ my @cust_bill = sort { $a->_date <=> $b->_date qsearch('cust_bill', { 'custnum' => $cust_pay->custnum } ); </%init> - diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi index 803798ef8..13d062c74 100755 --- a/httemplate/edit/cust_credit.cgi +++ b/httemplate/edit/cust_credit.cgi @@ -25,9 +25,6 @@ Credit <TD ALIGN="right">Amount</TD> <TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="amount" VALUE="<% $amount %>" SIZE=8 MAXLENGTH=8></TD> </TR> -% -%#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!; -% % %#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!; @@ -81,4 +78,3 @@ my $otaker = getotaker; my $p1 = popurl(1); </%init> - diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi index 26c1126b1..249ba31d0 100755 --- a/httemplate/edit/cust_credit_bill.cgi +++ b/httemplate/edit/cust_credit_bill.cgi @@ -21,12 +21,6 @@ Credit #<B><% $crednum %></B> <SCRIPT> function changed(what) { cust_bill = what.options[what.selectedIndex].value; -% foreach my $cust_bill ( @cust_bill ) { -% my $invnum = $cust_bill->invnum; -% my $changeto = $cust_bill->owed < $cust_credit->credited -% ? $cust_bill->owed -% : $cust_credit->credited; -% % foreach my $cust_bill ( @cust_bill ) { @@ -44,7 +38,6 @@ function changed(what) { <BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)"> <OPTION VALUE=""> -% foreach my $cust_bill ( @cust_bill ) { % foreach my $cust_bill ( @cust_bill ) { <OPTION<% $cust_bill->invnum eq $invnum ? ' SELECTED' : '' %> VALUE="<% $cust_bill->invnum %>"><% $cust_bill->invnum %> - <% time2str("%D",$cust_bill->_date) %> - $<% $cust_bill->owed %> @@ -97,4 +90,3 @@ my @cust_bill = sort { $a->_date <=> $b->_date qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ); </%init> - |