[freeside-commits] branch master updated. 06e353b743e7be88afa8fce50ea10f27ebb7adef

[Ivan]

The branch, master has been updated
       via  06e353b743e7be88afa8fce50ea10f27ebb7adef (commit)
       via  56230080801b578c595f5807c7e878452b6bc12d (commit)
      from  8e73bf5782dc6fe2b299ba759ad15780a8946cc4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06e353b743e7be88afa8fce50ea10f27ebb7adef
Merge: 5623008 8e73bf5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Mar 25 23:17:38 2013 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 56230080801b578c595f5807c7e878452b6bc12d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Mar 25 23:17:25 2013 -0700

    add otaker to package search, RT#16937

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 887ec60..110da91 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -9,6 +9,7 @@
                                      emt('Package'),
                                      emt('Class'),
                                      emt('Status'),
+                                     emt('Ordered by'),
                                      emt('Setup'),
                                      emt('Base Recur'),
                                      emt('Freq.'),
@@ -34,6 +35,7 @@
                     sub { $_[0]->pkg; },
                     'classname',
                     sub { ucfirst(shift->status); },
+                    'otaker',
                     sub { sprintf( $money_char.'%.2f',
                                    shift->part_pkg->option('setup_fee'),
                                  );
@@ -96,13 +98,14 @@
                     '',
                     '',
                     '',
+                    '',
                     FS::UI::Web::cust_colors(),
                     '',
                   ],
-                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
                                FS::UI::Web::cust_styles() ],
                   'size'  => [ '', '', '', '', '-1' ],
-                  'align' => 'rrlccrrlrrrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+                  'align' => 'rrlcccrrlrrrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
                   'links' => [
                     $link,
                     $link,
@@ -119,6 +122,7 @@
                     '',
                     '',
                     '',
+                    '',
                     '', # link to changed-from package?
                     '',
                     '',

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/cust_pkg.cgi |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)