From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 14 Jun 2013 10:54:29 +0000 (+0200)
Subject: Mandantenkonfiguration: Felder bearbeiten können, die zuvor nur in myconfig standen
X-Git-Tag: release-3.1.0beta1~331^2~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ce8306e07de8e24ffab52feeeb311468f81e1d70;p=kivitendo-erp.git

Mandantenkonfiguration: Felder bearbeiten können, die zuvor nur in myconfig standen
---

diff --git a/templates/webpages/client_config/_datev_check_configuration.html b/templates/webpages/client_config/_datev_check_configuration.html
index 13d12aaa2..e71487d75 100644
--- a/templates/webpages/client_config/_datev_check_configuration.html
+++ b/templates/webpages/client_config/_datev_check_configuration.html
@@ -1,7 +1,5 @@
 [%- USE LxERP -%][%- USE L -%]
 <div id="datev_check_configuration">
- <div class='listheading'>[% LxERP.t8('DATEV check configuration') %]</div>
-
  <table>
   <tr>
    <td colspan="3">[% LxERP.t8('It is possible to make a quick DATEV export everytime you post a record to ensure things work nicely with their data requirements. This will result in a slight overhead though you can enable this for each type of record independantly.') %]</td>
diff --git a/templates/webpages/client_config/_default_accounts.html b/templates/webpages/client_config/_default_accounts.html
index c73002b85..f893f5481 100644
--- a/templates/webpages/client_config/_default_accounts.html
+++ b/templates/webpages/client_config/_default_accounts.html
@@ -1,8 +1,6 @@
 [%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%]
 [% SET style="width: 600px" %]
 <div id="default_accounts">
- <div class='listheading'>[% LxERP.t8('Default Accounts') %]</div>
-
  <table>
   <tr>
    <td align="right">[% LxERP.t8("Inventory Account") %]</td>
diff --git a/templates/webpages/client_config/_miscellaneous.html b/templates/webpages/client_config/_miscellaneous.html
index c09fa761b..57c62490e 100644
--- a/templates/webpages/client_config/_miscellaneous.html
+++ b/templates/webpages/client_config/_miscellaneous.html
@@ -1,54 +1,82 @@
 [%- USE LxERP -%][%- USE L -%][%- USE HTML -%]
-[% SET style="width: 200px" %]
+[% SET style="width: 400px" %]
 <div id="miscellaneous">
- <div class="listheading">[% LxERP.t8("Miscellaneous") %]</div>
-
  <table>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Company settings") %]</td></tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8("Company name") %]</td>
+   <td>[% L.input_tag('defaults.company', SELF.defaults.company, style=style) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8("Address") %]</td>
+   <td>[% L.textarea_tag('defaults.address', SELF.defaults.address, style=style, rows=4) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8("Tax number") %]</td>
+   <td>[% L.input_tag('defaults.taxnumber', SELF.defaults.taxnumber, style=style) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8("Tax ID number") %]</td>
+   <td>[% L.input_tag('defaults.co_ustid', SELF.defaults.co_ustid, style=style) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8("SEPA creditor ID") %]</td>
+   <td>[% L.input_tag('defaults.sepa_creditor_id', SELF.defaults.sepa_creditor_id, style=style) %]</td>
+  </tr>
+
   <tr>
    <td align="right">[% LxERP.t8("Business Number") %]</td>
    <td>[% L.input_tag('defaults.businessnumber', SELF.defaults.businessnumber, style=style) %]</td>
   </tr>
 
+  <tr>
+   <td align="right">[% LxERP.t8("DUNS number") %]</td>
+   <td>[% L.input_tag('defaults.duns', SELF.defaults.duns, style=style) %]</td>
+  </tr>
+
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Language settings") %]</td></tr>
+
   <tr>
    <td align="right">[% LxERP.t8('Default Customer/Vendor Language') %]</td>
    <td>[% L.select_tag('defaults.language_id', SELF.all_languages, title_key='description', default=SELF.defaults.language_id, with_empty=1, style=style) %]</td>
   </tr>
- </table>
 
- <div class="listheading">[% LxERP.t8("Currencies") %]</div>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Currencies") %]</td></tr>
 
- <table>
   <tr>
    <th></th>
-   <th>[% LxERP.t8("Default currency") %]</th>
    <th>[% LxERP.t8("Currency name") %]</th>
+   <th>[% LxERP.t8("Default currency") %]</th>
    <th>[% LxERP.t8("Hints") %]</th>
   </tr>
 
 [% FOREACH currency = SELF.all_currencies %]
   <tr>
    <td align="right">[% IF loop.count == 1 %][% LxERP.t8("Currencies") %][% END %]</td>
+   <td>
+    [% L.input_tag("currencies[].name", currency.name, style=style) %]
+   </td>
    <td align="center">
     [% L.hidden_tag("currencies[+].id", currency.id) %]
     [% L.radio_button_tag('defaults.currency_id', value=currency.id, id='defaults.currency_id_' _ currency.id, checked=(SELF.defaults.currency_id == currency.id)) %]
    </td>
-   <td>
-    [% L.input_tag("currencies[].name", currency.name, style=style) %]
-   </td>
    <td>[% IF loop.count == 1 %][% LxERP.t8("Edit the currency names in order to rename them.") %][%- END %]</td>
   </tr>
 [% END %]
 
   <tr>
    <td align="right">[% LxERP.t8("Add new currency") %]</td>
-   <td align="center">[% L.radio_button_tag('defaults.currency_id', value=-1, id='defaults.currency_id__1', checked=(SELF.defaults.currency_id == -1)) %]</td>
    <td>[% L.input_tag("new_currency", FORM.new_currency, style=style) %]</td>
+   <td align="center">[% L.radio_button_tag('defaults.currency_id', value=-1, id='defaults.currency_id__1', checked=(SELF.defaults.currency_id == -1)) %]</td>
   </tr>
- </table>
 
- <div class="listheading">[% LxERP.t8("Weight") %]</div>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Weight") %]</td></tr>
 
- <table>
   <tr>
    <td align="right">[% LxERP.t8("Weight unit") %]</td>
    <td>[% L.select_tag('defaults.weightunit', SELF.all_weightunits, default=SELF.defaults.weightunit, value_key='name', title_key='name', style=style) %]</td>
@@ -57,7 +85,7 @@
   <tr>
    <td align="right">[% LxERP.t8('Show weights') %]</td>
    <td>[% L.yes_no_tag('defaults.show_weight', SELF.defaults.show_weight, style=style) %]</td>
-   <td>[% LxERP.t8('Show the weights of articles and the total weight in orders, invoices and delivery notes?') %]</td>
+   <td colspan="2">[% LxERP.t8('Show the weights of articles and the total weight in orders, invoices and delivery notes?') %]</td>
   </tr>
  </table>
 </div>
diff --git a/templates/webpages/client_config/_orders_deleteable.html b/templates/webpages/client_config/_orders_deleteable.html
index c15f159e4..0b35a72ee 100644
--- a/templates/webpages/client_config/_orders_deleteable.html
+++ b/templates/webpages/client_config/_orders_deleteable.html
@@ -1,7 +1,5 @@
 [%- USE LxERP -%][%- USE L -%]
 <div id="orders_deleteable">
- <div class='listheading'>[% LxERP.t8('Orders / Delivery Orders deleteable') %]</div>
-
  <table>
   <tr>
    <td align="right">[% LxERP.t8('Sales Orders deleteable') %]</td>
diff --git a/templates/webpages/client_config/_posting_configuration.html b/templates/webpages/client_config/_posting_configuration.html
index 333ae485e..d85fd79b3 100644
--- a/templates/webpages/client_config/_posting_configuration.html
+++ b/templates/webpages/client_config/_posting_configuration.html
@@ -1,7 +1,5 @@
 [%- USE L -%][%- USE LxERP -%]
 <div id="posting_configuration">
- <div class="listheading">[% LxERP.t8('Posting Configuration') %]</div>
-
  <table>
   <tr>
    <td align="right">[% LxERP.t8('Sales invoices changeable') %]</td>
diff --git a/templates/webpages/client_config/_ranges_of_numbers.html b/templates/webpages/client_config/_ranges_of_numbers.html
index 38a7e60e8..51b11b943 100644
--- a/templates/webpages/client_config/_ranges_of_numbers.html
+++ b/templates/webpages/client_config/_ranges_of_numbers.html
@@ -1,7 +1,5 @@
 [%- USE LxERP -%][%- USE L -%][%- USE HTML -%]
 <div id="ranges_of_numbers">
- <div class='listheading'>[% LxERP.t8('Ranges of numbers') %]</div>
-
  <table>
   <tr>
    <td align="right" nowrap>[% LxERP.t8('Last Invoice Number') %]</td>
diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 79fc7a275..87ff83589 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -1,7 +1,5 @@
 [%- USE HTML -%][%- USE LxERP -%][%- USE L -%]
 <div id="warehouse">
- <div class='listheading'>[% LxERP.t8('Warehouse') %]</div>
-
  <table>
   <tr>
    <td align="right">[% LxERP.t8('Default Transfer') %]</td>