X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fclient_config%2F_miscellaneous.html;h=35a9728d72b09311cb04cd56f08ce467b1944b90;hb=6c0095f1ec3bff00c172cc2c7649e757960da9fd;hp=57c62490e4769417c88efef8362982f538f70d4d;hpb=ce8306e07de8e24ffab52feeeb311468f81e1d70;p=kivitendo-erp.git

diff --git a/templates/webpages/client_config/_miscellaneous.html b/templates/webpages/client_config/_miscellaneous.html
index 57c62490e..35a9728d7 100644
--- a/templates/webpages/client_config/_miscellaneous.html
+++ b/templates/webpages/client_config/_miscellaneous.html
@@ -10,13 +10,22 @@
   </tr>
 
   <tr>
-   <td align="right">[% LxERP.t8("Address") %]</td>
-   <td>[% L.textarea_tag('defaults.address', SELF.defaults.address, style=style, rows=4) %]</td>
+   <td align="right" valign="top">[% LxERP.t8("Address") %]</td>
+   <td valign="top">[% L.textarea_tag('defaults.address', SELF.defaults.address, style=style, rows=4) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right" valign="top">[% LxERP.t8("Signature") %]</td>
+   <td valign="top">[% L.textarea_tag('defaults.signature', SELF.defaults.signature, style=style, rows=4) %]</td>
   </tr>
 
   <tr>
    <td align="right">[% LxERP.t8("Tax number") %]</td>
+   [% IF SELF.defaults.feature_ustva %]
+   <td>[% SELF.defaults.taxnumber %]&nbsp;&nbsp;<a href="ustva.pl?action=config_step1">([% LxERP.t8("For changeing goto USTVA Config") %])</a></td>
+   [% ELSE %]
    <td>[% L.input_tag('defaults.taxnumber', SELF.defaults.taxnumber, style=style) %]</td>
+   [% END %]
   </tr>
 
   <tr>
@@ -46,6 +55,30 @@
    <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>
 
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Print templates") %]</td></tr>
+
+  <tr>
+   <td align="right" valign="top">[% LxERP.t8("Print templates to use") %]</td>
+   <td colspan="3" valign="top">
+    <table>
+     <tr>
+      <td>[% L.radio_button_tag('use_templates', value='existing', id='use_templates_existing', label=LxERP.t8('Use existing templates'), checked=(FORM.use_templates == 'existing')) %]</td>
+      <td>[% L.select_tag('defaults.templates', SELF.all_templates.print_templates, default=SELF.defaults.templates, value_sub=\make_templates_value, style=style) %]</td>
+     </tr>
+
+     <tr>
+      <td>[% L.radio_button_tag('use_templates', value='new', id='use_templates_new', label=LxERP.t8('Create new templates from master templates'), checked=(FORM.use_templates == 'new')) %]</td>
+      <td>[% L.select_tag('new_master_templates', SELF.all_templates.master_templates, default=FORM.new_master_templates, style=style) %]</td>
+     </tr>
+
+     <tr>
+      <td align="right">[% LxERP.t8("New name") %]</td>
+      <td>[% L.input_tag('new_templates', FORM.new_templates, style=style) %]</td>
+     </tr>
+    </table>
+   </td>
+  </tr>
+
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Currencies") %]</td></tr>
 
   <tr>
@@ -57,14 +90,12 @@
 
 [% 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 align="right">
+     [% L.hidden_tag("currencies[+].id", currency.id) %]
+     [% IF loop.count == 1 %][% LxERP.t8("Currencies") %][% END %]
    </td>
+   <td>[% L.input_tag("currencies[].name", currency.name, style=style) %]</td>
+   <td align="center">[% 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>[% IF loop.count == 1 %][% LxERP.t8("Edit the currency names in order to rename them.") %][%- END %]</td>
   </tr>
 [% END %]
@@ -75,6 +106,7 @@
    <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>
 
+[% IF SELF.all_weightunits.size %]
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Weight") %]</td></tr>
 
   <tr>
@@ -87,6 +119,6 @@
    <td>[% L.yes_no_tag('defaults.show_weight', SELF.defaults.show_weight, style=style) %]</td>
    <td colspan="2">[% LxERP.t8('Show the weights of articles and the total weight in orders, invoices and delivery notes?') %]</td>
   </tr>
+[% END %]
  </table>
 </div>
-</div>