From: Philip Reetz <p.reetz@linet-services.de>
Date: Tue, 12 Dec 2006 09:06:48 +0000 (+0000)
Subject: Fixed Bug 436: Radierparagraph: Loeschen am gleichen Tag erlauben
X-Git-Tag: release-2.4.0^2~78
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9e117fbd2bb27c58831580608cd63f85c82487ac;p=kivitendo-erp.git

Fixed Bug 436: Radierparagraph: Loeschen am gleichen Tag erlauben
---

diff --git a/SL/IR.pm b/SL/IR.pm
index c84778110..77df80603 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -841,7 +841,7 @@ sub retrieve_invoice {
 
     # retrieve invoice
     $query = qq|SELECT a.cp_id, a.invnumber, a.transdate AS invdate, a.duedate,
-                a.ordnumber, a.quonumber, a.paid, a.taxincluded, a.notes, a.taxzone_id, a.storno,
+                a.ordnumber, a.quonumber, a.paid, a.taxincluded, a.notes, a.taxzone_id, a.storno, a.gldate,
 		a.intnotes, a.curr AS currency
 		FROM ap a
 		WHERE a.id = $form->{id}|;
diff --git a/SL/IS.pm b/SL/IS.pm
index ba1062b05..7df695efb 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1472,7 +1472,7 @@ sub retrieve_invoice {
 
     # retrieve invoice
     $query = qq|SELECT a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
-                a.transdate AS invdate, a.deliverydate, a.paid, a.storno,
+                a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
                 a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes, a.taxzone_id,
 		a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,
 		a.employee_id, e.name AS employee, a.payment_id, a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 11cab57b2..03f377d24 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -224,6 +224,9 @@ sub form_header {
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 
+  $form->{radier} =
+    ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+
   #quote selectvendor Bug 133
   $form->{"selectvendor"} = $form->quote($form->{"selectvendor"});
 
@@ -743,7 +746,12 @@ sub form_footer {
     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Storno') . qq|">
 | unless ($form->{storno});
-
+    if ($form->{radier}) {
+    print qq|
+    <input class=submit type=submit name=action value="|
+      . $locale->text('Delete') . qq|">
+|;
+  }
   } else {
     if ($invdate > $closedto) {
       print qq|<input class=submit type=submit name=action value="|
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 110beee65..857e60409 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -311,6 +311,9 @@ sub form_header {
     }
   }
 
+  $form->{radier} =
+    ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+
   $payment = qq|<option value=""></option>|;
   foreach $item (@{ $form->{payment_terms} }) {
     if ($form->{payment_id} eq $item->{id}) {
@@ -443,13 +446,11 @@ sub form_header {
   $exchangerate .= qq|
 <input type=hidden name=forex value=$form->{forex}>
 |;
-  print(STDERR "$form->{customer} Kunde\n");
 
   $customer =
     ($form->{selectcustomer})
     ? qq|<select name=customer>$form->{selectcustomer}</select>\n<input type=hidden name="selectcustomer" value="$form->{selectcustomer}">|
     : qq|<input name=customer value="$form->{customer}" size=35>|;
-  print(STDERR "$form->{customer} Kunde\n");
 
   #sk
   $contact =
@@ -1096,6 +1097,12 @@ if ($form->{type} eq "credit_note") {
       . $locale->text('Credit Note') . qq|">
 |;
   }
+    if ($form->{radier}) {
+    print qq|
+    <input class=submit type=submit name=action value="|
+      . $locale->text('Delete') . qq|">
+|;
+  }
 
 
     if ($invdate > $closedto) {
diff --git a/locale/de/ir b/locale/de/ir
index e13808ae5..732a94890 100644
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -45,6 +45,7 @@ $self->{texts} = {
   'Date'                        => 'Datum',
   'Dec'                         => 'Dez',
   'December'                    => 'Dezember',
+  'Delete'                      => 'Löschen',
   'Delivery Date'               => 'Lieferdatum',
   'Department'                  => 'Abteilung',
   'Description'                 => 'Beschreibung',
@@ -224,6 +225,7 @@ $self->{subs} = {
   'vendor_invoice'              => 'vendor_invoice',
   'yes'                         => 'yes',
   'weiter'                      => 'continue',
+  'löschen'                     => 'delete',
   'buchen'                      => 'post',
   'zahlung_buchen'              => 'post_payment',
   'storno'                      => 'storno',
diff --git a/locale/de/is b/locale/de/is
index 00d832ed3..9835f472b 100644
--- a/locale/de/is
+++ b/locale/de/is
@@ -56,6 +56,7 @@ $self->{texts} = {
   'Date'                        => 'Datum',
   'Dec'                         => 'Dez',
   'December'                    => 'Dezember',
+  'Delete'                      => 'Löschen',
   'Delivery Date'               => 'Lieferdatum',
   'Department'                  => 'Abteilung',
   'Description'                 => 'Beschreibung',
@@ -253,6 +254,7 @@ $self->{subs} = {
   'yes'                         => 'yes',
   'weiter'                      => 'continue',
   'gutschrift'                  => 'credit_note',
+  'löschen'                     => 'delete',
   'email'                       => 'e_mail',
   'auftrag'                     => 'order',
   'buchen'                      => 'post',