Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/VERSION b/VERSION
index 24ba9a38de68d00674ec97b283a967699716b9f4..dd8693a9f8d16a1e5f88affafd635f26ebd06772 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.7.0
+2.7.1-unstable

diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
index 92c098d7e525a53b1e85b2cdb2ef2781d25f8d43..8263d873ddaff938bb304d71947ff5cc72e5bfdf 100644 (file)
--- a/templates/webpages/ct/form_header.html
+++ b/templates/webpages/ct/form_header.html
@@ -279,7 +279,7 @@
       </td>
       [%- IF is_customer && !conf_vertreter %]
       <th align="right">[% 'Salesman' | $T8 %]</th>
-      <td>[% L.select_tag('salesman_id', L.options_for_select(ALL_SALESMEN, default=salesman_id, show_empty=1, title='safe_name')) %]</td>
+      <td>[% L.select_tag('salesman_id', L.options_for_select(ALL_SALESMEN, default=salesman_id, with_empty=1, title='safe_name')) %]</td>
       [%- END %]
      </tr>
     </table>