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

diff --git a/FS/FS/part_export/a2billing.pm b/FS/FS/part_export/a2billing.pm
index e029716..7aab01a 100644 (file)
--- a/FS/FS/part_export/a2billing.pm
+++ b/FS/FS/part_export/a2billing.pm
@@ -131,7 +131,7 @@ sub export_insert {
       username  => $username,
       useralias => $username,
       uipass    => $svc->_password,
-      credit    => $cust_main->credit_limit || $self->option('credit') || 0,
+      creditlimit    => $cust_main->credit_limit || $self->option('credit') || 0,
       tariff    => $part_pkg->option('a2billing_tariff'),
       status    => 1,
       lastname  => $cust_main->last, # $svc->finger?

diff --git a/debian/postinst b/debian/postinst
index af80afe..af0e7ee 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 chown -R freeside /usr/local/etc/freeside
-
+/usr/sbin/update-rc.d freeside defaults 23 01
 exit 0