From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Thu, 18 Apr 2013 11:55:35 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~494
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/6c0a55aca160c95f56fd52196d946a0708a2c7b5?hp=6bb3a6152b33e37736b3e5ed855a830182ae0193

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

Behebt einfach nur Conflicts.

Conflicts:
	SL/TransNumber.pm
---

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 515d08ec1..9c76b4521 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1335,7 +1335,7 @@ sub print_form {
       call_sub($display_form);
       # saving the history
       if(!exists $form->{addition}) {
-        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+        $form->{snumbers} = "${inv}number" . "_" . $form->{"${inv}number"};
         $form->{addition} = "PRINTED";
         $form->save_history;
       }
@@ -1576,7 +1576,7 @@ sub print_form {
 
 # saving the history
   if(!exists $form->{addition}) {
-    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+    $form->{snumbers} = "${inv}number" . "_" . $form->{"${inv}number"};
     if($form->{media} =~ /printer/) {
       $form->{addition} = "PRINTED";
     }
diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl
index 7d4245bfe..f1aeb47f2 100644
--- a/bin/mozilla/rc.pl
+++ b/bin/mozilla/rc.pl
@@ -128,6 +128,9 @@ sub update {
   $::lxdebug->enter_sub;
   $::auth->assert('cash');
 
+  # reset difference as it doesn't always arrive here empty
+  $::form->{difference} = 0;
+
   RC->payment_transactions(\%::myconfig, $::form);
 
   my $i;
diff --git a/templates/webpages/rc/step2.html b/templates/webpages/rc/step2.html
index baa3ac6b0..0270d5bbc 100644
--- a/templates/webpages/rc/step2.html
+++ b/templates/webpages/rc/step2.html
@@ -90,7 +90,7 @@
               <tr>
                 <th align=right nowrap>[% 'Difference' | $T8 %]</th>
                 <td width=10%></td>
-                <td align=right><input name=null size=11 value="[% LxERP.format_amount(difference, 2, 0) %]"></td>
+                <td align=right><input name=null size=11 value="[% LxERP.format_amount(difference, 2, 0) %]" readonly></td>
                 <input type=hidden name=difference value="[% LxERP.format_amount(difference, 2, 0) %]">
               </tr>
             </table>