From cf985eedaeb4b23a2050ebc0bb0cb304554e2a6d Mon Sep 17 00:00:00 2001
From: Alex Brelsfoard <alex@freeside.biz>
Date: Mon, 26 Jan 2015 20:30:09 -0500
Subject: [PATCH] Revert "Merge branch 'rt_28256'"

This reverts commit d03ab0df1ccbd3bdf54b3a85391879906d499097, reversing
changes made to 8d953e7c2f94dc007d94da74650d27c5a74cc792.
---
 FS/FS/part_pkg/global_Mixin.pm | 45 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_pkg/global_Mixin.pm b/FS/FS/part_pkg/global_Mixin.pm
index 899e73abc..263772955 100644
--- a/FS/FS/part_pkg/global_Mixin.pm
+++ b/FS/FS/part_pkg/global_Mixin.pm
@@ -65,7 +65,44 @@ tie my %a2billing_simultaccess, 'Tie::IxHash', (
       'type'        => 'select',
       'select_options' => \%a2billing_simultaccess,
     },  
-  },
+    'a2billing_carrier_cost_min' => {
+      'name'        => 'A2Billing inbound carrier cost',
+      'display_if'  => sub {
+        FS::part_export->count("exporttype = 'a2billing'") > 0;
+      },
+    },
+   'a2billing_carrer_initblock_offp' => {
+      'name'        => 'A2Billing inbound carrier min duration',
+      'display_if'  => sub {
+        FS::part_export->count("exporttype = 'a2billing'") > 0;
+      },
+    },
+    'a2billing_carrier_increment_offp' => {
+      'name'        => 'A2Billing inbound carrier billing block',
+      'display_if'  => sub {
+        FS::part_export->count("exporttype = 'a2billing'") > 0;
+      },
+    },
+    'a2billing_retail_cost_min_offp' => {
+      'name'        => 'A2Billing inbound retail cost',
+      'display_if'  => sub {
+        FS::part_export->count("exporttype = 'a2billing'") > 0;
+      },
+    },
+    'a2billing_retail_initblock_offp' => {
+      'name'        => 'A2Billing inbound retail min duration',
+      'display_if'  => sub {
+        FS::part_export->count("exporttype = 'a2billing'") > 0;
+      },
+    },
+    'a2billing_retail_increment_offp' => {
+      'name'        => 'A2Billing inbound retail billing block',
+      'display_if'  => sub {
+        FS::part_export->count("exporttype = 'a2billing'") > 0;
+     },
+   },
+
+ },
   'fieldorder' => [ qw(
     setup_fee
     recur_fee
@@ -76,6 +113,12 @@ tie my %a2billing_simultaccess, 'Tie::IxHash', (
     a2billing_tariff
     a2billing_type
     a2billing_simultaccess
+    a2billing_carrier_cost_min
+    a2billing_carrer_initblock_offp
+    a2billing_carrier_increment_offp
+    a2billing_retail_cost_min_offp
+    a2billing_retail_initblock_offp
+    a2billing_retail_increment_offp
   )],
 );
 
-- 
2.11.0