From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 16 Dec 2014 06:16:23 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=a7db5fbb81de9859db0fc9ccbd5236ee2a0dfe9f;hp=31d11d5b964328ecdd55340636c91088729aede6

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 d92699726..49c2c8654 100644
--- 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 07d391466..e640398e4 100755
--- 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)