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

diff --combined fs_selfservice/FS-SelfService/SelfService.pm
index 12d56bb,a9da564..765d611
--- 1/fs_selfservice/FS-SelfService/SelfService.pm
--- 2/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@@ -115,6 -115,13 +115,13 @@@ $socket .= '.'.$tag if defined $tag && 
  
    'start_thirdparty'          => 'MyAccount/start_thirdparty',
    'finish_thirdparty'         => 'MyAccount/finish_thirdparty',
+ 
+   'quotation_info'            => 'MyAccount/quotation/quotation_info',
+   'quotation_print'           => 'MyAccount/quotation/quotation_print',
+   'quotation_add_pkg'         => 'MyAccount/quotation/quotation_add_pkg',
+   'quotation_remove_pkg'      => 'MyAccount/quotation/quotation_remove_pkg',
+   'quotation_order'           => 'MyAccount/quotation/quotation_order',
+ 
  );
  @EXPORT_OK = (
    keys(%autoload),
@@@ -251,30 -258,7 +258,30 @@@ FS::SelfService - Freeside self-servic
  
    #!!! list_pkgs example
  
 -  #!!! order_pkg example
 +  #ordering a package with an svc_acct service
 +  my $rv = order_pkg( { 'session_id' => $session_id,
 +                        'pkgpart'    => $pkgpart,
 +                        'svcpart'    => $svcpart,
 +                        'username'   => $username,
 +                        'domsvc'     => $domsvc, #svcnum of svc_domain
 +                        '_password'  => $password,
 +                      }
 +                    );
 +
 +  #!!! ordering a package with an svc_domain service example
 +
 +  #!!! ordering a package with an svc_phone service example
 +
 +  #!!! ordering a package with an svc_external service example
 +
 +  #!!! ordering a package with an svc_pbx service
 +
 +  #ordering a package with no service
 +  my $rv = order_pkg( { 'session_id' => $session_id,
 +                        'pkgpart'    => $pkgpart,
 +                        'svcpart'    => 'none',
 +                      }
 +                    );
  
    #!!! cancel_pkg example