From 7a98647b06d8fe8eb71a40d20e25d84d9faa3ed9 Mon Sep 17 00:00:00 2001
From: "G. Richardson" <information@kivitendo-premium.de>
Date: Thu, 25 Jun 2015 17:04:56 +0200
Subject: [PATCH] =?utf8?q?history=20f=C3=BCr=20Zahlungen=20ar/ap/is/ir=20u?=
 =?utf8?q?nd=20Zahlungsein-=20und=20ausgang?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Die Spalte "addition" in history_erp hat jetzt einheitlich den Eintrag
"PAYMENT POSTED", übersetzt als "Zahlung gebucht".

Bei Verkaufsrechnungen, Kreditor- und Debitorenbuchung wird jetzt zum
ersten Mal die Zahlung in history protokolliert, zumindest via "Zahlung
buchen".
---
 SL/CP.pm          |  5 +++--
 bin/mozilla/ap.pl | 10 ++++++++--
 bin/mozilla/ar.pl | 11 +++++++++--
 bin/mozilla/ir.pl |  6 +++---
 bin/mozilla/is.pl | 13 +++++++++----
 locale/de/all     |  2 +-
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/SL/CP.pm b/SL/CP.pm
index e2b9f48cb..a2a247613 100644
--- a/SL/CP.pm
+++ b/SL/CP.pm
@@ -348,8 +348,9 @@ sub process_payment {
       # saving the history
       $form->{id} = $form->{"id_$i"};
       if(!exists $form->{addition}) {
-        $form->{snumbers} = qq|invnumber_| . $form->{"invnumber_$i"};
-        $form->{addition} = "POSTED";
+        $form->{snumbers}  = qq|invnumber_| . $form->{"invnumber_$i"};
+        $form->{what_done} = "invoice";
+        $form->{addition}  = "PAYMENT POSTED";
         $form->save_history;
       }
       # /saving the history
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index dc48e3d70..84a2cbdfa 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -582,9 +582,15 @@ sub post_payment {
 
   ($form->{AP})      = split /--/, $form->{AP};
   ($form->{AP_paid}) = split /--/, $form->{AP_paid};
-  $form->redirect($locale->text('Payment posted!'))
-      if (AP->post_payment(\%myconfig, \%$form));
+  if (AP->post_payment(\%myconfig, \%$form)) {
+    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
+    $form->{what_done} = 'invoice';
+    $form->{addition}  = "PAYMENT POSTED";
+    $form->save_history;
+    $form->redirect($locale->text('Payment posted!'))
+  } else {
     $form->error($locale->text('Cannot post payment!'));
+  };
 
 
   $main::lxdebug->leave_sub();
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 6a024a3cf..25ef7cee2 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -620,8 +620,15 @@ sub post_payment {
 
   ($form->{AR})      = split /--/, $form->{AR};
   ($form->{AR_paid}) = split /--/, $form->{AR_paid};
-  $form->redirect($locale->text('Payment posted!')) if (AR->post_payment(\%myconfig, \%$form));
-  $form->error($locale->text('Cannot post payment!'));
+  if (AR->post_payment(\%myconfig, \%$form)) {
+    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
+    $form->{what_done} = 'invoice';
+    $form->{addition}  = "PAYMENT POSTED";
+    $form->save_history;
+    $form->redirect($locale->text('Payment posted!'))
+  } else {
+    $form->error($locale->text('Cannot post payment!'));
+  };
 
   $main::lxdebug->leave_sub();
 }
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 1b5840f30..3571bbfbb 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -668,9 +668,9 @@ sub post_payment {
   if (IR->post_payment(\%myconfig, \%$form)){
     if (!exists $form->{addition} && $form->{id} ne "") {
       # saving the history
-      $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-      $form->{addition} = "PAYMENT POSTED";
-      $form->{what_done} = $form->{currency} . qq| | . $form->{paid} . qq| | . $locale->text("POSTED");
+      $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
+      $form->{addition}  = "PAYMENT POSTED";
+      $form->{what_done} = "invoice";
       $form->save_history;
       # /saving the history
     }
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index c330ec2f5..c2fc22b34 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -689,10 +689,15 @@ sub post_payment {
   ($form->{AR})      = split /--/, $form->{AR};
   ($form->{AR_paid}) = split /--/, $form->{AR_paid};
   relink_accounts();
-  $form->redirect($locale->text('Payment posted!'))
-      if (IS->post_payment(\%myconfig, \%$form));
-    $form->error($locale->text('Cannot post payment!'));
-
+  if ( IS->post_payment(\%myconfig, \%$form) ) {
+    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
+    $form->{what_done} = $form->{type};
+    $form->{addition}  = "PAYMENT POSTED";
+    $form->save_history;
+    $form->redirect($locale->text('Payment posted!'))
+  } else {
+   $form->error($locale->text('Cannot post payment!'));
+  };
 
   $main::lxdebug->leave_sub();
 }
diff --git a/locale/de/all b/locale/de/all
index 3abb53368..5c34e7676 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1834,7 +1834,7 @@ $self->{texts} = {
   'Own bank account number or IBAN' => 'Eigene Kontonummer oder IBAN',
   'Own bank code'               => 'Eigene Bankleitzahl',
   'Owner of account'            => 'Kontoinhaber',
-  'PAYMENT POSTED'              => 'Rechung gebucht',
+  'PAYMENT POSTED'              => 'Zahlung gebucht',
   'PDF'                         => 'PDF',
   'PDF (OpenDocument/OASIS)'    => 'PDF (OpenDocument/OASIS)',
   'PDF export -- options'       => 'PDF-Export -- Optionen',
-- 
2.20.1