From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 15 Oct 2017 00:04:23 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=5dabafc5e63ae7559ca6d2867e653660b981e639;hp=fba604e65e810922ce0269cc887b5c57ce135352

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

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index d347c0653..6d7520bd9 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -695,6 +695,7 @@ sub tables_hashref {
         'statementnum', 'int', 'NULL', '', '', '', #invoice aggregate statements
         'agent_invid',  'int', 'NULL', '', '', '', #(varchar?) importing legacy
         'promised_date', @date_type,       '', '',
+        'taxengine_request', 'text', 'NULL', '', '', '',
         
         'pending',     'char', 'NULL',  1, '', '',
       ],
@@ -732,6 +733,7 @@ sub tables_hashref {
         'statementnum', 'int', 'NULL', '', '', '', #invoice aggregate statements
         'agent_invid',  'int', 'NULL', '', '', '', #(varchar?) importing legacy
         'promised_date', @date_type,       '', '',
+        'taxengine_request', 'text', 'NULL', '', '', '',
 
         #void fields
         'void_date', @date_type, '', '', 
diff --git a/FS/FS/TaxEngine/compliance_solutions.pm b/FS/FS/TaxEngine/compliance_solutions.pm
index 1f0c16605..33b6a3ef1 100644
--- a/FS/FS/TaxEngine/compliance_solutions.pm
+++ b/FS/FS/TaxEngine/compliance_solutions.pm
@@ -226,6 +226,7 @@ sub make_taxlines {
     }
   );
   warn $request_json if $DEBUG > 1;
+  $cust_bill->taxengine_request($request_json);
 
   my $soap = SOAP::Lite->service("http://tcms1.csilongwood.com/cgi-bin/taxcalc.wsdl");
 
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index e47398283..570f503d6 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -36,7 +36,9 @@ All rights reserved<BR>
     option) any later version.
 
 <P>
-    At your option, you may also redistribute and/or modify the
+    At your option, you may also redistribute and/or modify the files in 
+    fs_selfservice/drupal/ fs_selfservice/wordpress/ fs_selfservice/perl/ and
+    fs_selfservice/java/ directories and the
     fs_selfservice/php/freeside.class.php file (but not the rest of the
     software) under the terms of the GNU Lesser General Public License as
     published by the Free Software Foundation, either version 3 of the License,
diff --git a/httemplate/view/cust_bill-taxengine_request.html b/httemplate/view/cust_bill-taxengine_request.html
new file mode 100644
index 000000000..991e65f46
--- /dev/null
+++ b/httemplate/view/cust_bill-taxengine_request.html
@@ -0,0 +1,14 @@
+<& /elements/header-popup.html &>
+<% $cust_bill->taxengine_request |h %>
+<& /elements/footer-popup.html &>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+  unless $curuser->access_right('View invoices');
+
+my $invnum = $cgi->param('invnum');
+my $cust_bill = qsearchs('cust_bill', { invnum=>$invnum });
+
+</%init>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index e35d7f1cf..762eec033 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -171,6 +171,18 @@ function change_invoice_mode(obj) {
 &>
 %   $br++;
 % }
+% if ( $cust_bill->taxengine_request ) { # inefficient
+<% $br ? '|' : '' %>
+<& /elements/popup_link.html,
+  'action'      => 'cust_bill-taxengine_request.html?invnum=' . $cust_bill->invnum,
+  'label'       => mt('View raw tax engine request'),
+  'actionlabel' => mt('Tax engine request'),
+  'width'       => 1050,
+  'height'      => 600,
+  'title'       => emt('Tax engine request'),
+&>
+%   $br++;
+% }
 
 <BR><BR>