Banktransaction: Kontoauszug verbuchen überarbeitet(4)

[mfinanz.git] / templates / webpages / gl / form_header.html

diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html
index 98bb8f067e1b2d4386d2bc1ad3945e153d4d30bb..c6d7242c589cc503068f0c3c79a31c9254878b80 100644 (file)
--- a/templates/webpages/gl/form_header.html
+++ b/templates/webpages/gl/form_header.html
@@ -2,28 +2,12 @@
 [%- USE LxERP %]
 [%- USE T8 %]
 [%- USE L %]
 [%- USE LxERP %]
 [%- USE T8 %]
 [%- USE L %]

-<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];
+<h1>[% title | html %]</h1>

 
 

-  $.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);
-                              },
-  });
-};
+[%- INCLUDE 'common/flash.html' %]

 
 

+<script type="text/javascript">
+  <!--

   function copy_debit_to_credit() {
     var txt = document.getElementsByName('debit_1')[0].value;
     document.getElementsByName('credit_2')[0].value = txt;
   function copy_debit_to_credit() {
     var txt = document.getElementsByName('debit_1')[0].value;
     document.getElementsByName('credit_2')[0].value = txt;


@@ -32,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>
   <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) %]
 
 [% FOREACH name IN [ 'id', 'closedto', 'locked', 'storno', 'storno_id', 'previous_id', 'previous_gldate' ] %]
 [% L.hidden_tag(name, $name) %]


@@ -46,10 +31,16 @@ function updateTaxes(row)
 <input type="hidden" name="follow_up_trans_info_1" value="[% id | html %]">
 <input type="hidden" name="follow_up_rowcount" value="1">
 
 <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 %]
+ </ul>
+ <div id="ui-tabs-basic-data">
+

 <table width=100%>
 <table width=100%>

-  <tr>
-    <th class=listtop>[% title | html %]</th>
-  </tr>

 [%- IF saved_message %]
   <tr>
     <td>[% saved_message | html %]</th>
 [%- IF saved_message %]
   <tr>
     <td>[% saved_message | html %]</th>


@@ -90,11 +81,10 @@ function updateTaxes(row)
         </tr>
 [%- END %]
 
         </tr>
 [%- END %]
 

-[%- IF selectdepartment %]
+[%- IF ALL_DEPARTMENTS %]

         <tr>
           <th align=right nowrap>[% 'Department' | $T8 %]</th>
         <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 %]">
+          <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1) %]</td>

         </tr>
 [%- END %]
 
         </tr>
 [%- END %]
 


@@ -154,5 +144,3 @@ function updateTaxes(row)
 [%- END %]
 
         </tr>
 [%- END %]
 
         </tr>

-
-[%- PROCESS 'gl/form_header_chart_balances_js.html' %]