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

diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
index d926997..49c2c86 100644 (file)
--- a/FS/FS/part_pkg/agent.pm
+++ b/FS/FS/part_pkg/agent.pm
@@ -46,7 +46,7 @@ $me = '[FS::part_pkg::agent]';
 
   },
 
-  'fieldorder' => [qw( cutoff_day add_full_period no_pkg_prorate ) ],
+  'fieldorder' => [qw( cutoff_day add_full_period no_pkg_prorate display_separate_cust cost_only) ],
 
   'weight' => 52,
 

diff --git a/debian/rules b/debian/rules
index 07d3914..e640398 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -160,6 +160,11 @@ install-stamp: build-stamp
 
        # Install interfaces
        $(MAKE) -e DESTDIR=$(TMP)-webui install-docs
+       
+       # Install tex
+       install -D -o freeside -m 444 etc/longtable.sty \
+       $(TMP)-lib/usr/local/share/texmf/tex/latex/longtable.sty
+       texhash $(TMP)-lib/usr/local/share/texmf
 
        # Create Apache configurations
        install -d $(APACHE_CONF)