[freeside-commits] branch master updated. bbf3f6d6af46d522a395e4c31ed8818059517b75

[Ivan]

The branch, master has been updated
       via  bbf3f6d6af46d522a395e4c31ed8818059517b75 (commit)
       via  f133a533e3b0b8e0a6cac03d7f38765ab44df9fd (commit)
       via  d5325247a6be930a0a3799795e10853fc057e37c (commit)
      from  bb6ff4c824ea551497def573a548035238980ed5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bbf3f6d6af46d522a395e4c31ed8818059517b75
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date:   Sat Jan 18 16:54:26 2014 -0300

    - Hide en_US on invoicing locales.

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 02a24ad..864a612 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -34,11 +34,11 @@ invoice language options:
 <form action="<% $cgi->self_url %>" method="GET" style="display:inline;">
 <& /elements/select.html,
     'field' => 'locale',
-    'options' => [ '', @locales ],
+    'options' => [ '', grep { $_ ne 'en_US'} @locales ],
     'labels'  => { map { 
         my %info = FS::Locales->locale_info($_);
         $_ => "$info{name} ($info{country})"
-    } @locales },
+    } grep { $_ ne 'en_US' } @locales },
     'curr_value' => $locale,
     'id' => 'select-locale',
     'onchange' => 'changeLocale'

commit f133a533e3b0b8e0a6cac03d7f38765ab44df9fd
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date:   Sat Jan 18 16:46:46 2014 -0300

    - Allow en_US on available locales list.

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 773a157..bf45762 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5434,7 +5434,6 @@ and customer address. Include units.',
     'multiple'    => 1,
     'options_sub' => sub { 
       map { $_ => FS::Locales->description($_) }
-      grep { $_ ne 'en_US' } 
       FS::Locales->locales;
     },
     'option_sub'  => sub { FS::Locales->description(shift) },

commit d5325247a6be930a0a3799795e10853fc057e37c
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date:   Sat Jan 18 14:23:53 2014 -0300

    - Fix Quick charge page.

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 7b88bcc..0db1543 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -446,6 +446,7 @@ if ( $cgi->param('classnum') =~ /^(\d+)$/ ) {
 }
 
 my $part_pkg;
+my $billed = 0;
 
 if ( $cust_pkg ) { # set defaults
   $part_pkg = $cust_pkg->part_pkg;
@@ -457,8 +458,7 @@ if ( $cust_pkg ) { # set defaults
       push @description, $part_pkg->option("additional_info$i",1);
     }
   }
+  $billed = $cust_pkg->get('setup') ? 1 : 0;
 }
 
-my $billed = $cust_pkg->get('setup') ? 1 : 0;
-
 </%init>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm                     |    1 -
 httemplate/config/config-view.cgi |    4 ++--
 httemplate/edit/quick-charge.html |    4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)