[freeside-commits] branch master updated. a60615bf7bde77aa2b9faf3fc268c149eecdb5ab

Ivan ivan at 420.am
Wed Dec 19 22:59:56 PST 2012


The branch, master has been updated
       via  a60615bf7bde77aa2b9faf3fc268c149eecdb5ab (commit)
       via  a69f8a2b55163b5f0eac908918e46a3eb3bd2290 (commit)
       via  431c9ca4fab151862bd24322bf8a1f9252fb38fc (commit)
       via  96783bdc58be6e4f2fc56d516a9ceba57af00ba8 (commit)
       via  19bdd89959b314fd22b93dc520a79d86545af014 (commit)
       via  06fb1346ff8076a84f743fa07de31852942e144f (commit)
       via  bfa1e79d41fe82808c79d064a65633d828c0e0b3 (commit)
       via  4c32a16b43ee00d969939d15cfc586ba8023bf47 (commit)
       via  07cbc6f4f150dcd21b53684c55937ad636ff22b9 (commit)
       via  54208096c3d8a75b3a21e18580059d2b1c084608 (commit)
       via  aae59f21b56cdf5f5653f3c8011d688198f56db4 (commit)
       via  69e6eda22f48dde358c86113250188f40453a764 (commit)
       via  206a713bed7ae16c8ed6aa607de126c42d1b6a70 (commit)
      from  7031d0c599829fa3f3f6d8a24e955146cea883f5 (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 a60615bf7bde77aa2b9faf3fc268c149eecdb5ab
Merge: a69f8a2 69e6eda
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 19 22:56:58 2012 -0800

    Merge branch 'patch-5' of https://github.com/gjones2/Freeside (#13854 as this bug cropped up with RT4)


commit a69f8a2b55163b5f0eac908918e46a3eb3bd2290
Merge: 431c9ca 206a713
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 19 22:56:37 2012 -0800

    Merge branch 'patch-4' of https://github.com/gjones2/Freeside (#13854 as this bug cropped up with RT4)


commit 431c9ca4fab151862bd24322bf8a1f9252fb38fc
Merge: 96783bd aae59f2
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 19 22:48:59 2012 -0800

    Merge branch 'patch-6' of https://github.com/gjones2/Freeside (#13854 as this bug cropped up with RT4)


commit 96783bdc58be6e4f2fc56d516a9ceba57af00ba8
Merge: 19bdd89 4c32a16
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 19 22:48:15 2012 -0800

    Merge branch 'patch-9' of https://github.com/gjones2/Freeside (#13854 as this bug cropped up with RT4)


commit 19bdd89959b314fd22b93dc520a79d86545af014
Merge: 06fb134 07cbc6f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 19 22:47:14 2012 -0800

    Merge branch 'patch-8' of https://github.com/gjones2/Freeside (#13854 as this bug cropped up with RT4)


commit 06fb1346ff8076a84f743fa07de31852942e144f
Merge: bfa1e79 5420809
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 19 22:45:11 2012 -0800

    Merge branch 'patch-7' of https://github.com/gjones2/Freeside (#13854 as this bug cropped up with RT4)


commit bfa1e79d41fe82808c79d064a65633d828c0e0b3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 19 20:16:06 2012 -0800

    not much of an experiment anymore if many of our big customers are doing it, RT#6802

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 65e3ebd..ac93aaf 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -143,7 +143,7 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -l: debugging level
 
-  -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
+  -m: Multi-process mode uses the job queue for multi-process and/or multi-machine billing.
 
   -r: Multi-process mode dry run option
 

commit 4c32a16b43ee00d969939d15cfc586ba8023bf47
Author: gjones2 <gary at pointblanksecurity.com>
Date:   Tue Nov 20 16:21:06 2012 -0500

    Update httemplate/elements/searchbar-ticket.html
    
    Fixed issue where html break tags are being escaped erroneously causing break tags to be displayed in the navigation menu.
    
    This issue can be reproduced by doing the following:
    
    1. Change the Freeside user's preference to display the menu on the left.
    
    2. Click "Ticketing Main"

diff --git a/httemplate/elements/searchbar-ticket.html b/httemplate/elements/searchbar-ticket.html
index 30624f7..ae86dbc 100644
--- a/httemplate/elements/searchbar-ticket.html
+++ b/httemplate/elements/searchbar-ticket.html
@@ -5,7 +5,7 @@
     <A HREF="<% FS::TicketSystem->baseurl %>Search/Build.html?NewQuery=1" CLASS="fslink" STYLE="font-size:11px"><% mt('Advanced') |h %></A>
     <INPUT TYPE="submit" VALUE="<% mt('Search tickets') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
   </FORM>
-  <% $menu_position eq 'left' ? '<BR>' : '' %>
+  <% $menu_position eq 'left' ? '<BR>' : '' |n %>
 
 % }
 

commit 07cbc6f4f150dcd21b53684c55937ad636ff22b9
Author: gjones2 <gary at pointblanksecurity.com>
Date:   Tue Nov 20 16:20:45 2012 -0500

    Update httemplate/elements/searchbar-prospect.html
    
    Fixed issue where html break tags are being escaped erroneously causing break tags to be displayed in the navigation menu.
    
    This issue can be reproduced by doing the following:
    
    1. Change the Freeside user's preference to display the menu on the left.
    
    2. Click "Ticketing Main"

diff --git a/httemplate/elements/searchbar-prospect.html b/httemplate/elements/searchbar-prospect.html
index 68b90d4..ac36379 100644
--- a/httemplate/elements/searchbar-prospect.html
+++ b/httemplate/elements/searchbar-prospect.html
@@ -5,7 +5,7 @@
     <A HREF="<%$fsurl%>search/report_prospect_main.html" CLASS="fslink" STYLE="font-size: 11px">Adv</A>
     <INPUT TYPE="submit" VALUE="Search prospects" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px">
   </FORM>
-  <% $menu_position eq 'left' ? '<BR>' : '' %>
+  <% $menu_position eq 'left' ? '<BR>' : '' |n %>
 
 % }
 

commit 54208096c3d8a75b3a21e18580059d2b1c084608
Author: gjones2 <gary at pointblanksecurity.com>
Date:   Tue Nov 20 16:20:31 2012 -0500

    Update httemplate/elements/searchbar-cust_svc.html
    
    Fixed issue where html break tags are being escaped erroneously causing break tags to be displayed in the navigation menu.
    
    This issue can be reproduced by doing the following:
    
    1. Change the Freeside user's preference to display the menu on the left.
    
    2. Click "Ticketing Main"

diff --git a/httemplate/elements/searchbar-cust_svc.html b/httemplate/elements/searchbar-cust_svc.html
index 766209d..e4c2dc6 100644
--- a/httemplate/elements/searchbar-cust_svc.html
+++ b/httemplate/elements/searchbar-cust_svc.html
@@ -5,7 +5,7 @@
     <A NOTYET="<%$fsurl%>search/svc_Smarter.html" STYLE="color: #cccccc; font-size:11px"><% mt('Advanced') |h %></A>
     <INPUT TYPE="submit" VALUE="<% mt('Search services') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
   </FORM>
-  <% $menu_position eq 'left' ? '<BR>' : '' %>
+  <% $menu_position eq 'left' ? '<BR>' : '' |n %>
 
 % }
 

commit aae59f21b56cdf5f5653f3c8011d688198f56db4
Author: gjones2 <gary at pointblanksecurity.com>
Date:   Tue Nov 20 16:20:09 2012 -0500

    Update httemplate/elements/searchbar-cust_main.html
    
    Fixed issue where html break tags are being escaped erroneously causing break tags to be displayed in the navigation menu.
    
    This issue can be reproduced by doing the following:
    
    1. Change the Freeside user's preference to display the menu on the left.
    
    2. Click "Ticketing Main"

diff --git a/httemplate/elements/searchbar-cust_main.html b/httemplate/elements/searchbar-cust_main.html
index 5d79aaa..9a98417 100644
--- a/httemplate/elements/searchbar-cust_main.html
+++ b/httemplate/elements/searchbar-cust_main.html
@@ -5,7 +5,7 @@
     <A HREF="<%$fsurl%>search/report_cust_main.html" CLASS="fslink" STYLE="font-size: 11px"><% mt('Advanced') |h %></A>
     <INPUT TYPE="submit" VALUE="<% mt('Search customers') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
   </FORM>
-  <% $menu_position eq 'left' ? '<BR>' : '' %>
+  <% $menu_position eq 'left' ? '<BR>' : '' |n %>
 
 % }
 

commit 69e6eda22f48dde358c86113250188f40453a764
Author: gjones2 <gary at pointblanksecurity.com>
Date:   Tue Nov 20 16:14:59 2012 -0500

    Update httemplate/elements/searchbar-cust_bill.html
    
    Fixed issue where html break tags are being escaped erroneously causing break tags to be displayed in the navigation menu.
    
    This issue can be reproduced by doing the following:
    
    1. Change the Freeside user's preference to display the menu on the left.
    
    2. Click "Ticketing Main"

diff --git a/httemplate/elements/searchbar-cust_bill.html b/httemplate/elements/searchbar-cust_bill.html
index 7d24fbe..169315b 100644
--- a/httemplate/elements/searchbar-cust_bill.html
+++ b/httemplate/elements/searchbar-cust_bill.html
@@ -8,7 +8,7 @@
     <BR>
     <INPUT TYPE="submit" VALUE="<% mt('Search invoices') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px;margin-top:3px">
   </FORM>
-  <% $menu_position eq 'left' ? '<BR><BR>' : '' %>
+  <% $menu_position eq 'left' ? '<BR><BR>' : '' |n %>
 
 % } 
 

commit 206a713bed7ae16c8ed6aa607de126c42d1b6a70
Author: gjones2 <gary at pointblanksecurity.com>
Date:   Tue Nov 20 16:12:52 2012 -0500

    Update httemplate/elements/searchbar-address2.html
    
    Fixed issue where html break tags are being escaped erroneously causing break tags to be displayed in the navigation menu.
    
    This issue can be reproduced by doing the following:
    
    1. Change the Freeside user's preference to display the menu on the left.
    
    2. Click "Ticketing Main"

diff --git a/httemplate/elements/searchbar-address2.html b/httemplate/elements/searchbar-address2.html
index d5e2b37..5f3b1f2 100644
--- a/httemplate/elements/searchbar-address2.html
+++ b/httemplate/elements/searchbar-address2.html
@@ -6,7 +6,7 @@
     <BR>
     <INPUT TYPE="submit" VALUE="Search units" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px;margin-top:3px">
   </FORM>
-  <% $menu_position eq 'left' ? '<BR>' : '' %>
+  <% $menu_position eq 'left' ? '<BR>' : '' |n %>
 
 % } 
 

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

Summary of changes:
 FS/bin/freeside-daily                        |    2 +-
 httemplate/elements/searchbar-address2.html  |    2 +-
 httemplate/elements/searchbar-cust_bill.html |    2 +-
 httemplate/elements/searchbar-cust_main.html |    2 +-
 httemplate/elements/searchbar-cust_svc.html  |    2 +-
 httemplate/elements/searchbar-prospect.html  |    2 +-
 httemplate/elements/searchbar-ticket.html    |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)




More information about the freeside-commits mailing list