X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/44d893c2d2589ac8d09d255f9be0e38d74c48407..1f0d7da266e23a443c47aaa2dbab844e6be50ee4:/templates/webpages/admin/create_dataset.html?ds=sidebyside

diff --git a/templates/webpages/admin/create_dataset.html b/templates/webpages/admin/create_dataset.html
index 220ed845b..7a879d8aa 100644
--- a/templates/webpages/admin/create_dataset.html
+++ b/templates/webpages/admin/create_dataset.html
@@ -4,8 +4,6 @@
 
 <h1>[% HTML.escape(title) %]</h1>
 
-<p><a href="controller.pl?action=Admin/database_administration">[% LxERP.t8('Back') %]</a></p>
-
 <form method="post" action="controller.pl">
  <p>
   [% LxERP.t8('You can either create a new database or chose an existing database.') %]
@@ -20,32 +18,42 @@
 
   <tr>
    <th align="right" nowrap>[% LxERP.t8('Create Dataset') %]</th>
-   <td>[% L.input_tag('db', FORM.db) %]</td>
+   <td>[% L.input_tag('db', FORM.db, class="initial_focus") %]</td>
+  </tr>
+
+  <tr>
+   <td colspan="1"> </td>
+   <td><hr size="1" noshade></td>
   </tr>
 
   <tr>
    <th align="right" nowrap>[% LxERP.t8('Default currency') %]</th>
-   <td>[% L.input_tag('defaultcurrency', FORM.defaultcurrency || 'EUR') %]</td>
+   <td>[% L.input_tag('defaultcurrency', FORM.defaultcurrency) %]</td>
+  </tr>
+
+  <tr>
+   <th align="right" nowrap>[% LxERP.t8('Precision') %]</th>
+   <td>[% L.input_tag('precision_as_number', LxERP.format_amount(FORM.precision, 2)) %] [% LxERP.t8('Precision Note') %]</td>
   </tr>
 
   <tr>
    <th valign="top" align="right" nowrap>[% LxERP.t8('Create Chart of Accounts') %]</th>
-   <td>[% L.select_tag('chart', SELF.all_charts, onchange='comment_selected_chart(this.value)', default=(FORM.chart || 'Germany-DATEV-SKR03EU')) %]</td>
+   <td>[% L.select_tag('chart', SELF.all_charts, default=(FORM.chart), onchange='comment_selected_chart(this.value)') %]</td>
   </tr>
 
   <tr>
-   <th valign="top" align="right" nowrap>[% LxERP.t8('Accounting method') %] *</th>
-   <td>[% L.select_tag('accounting_method', SELF.all_accounting_methods, title_key='name', default=(FORM.accounting_method || 'cash')) %]</td>
+   <th valign="top" align="right" nowrap>[% LxERP.t8('Accounting method') %]</th>
+   <td>[% L.select_tag('accounting_method', SELF.all_accounting_methods, title_key='name', default=(FORM.accounting_method)) %]</td>
   </tr>
 
   <tr>
-   <th valign="top" align="right" nowrap>[% LxERP.t8('Inventory system') %] *</th>
-   <td>[% L.select_tag('inventory_system', SELF.all_inventory_systems, title_key='name', default=(FORM.inventory_system || 'periodic')) %]</td>
+   <th valign="top" align="right" nowrap>[% LxERP.t8('Inventory system') %]</th>
+   <td>[% L.select_tag('inventory_system', SELF.all_inventory_systems, title_key='name', default=(FORM.inventory_system)) %]</td>
   </tr>
 
   <tr>
-   <th valign="top" align="right" nowrap>[% LxERP.t8('Profit determination') %] *</th>
-   <td>[% L.select_tag('profit_determination', SELF.all_profit_determinations, title_key='name', default=(FORM.profit_determination || 'income')) %]</td>
+   <th valign="top" align="right" nowrap>[% LxERP.t8('Profit determination') %]</th>
+   <td>[% L.select_tag('profit_determination', SELF.all_profit_determinations, title_key='name', default=(FORM.profit_determination)) %]</td>
   </tr>
  </table>
 
@@ -55,6 +63,12 @@
  [% L.hidden_tag("dbpasswd", FORM.dbpasswd) %]
  [% L.hidden_tag("dbdefault", FORM.dbdefault) %]
  [% L.hidden_tag("action", "Admin/do_create_dataset") %]
+ [% L.hidden_tag("feature_balance", FORM.feature_balance) %]
+ [% L.hidden_tag("feature_datev", FORM.feature_datev) %]
+ [% L.hidden_tag("feature_erfolgsrechnung", FORM.feature_erfolgsrechnung) %]
+ [% L.hidden_tag("feature_eurechnung", FORM.feature_eurechnung) %]
+ [% L.hidden_tag("feature_ustva", FORM.feature_ustva) %]
+
 
  <hr size="3" noshade>
 
@@ -69,30 +83,35 @@
 
 function comment_selected_chart(s) {
   if (s == 'Austria') {
-   alert("SKR07 Austria ist noch Stand 2002." +
+    alert("SKR07 Austria ist noch Stand 2002." +
          "\n" +
          "Die Buchungsgruppen sind nicht korrekt vorkonfiguriert" +
          "\n" +
          "fuer Kunden im Ausland." +
          "\n" +
          "Hinweis vom 20.09.2011");
-
-  } else if (s == 'Swiss-German') {
-   alert("Hinweis: Das ist weder ein Schweizer Kontorahmen nach Kaefer noch ein " +
-         "Schweizer KMU-Kontenrahmen, sondern ein angelehnter KMU-Kontenrahmen fuer " +
-         "ein EDV-Dienstleistungsunternehmen mit Stand 2006 (Bspw. 32001 Hardware, " +
-         "statt 3200 Warenertrag)." +
-         "\n" +
-         "Ferner sind keine Buchungsgruppe vorkonfiguriert, somit wird " +
-         "standardmaessig keine Rechnung mit Steuer ausgewiesen." +
-         "\n" +
-         "Zum schnellen Testen und Zusammenhaenge verstehen waehlen Sie lieber einen " +
-         "deutschen Kontenrahmen aus (SKR03 oder SKR04) und passen die Steuer an." +
-         "\n" +
-         "Hinweis vom 21.09.2011");
   }
+  return true;
+}
 
+function select_country_defaults(country) {
+  if (/^CH/.test(country)) {
+    document.getElementById('defaultcurrency').value='CHF';
+    document.getElementById('precision').value='0.05';
+    document.getElementById('chart').value='Switzerland-deutsch-MWST-2014';
+    document.getElementById('accounting_method').value='accrual';
+    document.getElementById('inventory_system').value='periodic';
+    document.getElementById('profit_determination').value='balance';
+  } else {
+    document.getElementById('defaultcurrency').value='EUR';
+    document.getElementById('precision').value='0.01';
+    document.getElementById('chart').value='Germany-DATEV-SKR03EU';
+    document.getElementById('accounting_method').value='cash';
+    document.getElementById('inventory_system').value='periodic';
+    document.getElementById('profit_determination').value='income';
+  }
   return true;
 }
+
    -->
 </script>