diff options
author | Ivan Kohler <ivan@freeside.biz> | 2014-12-15 22:16:23 -0800 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2014-12-15 22:16:23 -0800 |
commit | a7db5fbb81de9859db0fc9ccbd5236ee2a0dfe9f (patch) | |
tree | 745016fa78d50279b796b14a79608f695a9d14fb | |
parent | 31d11d5b964328ecdd55340636c91088729aede6 (diff) | |
parent | d722c80eae608ad6d87ac1a7f4ee0baf9a567ec5 (diff) |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
-rw-r--r-- | FS/FS/part_pkg/agent.pm | 2 | ||||
-rwxr-xr-x | debian/rules | 5 |
2 files changed, 6 insertions, 1 deletions
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) |