Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 18 Sep 2017 21:57:12 +0000 (14:57 -0700)
committerIvan Kohler <ivan@freeside.biz>
Mon, 18 Sep 2017 21:57:12 +0000 (14:57 -0700)
FS/MANIFEST
httemplate/view/cust_main/packages/package.html

index 4c892ec..81087de 100644 (file)
@@ -873,3 +873,7 @@ FS/saved_search.pm
 t/saved_search.t
 FS/sector_coverage.pm
 t/sector_coverage.t
+FS/access_user_session_log.pm
+t/access_user_session_log.t
+FS/access_user_session_log.pm
+t/access_user_session_log.t
index 6114341..d643133 100644 (file)
                    actionlabel => emt('Change package'),
                    #width       => 768,
                    width       => 960,
-                   height      => 538,
+                   height      => 640,
                  },
 
                  { label       => 'Discount package',
                       "zip=;country=$countrydefault",
                    actionlabel => emt('Change location'),
                    width       => 960,
-                   height      => 530,
+                   height      => 640,
                  },
 
                  { label       => 'Edit location',
                    acl         => 'Change customer package',
                    condition   => sub { ! $change_from && $cust_pkg->locationnum != $cust_pkg->cust_main->ship_locationnum  },
-                   popup       => 'misc/cust_location.cgi?locationnum='.
+                   popup       => 'edit/cust_location.cgi?locationnum='.
                                     $cust_pkg->locationnum,
                    actionlabel => emt('Edit location'),
                    width       => 700,