From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 25 Oct 2012 13:42:35 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~94
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/8b15dcb66b443000e0babb2bb3ff6ed5c8e73d41?hp=9dfc16f26bf07c977bbfdfb0986cd96aaa8a2ed2

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

diff --git a/templates/webpages/csv_import/_form_parts.html b/templates/webpages/csv_import/_form_parts.html
index e499e8014..beb09a0d0 100644
--- a/templates/webpages/csv_import/_form_parts.html
+++ b/templates/webpages/csv_import/_form_parts.html
@@ -43,8 +43,7 @@
 <tr>
  <th align="right" valign="top">[%- LxERP.t8('Default buchungsgruppe') %]:</th>
  <td colspan="10" valign="top">
-  [% opts = SELF.all_buchungsgruppen, title_key = 'description', default = SELF.profile.get('default_buchungsgruppe') %]
-  [% L.select_tag('settings.default_buchungsgruppe', opts, style => 'width: 300px') %]
+  [% L.select_tag('settings.default_buchungsgruppe', SELF.all_buchungsgruppen, title_key = 'description', default = SELF.profile.get('default_buchungsgruppe'), style => 'width: 300px') %]
   <br>
   [% opts = [ [ 'never', LxERP.t8('Do not set default buchungsgruppe') ], [ 'all', LxERP.t8('Apply to all parts') ], [ 'missing', LxERP.t8('Apply to parts without buchungsgruppe') ] ] %]
   [% L.select_tag('settings.apply_buchungsgruppe', opts, default = SELF.profile.get('apply_buchungsgruppe'), style = 'width: 300px') %]
@@ -54,7 +53,6 @@
 <tr>
  <th align="right" valign="top">[%- LxERP.t8('Default unit') %]:</th>
  <td colspan="10" valign="top">
-  [% opts = SELF.all_units, title_key = 'name', value_key = 'name', default = SELF.profile.get('default_unit') %]
-  [% L.select_tag('settings.default_unit', opts, style => 'width: 300px') %]
+  [% L.select_tag('settings.default_unit', SELF.all_units, title_key='name', value_key='name', default=SELF.profile.get('default_unit'), style = 'width: 300px') %]
  </td>
 </tr>
diff --git a/templates/webpages/generic/exception.html b/templates/webpages/generic/exception.html
index f99471409..8b70d41a0 100644
--- a/templates/webpages/generic/exception.html
+++ b/templates/webpages/generic/exception.html
@@ -1,4 +1,5 @@
-[%-- USE LxERP %][%- USE HTML %]
+[%- USE LxERP %]
+[%- USE HTML %]
 
  <h1 class="message_error">[%- LxERP.t8('Error!') %]</h1>