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 515d08ec172380712dafd0a90764158d9d083981..9c76b45218d933812ca0bc6ee944cbffd953f295 100644 (file)
--- 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 7d4245bfe0f8e37b5fe426ffff6cf8bb92bb03e5..f1aeb47f29e06709896567a8b2e660b2928cf670 100644 (file)
--- 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 baa3ac6b01640937191ea392a986ab214974935e..0270d5bbc0bc4eab2f76d3d0e971f7132c9fb727 100644 (file)
--- 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>