X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/3aa5cee2f12c1dff757539b60196bf5e1be0a5d6..eab277a411:/templates/webpages/gl/form_header.html

diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html
index e349761cf..644ff964e 100644
--- a/templates/webpages/gl/form_header.html
+++ b/templates/webpages/gl/form_header.html
@@ -4,28 +4,10 @@
 [%- USE L %]
 <h1>[% title | html %]</h1>
 
+[%- INCLUDE 'common/flash.html' %]
+
 <script type="text/javascript">
   <!--
-function updateTaxes(row)
-{
-  var accno  = document.getElementById('accno_' + row);
-  var taxkey = accno.options[accno.selectedIndex].value;
-  var reg = /^(.*?)--(\d*)$/;
-  var found = reg.exec(taxkey);
-  var account = found[1];
-  var default_tax_id = found[2];
-
-  $.ajax({
-    url: 'gl.pl?action=get_tax_dropdown',
-    data: { accno: account,
-            selected_tax_id: default_tax_id},
-    dataType: 'html',
-    success: function (new_html) {
-                                $("#taxchart_" + row).html(new_html);
-                              },
-  });
-};
-
   function copy_debit_to_credit() {
     var txt = document.getElementsByName('debit_1')[0].value;
     document.getElementsByName('credit_2')[0].value = txt;
@@ -34,8 +16,9 @@ function updateTaxes(row)
   </script>
   <script type="text/javascript" src="js/show_form_details.js"></script>
 <script type="text/javascript" src="js/follow_up.js"></script>
+<script type="text/javascript" src="js/kivi.Draft.js"></script>
 
-<form method=post name="gl" action=gl.pl>
+<form method="post" name="gl" action="gl.pl" id="form">
 
 [% FOREACH name IN [ 'id', 'closedto', 'locked', 'storno', 'storno_id', 'previous_id', 'previous_gldate' ] %]
 [% L.hidden_tag(name, $name) %]
@@ -48,6 +31,21 @@ function updateTaxes(row)
 <input type="hidden" name="follow_up_trans_info_1" value="[% id | html %]">
 <input type="hidden" name="follow_up_rowcount" value="1">
 
+<div id="ir_tabs" class="tabwidget">
+ <ul>
+  <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[%- IF INSTANCE_CONF.get_webdav %]
+  <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+[%- END %]
+[%- IF id %]
+[%- IF INSTANCE_CONF.get_doc_storage %]
+  <li><a href="controller.pl?action=File/list&file_type=document&object_type=gl_transaction&object_id=[% HTML.url(id) %]">[% 'Documents' | $T8 %]</a></li>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=gl_transaction&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
+[%- END %]
+[%- END %]
+ </ul>
+ <div id="ui-tabs-basic-data">
+
 <table width=100%>
 [%- IF saved_message %]
   <tr>
@@ -68,34 +66,41 @@ function updateTaxes(row)
           <td align=left>
             <table>
               <tr>
-                <th align=right width=50% nowrap>[% 'Date' | $T8 %]</th>
-                <td>[% L.date_tag('transdate', transdate, readonly=readonly) %]</td>
+                <th align=right width=50% nowrap>[% 'Transdate' | $T8 %]</th>
+                <td align=left>[% L.date_tag('transdate', transdate, readonly=readonly) %]</td>
               </tr>
             </table>
           </td>
         </tr>
 [%- IF id %]
         <tr>
-          <th align=right>[% 'Belegnummer' | $T8 %]</th>
+          <th align=right>[% 'ID' | $T8 %]</th>
           <td>[% L.input_tag('id', id,  size=20, readonly=readonly) %]</td>
           <td align=left>
           <table>
               <tr>
-                <th align=right width=50%>[% 'Buchungsdatum' | $T8 %]</th>
-                <td align=left>[% L.date_tag('gldate', gldate, readonly=1) %]</td>
+                <th align=right width=50%>[% 'Gldate' | $T8 %]</th>
+                [%-# hidden img to keep alignment -%]
+                <td align=left>[% L.date_tag('gldate', gldate, readonly=1) %]<img class="ui-datepicker-trigger" src="image/calendar.png" alt="..." title="..." style='visibility:hidden'></td>
               </tr>
             </table>
           </td>
         </tr>
 [%- END %]
 
-[%- IF selectdepartment %]
+        [% SET departments_style = "";
+           SET departments_style = "style='visibility:hidden'" IF ALL_DEPARTMENTS.size == 0 %]
         <tr>
-          <th align=right nowrap>[% 'Department' | $T8 %]</th>
-          <td colspan=3><select name=department>[% selectdepartment %]</select></td>
-          <input type=hidden name=selectdepartment value="[% selectdepartment | html %]">
+          <th [%- departments_style -%]align=right nowrap>[% 'Department' | $T8 %]</th>
+          <td [%- departments_style -%]>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1) %]</td>
+          <td align=left>
+            <table>
+              <tr>
+                <th align=right width=50% nowrap>[% 'Delivery Date' | $T8 %]</th>
+                <td align=left>[% L.date_tag('deliverydate', deliverydate) %]</td>
+              </tr>
+            </table>
         </tr>
-[%- END %]
 
         <tr>
           <th align=right width=1%>[% 'Description' | $T8 %]</th>
@@ -153,5 +158,3 @@ function updateTaxes(row)
 [%- END %]
 
         </tr>
-
-[%- PROCESS 'gl/form_header_chart_balances_js.html' %]