[freeside-commits] branch FREESIDE_4_BRANCH updated. 1f51760c05378128ad74bfd4a08c400a03457206

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  1f51760c05378128ad74bfd4a08c400a03457206 (commit)
      from  f3667e610bcf40c53a8f69f41feadcc456a21973 (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 1f51760c05378128ad74bfd4a08c400a03457206
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Mon May 23 23:33:32 2016 -0500

    RT#42089: FREESIDE ERROR WORKING WITH A QUOTATION

diff --git a/httemplate/edit/process/quotation_pkg_detail.html b/httemplate/edit/process/quotation_pkg_detail.html
index 9e4ac32..b836bae 100644
--- a/httemplate/edit/process/quotation_pkg_detail.html
+++ b/httemplate/edit/process/quotation_pkg_detail.html
@@ -26,8 +26,16 @@ my $quotation_pkg = qsearchs({
                  'LEFT JOIN cust_main USING ( custnum )',
   'hashref'   => { 'quotationpkgnum' => $pkgnum },
   'extra_sql' => ' AND '. $curuser->agentnums_sql,
+})
+|| qsearchs({
+  'table'     => 'quotation_pkg',
+  'addl_from' => 'LEFT JOIN quotation USING ( quotationnum )'.
+                 'LEFT JOIN prospect_main USING ( prospectnum )',
+  'hashref'   => { 'quotationpkgnum' => $pkgnum },
+  'extra_sql' => ' AND '. $curuser->agentnums_sql,
 });
 
+
 my @orig_details = $quotation_pkg->details();
 
 my $action = 'Quotation details'.
diff --git a/httemplate/edit/quotation_pkg_detail.html b/httemplate/edit/quotation_pkg_detail.html
index 036bffd..9aa50ec 100644
--- a/httemplate/edit/quotation_pkg_detail.html
+++ b/httemplate/edit/quotation_pkg_detail.html
@@ -61,6 +61,13 @@ my $quotation_pkg = qsearchs({
                  'LEFT JOIN cust_main USING ( custnum )',
   'hashref'   => { 'quotationpkgnum' => $pkgnum },
   'extra_sql' => ' AND '. $curuser->agentnums_sql,
+})
+|| qsearchs({
+  'table'     => 'quotation_pkg',
+  'addl_from' => 'LEFT JOIN quotation USING ( quotationnum )'.
+                 'LEFT JOIN prospect_main USING ( prospectnum )',
+  'hashref'   => { 'quotationpkgnum' => $pkgnum },
+  'extra_sql' => ' AND '. $curuser->agentnums_sql,
 });
 
 my $part_pkg = $quotation_pkg->part_pkg;

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

Summary of changes:
 httemplate/edit/process/quotation_pkg_detail.html |    8 ++++++++
 httemplate/edit/quotation_pkg_detail.html         |    7 +++++++
 2 files changed, 15 insertions(+)