[freeside-commits] freeside/httemplate/edit cust_bill_pay.cgi, 1.14, 1.15 cust_credit.cgi, 1.16, 1.17 cust_credit_bill.cgi, 1.13, 1.14

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv18059/httemplate/edit

Modified Files:
	cust_bill_pay.cgi cust_credit.cgi cust_credit_bill.cgi 
Log Message:
correct bad conflict resolution

Index: cust_bill_pay.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_bill_pay.cgi,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cust_bill_pay.cgi	26 Aug 2006 23:15:13 -0000	1.14
+++ cust_bill_pay.cgi	27 Aug 2006 19:30:38 -0000	1.15
@@ -36,7 +36,6 @@
 
 <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 @@
                 qsearch('cust_bill', { 'custnum' => $cust_pay->custnum } );
 </%init>
 
-

Index: cust_credit.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_credit.cgi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cust_credit.cgi	26 Aug 2006 23:15:13 -0000	1.16
+++ cust_credit.cgi	27 Aug 2006 19:30:38 -0000	1.17
@@ -25,9 +25,6 @@
     <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 $p1 = popurl(1);
 </%init>
-

Index: cust_credit_bill.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_credit_bill.cgi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cust_credit_bill.cgi	26 Aug 2006 23:15:13 -0000	1.13
+++ cust_credit_bill.cgi	27 Aug 2006 19:30:38 -0000	1.14
@@ -21,12 +21,6 @@
 <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 @@
 
 <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 @@
                 qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
 </%init>
 
-