From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 6 Jan 2014 12:46:11 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~51^2~7
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/4bf8886f5004121c1fb31cbb93907dee44005c57?hp=56a48a8428b904f32b1e637951059710faeba6bd

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

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index d67aac59d..cf3ac5768 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -378,6 +378,7 @@ sub form_header {
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
     shiptoemail shiptodepartment_1 shiptodepartment_2  shiptocp_gender message email subject cc bcc taxaccounts cursor_fokus
     convert_from_do_ids convert_from_oe_ids
+    show_details
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 6001c87bc..f08a5249a 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -441,7 +441,8 @@ sub form_header {
         max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode
         shiptocity shiptocountry shiptocontact shiptophone shiptofax
         shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
-        message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus),
+        message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus
+        show_details),
         @custom_hiddens,
         map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ];  # deleted: discount
 
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index baf7b3fee..5af79bedc 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -99,6 +99,7 @@
   <input type="hidden" name="shiptostreet" value="[% HTML.escape(shiptostreet) %]">
   <input type="hidden" name="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]">
   <input type="hidden" name="shiptocp_gender" value="[% HTML.escape(shiptocp_gender) %]">
+  <input type="hidden" name="show_details" value="[% HTML.escape(show_details) %]">
   <input type="hidden" name="subject" value="[% HTML.escape(subject) %]">
   <input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]">
   <input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]">
diff --git a/templates/webpages/oe/sales_order.html b/templates/webpages/oe/sales_order.html
index c16dc1118..1c301080f 100644
--- a/templates/webpages/oe/sales_order.html
+++ b/templates/webpages/oe/sales_order.html
@@ -3,9 +3,14 @@
 [%- PROCESS 'amcvar/render_inputs_block.html' %]
 <tr>
  <td>
-  <input type="button" id="cb_show_details" name="show_details" value='[% 'Show details' | $T8 %]'>
+  <input type="button" id="cb_show_details" name="show_details_button" value='[% 'Show details' | $T8 %]'>
   <script type="text/javascript">
-   $('#cb_show_details').click(function(){ $('[id^="row2"]').toggle() });
+   $('#cb_show_details').click(function(){ $('[id^="row2"]').toggle();
+                                           if ( $('[id^="row2"]').is(":visible") ) {
+                                            $("[name='show_details']").val(1);
+                                           } else {
+                                            $("[name='show_details']").val(0);
+                                           }});
   </script>
   <table id='display_row' width="100%">
    <tr class="listheading">