From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 28 Sep 2016 19:06:48 +0000 (-0700)
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=1d0374a383ba412f9e9390705965a9d8467508f7;hp=-c

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

1d0374a383ba412f9e9390705965a9d8467508f7
diff --combined FS/FS/Conf.pm
index e0fb80b51,a7e5d947a..ef2a9388a
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -2076,6 -2076,14 +2076,14 @@@ and customer address. Include units.'
    },
  
    {
+     'key'         => 'company_physical_address',
+     'section'     => 'addresses',
+     'description' => 'Your physical company address, for use in supplying google map directions, defaults to company_address',
+     'type'        => 'textarea',
+     'per_agent'   => 1,
+   },
+ 
+   {
      'key'         => 'show_ship_company',
      'section'     => 'addresses',
      'description' => 'Turns on display/collection of a "service company name" field for customers.',
@@@ -4247,7 -4255,6 +4255,7 @@@
      'section'     => 'invoice_balances',
      'description' => 'Text for the label of the total previous balance, when it is shown separately. Defaults to "Previous Balance".',
      'type'        => 'text',
 +    'per_locale'  => 1,
    },
  
    {
@@@ -4255,7 -4262,6 +4263,7 @@@
      'section'     => 'invoice_balances',
      'description' => 'Text for the label of the total of new charges, when it is shown separately. If invoice_show_prior_due_date is enabled, the due date of current charges will be appended. Defaults to "Total New Charges".',
      'type'        => 'text',
 +    'per_locale'  => 1,
    },
  
    {