Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp

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/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/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 847916d..da60add 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -577,7 +577,7 @@ sub generate_trial_balance {
   my $attachment_basename = $locale->text('trial_balance');
   my $report              = SL::ReportGenerator->new(\%myconfig, $form);
 
-  my @hidden_variables    = qw(fromdate todate year cash);
+  my @hidden_variables    = qw(fromdate todate year method);
 
   my $href                = build_std_url('action=generate_trial_balance', grep { $form->{$_} } @hidden_variables);
 

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) %]