[freeside-commits] branch FREESIDE_3_BRANCH updated. d6103133f3de3b156601aea1347eadc07df4ab04

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  d6103133f3de3b156601aea1347eadc07df4ab04 (commit)
      from  f7e13fe2f0a39fd277f2990e076b662f00c2b088 (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 d6103133f3de3b156601aea1347eadc07df4ab04
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Sep 18 09:51:57 2014 -0700

    fix prospet quotation creation, fallout from #25561

diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm
index 7f53e31..401711b 100644
--- a/FS/FS/quotation.pm
+++ b/FS/FS/quotation.pm
@@ -120,6 +120,10 @@ sub check {
 
   $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
 
+  return 'prospectnum or custnum must be specified'
+    if ! $self->prospectnum
+    && ! $self->custnum;
+
   $self->SUPER::check;
 }
 
diff --git a/httemplate/elements/quotations.html b/httemplate/elements/quotations.html
index 0cf1500..1d80a48 100644
--- a/httemplate/elements/quotations.html
+++ b/httemplate/elements/quotations.html
@@ -55,7 +55,7 @@ if ( $opt{cust_main} ) {
   $new_query = 'custnum='. $opt{cust_main}->custnum;
   @quotations = $opt{cust_main}->quotation;
 } elsif ( $opt{prospect_main} ) {
-  $new_query = 'quotationnum='. $opt{prospect_main}->quotationnum;
+  $new_query = 'prospectnum='. $opt{prospect_main}->prospectnum;
   @quotations = $opt{prospect_main}->quotation;
 } else {
   die 'guru meditation #&&: neither cust_main nor prospect_main specified';

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

Summary of changes:
 FS/FS/quotation.pm                  |    4 ++++
 httemplate/elements/quotations.html |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)