From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 20 Jun 2008 10:16:13 +0000 (+0000)
Subject: ------------------------------------------------------------------------
X-Git-Tag: release-2.6.0beta1~123
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1bfdd83b1ba9b0dca96105be0a32ff3ea9794584;p=kivitendo-erp.git

------------------------------------------------------------------------
r7136 | mbunkus | 2008-06-20 11:16:19 +0200 (Fri, 20 Jun 2008) | 1 line

Lieferscheine: Ein Button eingefügt, mit dem man Lieferscheine als geschlossen markieren kann, ohne sie in Rechnungen umwandeln zu müssen.
------------------------------------------------------------------------
---

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 370411d7d..228b8e68d 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -1216,6 +1216,19 @@ sub transfer_out {
   $lxdebug->leave_sub();
 }
 
+sub mark_closed {
+  $lxdebug->enter_sub();
+
+  DO->close_orders('ids' => [ $form->{id} ]);
+
+  $form->{closed} = 1;
+
+  update();
+
+  $lxdebug->leave_sub();
+}
+
+
 sub yes {
   call_sub($form->{yes_nextsub});
 }
diff --git a/locale/de/all b/locale/de/all
index feb4f00fd..a721624e6 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -857,6 +857,7 @@ aktualisieren wollen?',
   'March'                       => 'März',
   'Margins'                     => 'Seitenr&auml;nder',
   'Mark as paid?'               => 'Als bezahlt markieren?',
+  'Mark closed'                 => 'Schließen',
   'Marked as paid'              => 'Als bezahlt markiert',
   'Marked entries printed!'     => 'Markierte Einträge wurden gedruckt!',
   'Master Data'                 => 'Stammdaten',
diff --git a/locale/de/do b/locale/de/do
index 953a00b52..3e05f0add 100644
--- a/locale/de/do
+++ b/locale/de/do
@@ -337,6 +337,7 @@ $self->{subs} = {
   'invoicetotal'                => 'invoicetotal',
   'item_selected'               => 'item_selected',
   'mark_as_paid_common'         => 'mark_as_paid_common',
+  'mark_closed'                 => 'mark_closed',
   'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
   'new_license'                 => 'new_license',
@@ -396,6 +397,7 @@ $self->{subs} = {
   'löschen'                     => 'delete',
   'email'                       => 'e_mail',
   'rechnung'                    => 'invoice',
+  'schließen'                   => 'mark_closed',
   'neue_ware'                   => 'new_part',
   'nein'                        => 'no',
   'drucken'                     => 'print',
diff --git a/locale/de/login b/locale/de/login
index 303863bf1..4b4fcd2c8 100644
--- a/locale/de/login
+++ b/locale/de/login
@@ -441,6 +441,7 @@ $self->{subs} = {
   'login_screen'                => 'login_screen',
   'logout'                      => 'logout',
   'mark_as_paid_common'         => 'mark_as_paid_common',
+  'mark_closed'                 => 'mark_closed',
   'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
   'new_license'                 => 'new_license',
@@ -517,6 +518,7 @@ $self->{subs} = {
   'abschlie&szlig;en'           => 'finish',
   'rechnung'                    => 'invoice',
   'anmeldung'                   => 'login',
+  'schließen'                   => 'mark_closed',
   'neue_ware'                   => 'new_part',
   'nein'                        => 'no',
   'auftrag'                     => 'order',
diff --git a/locale/de/oe b/locale/de/oe
index 3de86dafb..da8a2988a 100644
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -399,6 +399,7 @@ $self->{subs} = {
   'invoicetotal'                => 'invoicetotal',
   'item_selected'               => 'item_selected',
   'mark_as_paid_common'         => 'mark_as_paid_common',
+  'mark_closed'                 => 'mark_closed',
   'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
   'new_license'                 => 'new_license',
@@ -465,6 +466,7 @@ $self->{subs} = {
   'lieferschein'                => 'delivery_order',
   'email'                       => 'e_mail',
   'rechnung'                    => 'invoice',
+  'schließen'                   => 'mark_closed',
   'neue_ware'                   => 'new_part',
   'nein'                        => 'no',
   'auftrag'                     => 'order',
diff --git a/locale/de/todo b/locale/de/todo
index 8d285dca2..04e38cef3 100644
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -430,6 +430,7 @@ $self->{subs} = {
   'invoicetotal'                => 'invoicetotal',
   'item_selected'               => 'item_selected',
   'mark_as_paid_common'         => 'mark_as_paid_common',
+  'mark_closed'                 => 'mark_closed',
   'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
   'new_license'                 => 'new_license',
@@ -504,6 +505,7 @@ $self->{subs} = {
   'email'                       => 'e_mail',
   'abschlie&szlig;en'           => 'finish',
   'rechnung'                    => 'invoice',
+  'schließen'                   => 'mark_closed',
   'neue_ware'                   => 'new_part',
   'nein'                        => 'no',
   'auftrag'                     => 'order',
diff --git a/templates/webpages/do/form_footer_de.html b/templates/webpages/do/form_footer_de.html
index 850c8f6bd..79dce977d 100644
--- a/templates/webpages/do/form_footer_de.html
+++ b/templates/webpages/do/form_footer_de.html
@@ -72,6 +72,9 @@
    [%- END %]
    [%- END %]
    [%- IF id %]
+   [%- UNLESS closed %]
+   <input class="submit" type="submit" name="action" value="Schließen">
+   [%- END %]
    <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
    [%- END %]
   </p>
diff --git a/templates/webpages/do/form_footer_master.html b/templates/webpages/do/form_footer_master.html
index cde704c5a..af19a8279 100644
--- a/templates/webpages/do/form_footer_master.html
+++ b/templates/webpages/do/form_footer_master.html
@@ -72,6 +72,9 @@
    [%- END %]
    [%- END %]
    [%- IF id %]
+   [%- UNLESS closed %]
+   <input class="submit" type="submit" name="action" value="<translate>Mark closed</translate>">
+   [%- END %]
    <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
    [%- END %]
   </p>