[freeside-commits] branch master updated. ae817d8bbd220b645f41cb2d020ba8b6b739765b

[Ivan]

The branch, master has been updated
       via  ae817d8bbd220b645f41cb2d020ba8b6b739765b (commit)
       via  2372bdb860f7cb926b61a69a75c38997819b4923 (commit)
      from  9972d7caa7a3e1a29dc4201e0c7256ba093ea705 (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 ae817d8bbd220b645f41cb2d020ba8b6b739765b
Merge: 2372bdb 9972d7c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 11 15:38:06 2016 -0800

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


commit 2372bdb860f7cb926b61a69a75c38997819b4923
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 11 15:38:02 2016 -0800

    mason include

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 4e061e2..851c31c 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -136,9 +136,10 @@
 
 </TABLE><BR>
 
-<% include('/misc/cust_pkg_usageprice.html',
+<& /misc/cust_pkg_usageprice.html,
      'pkgpart' => $pkgpart
-   ) %>
+&>
+
 <BR>
 
 % my $discount_cust_pkg = $curuser->access_right('Discount customer package');

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

Summary of changes:
 httemplate/misc/order_pkg.html |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)