From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 20 Apr 2012 14:08:00 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~343^2~9
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5104dee447f25733832ed4e4a58c4847b2c2ea66?hp=4070dbf38e04b168fe43bd3a6e5a3f28f77e986d

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

diff --git a/VERSION b/VERSION
index 24ba9a38d..dd8693a9f 100644
--- 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 92c098d7e..8263d873d 100644
--- 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>