X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Foe%2Fedit_periodic_invoices_config.html;h=6669e6cc5693f9154e7c09e73a2658d4e2016b1e;hb=fd7e51e949f6525e98d4df24f7fee5f1a1167891;hp=e563d39e3876a1abedc1b822879013236786035e;hpb=13412f21e0093c7940597934cba407cb2fd27505;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/edit_periodic_invoices_config.html b/templates/webpages/oe/edit_periodic_invoices_config.html
index e563d39e3..6669e6cc5 100644
--- a/templates/webpages/oe/edit_periodic_invoices_config.html
+++ b/templates/webpages/oe/edit_periodic_invoices_config.html
@@ -2,7 +2,10 @@
 [% USE LxERP %]
 [% USE L %]
 [% SET style="width: 400px" %]
+
+[%- IF !popup_dialog -%]
 <h1>[% title %]</h1>
+[%- END -%]
 
  <form name="Form" action="oe.pl" method="post">
 
@@ -87,20 +90,23 @@
     <tr>
      <th align="right">[%- LxERP.t8('Printer') %]</th>
      <td valign="top">
-      [% L.select_tag("printer_id", ALL_PRINTERS, title_key = 'printer_description', default = config.printer_id, disabled = !config.print, style=style) %]
+      [% L.select_tag("printer_id", ALL_PRINTERS, title_key = 'printer_description', default = config.printer_id, disabled = !config.print, id = "pic_printer_id", style=style) %]
      </td>
     </tr>
 
     <tr>
      <th align="right">[%- LxERP.t8('Copies') %]</th>
-     <td valign="top">[% L.input_tag("copies", config.copies, size => 6, disabled => !config.print) %]</td>
+     <td valign="top">[% L.input_tag("copies", config.copies, size => 6, disabled => !config.print, id = "pic_copies") %]</td>
     </tr>
 
     <tr class="rule-before">
      <th align="right">[%- LxERP.t8("Send invoice via email") %]</th>
      <td>[% L.checkbox_tag("send_email", onclick => "toggle_send_email_ctrl()", checked=config.send_email) %]</td>
     </tr>
-
+    <tr>
+     <th align="right">[%- LxERP.t8("Email of the invoice recipient") %]</th>
+     <td>[% email_recipient_invoice_address %]</td>
+    </tr>
     <tr>
      <th align="right">[%- LxERP.t8("Contact to send to") %]</th>
      <td>[% L.select_tag("email_recipient_contact_id", ALL_CONTACTS, title_key="full_name_dep", value_key="cp_id", default=config.email_recipient_contact_id, with_empty=1, disabled=!config.send_email, style=style) %]</td>
@@ -135,20 +141,26 @@
   <p>(3): [% LxERP.t8("Multiple addresses can be entered separated by commas.") %]</p>
   <p>(4): [% LxERP.t8("If left empty the default sender from the kivitendo configuration will be used (key 'email_from' in section 'periodic_invoices'; current value: #1).", HTML.escape(LXCONFIG.periodic_invoices.email_from)) %]</p>
 
-  [% L.hidden_tag('action', 'save_periodic_invoices_config') %]
+  [%- IF popup_dialog -%]
+    [% L.button_tag(popup_js_assign_function, LxERP.t8('Assign')) %]
+    [% L.button_tag(popup_js_close_function, LxERP.t8('Cancel')) %]
 
-  <p>
-   [% L.submit_tag('', LxERP.t8('Assign')) %]
-   [% L.submit_tag('', LxERP.t8('Cancel'), onclick => "self.close(); return false;") %]
-  </p>
+  [%- ELSE -%]
+    [% L.hidden_tag('action', 'save_periodic_invoices_config') %]
+
+    <p>
+     [% L.submit_tag('', LxERP.t8('Assign')) %]
+     [% L.submit_tag('', LxERP.t8('Cancel'), onclick => "self.close(); return false;") %]
+    </p>
+  [%- END -%]
  </form>
 
  <script type="text/javascript">
   <!--
     function toggle_printer_id_ctrl() {
       var disabled = !$('#print').prop('checked');
-      $('#printer_id').prop('disabled', disabled);
-      $('#copies').prop('disabled', disabled);
+      $('#pic_printer_id').prop('disabled', disabled);
+      $('#pic_copies').prop('disabled', disabled);
     }
 
     function toggle_send_email_ctrl() {