[freeside-commits] freeside/httemplate/browse did_order.html, 1.1.2.2, 1.1.2.3

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail.420.am:/tmp/cvs-serv21224/httemplate/browse

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	did_order.html 
Log Message:
bulk DID order/inventory improvements, RT11291

Index: did_order.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/did_order.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- did_order.html	13 Feb 2011 07:19:46 -0000	1.1.2.2
+++ did_order.html	6 Apr 2011 08:28:37 -0000	1.1.2.3
@@ -4,15 +4,16 @@
                  'name'        => 'bulk DID orders',
                  'disableable' => 0,
                  'query'       => { 'table'     => 'did_order',
-				    'addl_from' => 'left join did_vendor using (vendornum) 
-						    left join lata using (latanum)',
+				    'addl_from' => 'left join did_vendor using (vendornum) ',
                                     'hashref'   => {},
                                     'order_by' => 'ORDER BY ordernum',
                                   },
                  'count_query' => $count_query,
                  'header'      => $header,
                  'fields'      => $fields,
-                 'links'       => $links,
+                 'links'       => [
+				    [ $p.'edit/did_order.html?', 'ordernum' ],
+				  ],
              )
 %>
 <%init>
@@ -28,31 +29,22 @@
 
 my $count_query = 'SELECT COUNT(*) FROM did_order';
 
-my $link = [ $p.'edit/did_order.html?', 'ordernum' ];
-
 my $display_date = sub {
     my $date = shift;
     return '' unless $date;
     time2str($date_format, $date);
 };
 
-my $header = [ '#', 'Vendor',' Vendor Order #', 'MSA', 'LATA #', 'LATA', 
-		'Rate Center', 'State', 'Quantity', 'Submitted', 'Confirmed',
-		'Received', 
+my $header = [ '#', 'Vendor',' Vendor Order #',  
+		'Submitted', 'Confirmed', 'Customer', 'Received', 
 	    ];
-my $links  = [ ];
 my $fields = [  sub {
 		    my $did_order = shift;
-		    if($did_order->received) {
-			push @$links, $link;
-		    }
-		    else {
-			return $did_order->ordernum;
-		    }
-		}, 'vendorname', 'vendor_order_id', 'msa', 'latanum',
-		'description', 'rate_center', 'state', 'quantity', 
+		    $did_order->ordernum;
+		}, 'vendorname', 'vendor_order_id', 
 		sub { &$display_date(shift->submitted); }, 
 		sub { &$display_date(shift->confirmed);	}, 
+		'custnum',
 		sub { 
 		    my $did_order = shift;
 		    my $ordernum = $did_order->ordernum;