Merge branch 'installationscheck-devel-module-2170'

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index c2fd6a2..4bef1d2 100644 (file)
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -153,7 +153,7 @@ sub list {
   $::lxdebug->enter_sub;
   $::auth->assert('report');
 
-  $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}";
+  $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}" . " - " . $::form->{description};
 
   $::form->header;
   print $::form->parse_html_template('ca/list', {

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 5a3f5e8..bad6e4f 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -328,7 +328,6 @@ sub form_header {
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
     shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
     convert_from_do_ids convert_from_oe_ids show_details gldate
-    rowcount callback draft_id draft_description vendor_discount
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 1650303..cf3ac57 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -378,7 +378,7 @@ sub form_header {
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
     shiptoemail shiptodepartment_1 shiptodepartment_2  shiptocp_gender message email subject cc bcc taxaccounts cursor_fokus
     convert_from_do_ids convert_from_oe_ids
-    show_details rowcount callback draft_id draft_description customer_discount gldate
+    show_details
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index f08a524..3ee71e6 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -434,12 +434,14 @@ sub form_header {
   $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
 
   $form->header;
-
+  if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) {
+      $form->{shipto_id} = $form->{CFDD_shipto_id};
+  }
   $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },
      qw(id action type vc formname media format proforma queued printed emailed
         title creditlimit creditremaining tradediscount business
         max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode
-        shiptocity shiptocountry shiptocontact shiptophone shiptofax
+        CFDD_shipto shipto_id CFDD_shipto_id shiptocity shiptocountry shiptocontact shiptophone shiptofax
         shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
         message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus
         show_details),
@@ -1670,6 +1672,7 @@ sub check_for_direct_delivery_yes {
   delete @{$form}{grep /^shipto/, keys %{ $form }};
   map { s/^CFDD_//; $form->{$_} = $form->{"CFDD_${_}"} } grep /^CFDD_/, keys %{ $form };
   $form->{shipto} = 1;
+  $form->{CFDD_shipto} = 1;
   purchase_order();
   $main::lxdebug->leave_sub();
 }
@@ -1683,6 +1686,7 @@ sub check_for_direct_delivery_no {
 
   $form->{direct_delivery_checked} = 1;
   delete @{$form}{grep /^shipto/, keys %{ $form }};
+  $form->{CFDD_shipto} = 0;
   purchase_order();
 
   $main::lxdebug->leave_sub();

diff --git a/templates/webpages/ca/list.html b/templates/webpages/ca/list.html
index e779a66..1bd5ff6 100644 (file)
--- a/templates/webpages/ca/list.html
+++ b/templates/webpages/ca/list.html
@@ -5,7 +5,7 @@
 <form method=post action="[% script %]">
 
 [% L.hidden_tag('accno', accno) %]
-[% L.hidden_tag('decription', description) %]
+[% L.hidden_tag('description', description) %]
 [% L.hidden_tag('sort', 'transdate') %]
 [% L.hidden_tag('accounttype', accounttype) %]
 

diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
index 2047d59..ad241a1 100644 (file)
--- a/templates/webpages/ir/form_footer.html
+++ b/templates/webpages/ir/form_footer.html
@@ -150,4 +150,10 @@
       [% END %]
   [% END %]
 
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback %]">
+<input type="hidden" name="draft_id" value="[% draft_id %]">
+<input type="hidden" name="draft_description" value="[% draft_description %]">
+<input type="hidden" name="vendor_discount" value="[% vendor_discount %]">
+
 </form>

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 3cffe05..4566452 100644 (file)
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -191,4 +191,10 @@
       [% END %]
   [% END %]
 
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback | html %]">
+<input type="hidden" name="draft_id" value="[% draft_id %]">
+<input type="hidden" name="draft_description" value="[% draft_description %]">
+<input type="hidden" name="customer_discount" value="[% customer_discount %]">
+<input type="hidden" name="gldate" value="[% gldate %]">
 </form>