[freeside-commits] branch master updated. 6156461dcd934da26e53f78a4aed450259e4ae55

[Ivan]

The branch, master has been updated
       via  6156461dcd934da26e53f78a4aed450259e4ae55 (commit)
       via  41347384d05b3dd73f73a45857f645733b0cb2c7 (commit)
      from  85df57b62bee761a4946850f97230a21e96c51a6 (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 6156461dcd934da26e53f78a4aed450259e4ae55
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 3 18:45:47 2014 -0800

    added part_pkg.agent_pkgpartid, RT#27214

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index b35dc02..2ec3481 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -48,6 +48,7 @@
                    'recur_cost'       => 'Recur cost',
                    'pay_weight'       => 'Payment weight',
                    'credit_weight'    => 'Credit weight',
+                   'agent_pkgpartid'  => 'External ID',
                    'agentnum'         => 'Agent',
                    'setup_fee'        => 'Setup fee',
                    'setup_show_zero'  => 'Show zero setup',

commit 41347384d05b3dd73f73a45857f645733b0cb2c7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 3 18:44:22 2014 -0800

    added part_pkg.agent_pkgpartid, RT#27214

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 17fa2d8..728b0cc 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2958,11 +2958,12 @@ sub tables_hashref {
         'successor',     'int',     'NULL', '', '', '',
         'family_pkgpart','int',     'NULL', '', '', '',
         'delay_start',   'int',     'NULL', '', '', '',
+        'agent_pkgpartid', 'varchar', 'NULL', 20, '', '',
       ],
       'primary_key'  => 'pkgpart',
       'unique'       => [],
       'index'        => [ [ 'promo_code' ], [ 'disabled' ], [ 'classnum' ],
-                          [ 'agentnum' ], ['no_auto'],
+                          [ 'agentnum' ], ['no_auto'], ['agent_pkgpartid'],
                         ],
       'foreign_keys' => [
                           { columns    => [ 'classnum' ],
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 26cdf70..8f8287b 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -703,6 +703,7 @@ sub check {
     || $self->ut_numbern('delay_start')
     || $self->ut_foreign_keyn('successor', 'part_pkg', 'pkgpart')
     || $self->ut_foreign_keyn('family_pkgpart', 'part_pkg', 'pkgpart')
+    || $self->ut_alphan('agent_pkgpartid')
     || $self->SUPER::check
   ;
   return $error if $error;
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 3fee36b..b35dc02 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -224,12 +224,6 @@
                        },
                      },
 
-                     { type  => 'tablebreak-tr-title',
-                       value => 'Line-item revenue recogition', #better name?
-                     },
-                     { field=>'pay_weight',    type=>'text', size=>6 },
-                     { field=>'credit_weight', type=>'text', size=>6 },
-
                      ( $conf->exists('cust_pkg-show_fcc_voice_grade_equivalent')
                        ? ( 
                            { type  => 'tablebreak-tr-title',
@@ -243,6 +237,16 @@
                         : ()
                      ),
 
+                     { type  => 'tablebreak-tr-title',
+                       value => 'External Links', #better name?
+                     },
+                     { field=>'agent_pkgpartid', type=>'text', size=>21 },
+
+                     { type  => 'tablebreak-tr-title',
+                       value => 'Line-item revenue recogition', #better name?
+                     },
+                     { field=>'pay_weight',    type=>'text', size=>6 },
+                     { field=>'credit_weight', type=>'text', size=>6 },
 
                    { type => 'columnend' },
 

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

Summary of changes:
 FS/FS/Schema.pm              |    3 ++-
 FS/FS/part_pkg.pm            |    1 +
 httemplate/edit/part_pkg.cgi |   17 +++++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)