From: G. Richardson <information@kivitendo-premium.de>
Date: Thu, 30 Jul 2015 10:21:26 +0000 (+0200)
Subject: Steuerzonen und Buchungsgruppen bearbeiten: displayable_name für Konten
X-Git-Tag: release-3.3.0beta~18
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ce15be44bdc43e0e7221ff2f9cae67ad4747ef03;p=kivitendo-erp.git

Steuerzonen und Buchungsgruppen bearbeiten: displayable_name für Konten

Die description-Variable in TaxzoneChart enthält nun den
displayable_name für die Konten.

Für die Anzeige der Kontennamen beim Bearbeiten von Steuerzonen und
Buchungsgruppen, wo die Konten nicht bearbeitet werden können sondern
nur angezeigt werden sollen. Kein "--" mehr.
---

diff --git a/templates/webpages/buchungsgruppen/form.html b/templates/webpages/buchungsgruppen/form.html
index 16912fd85..ad9db1445 100644
--- a/templates/webpages/buchungsgruppen/form.html
+++ b/templates/webpages/buchungsgruppen/form.html
@@ -18,7 +18,7 @@
     [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
     <td>[% L.chart_picker("config.inventory_accno_id", SELF.config.inventory_accno_id, choose=1, type='IC', style=style) %]</td>
     [%- ELSE %]
-      <td>[%- CHARTLIST.inventory_accno %] -- [%- CHARTLIST.inventory_accno_description %]</td>
+      <td>[%- CHARTLIST.inventory_accno_description %]</td>
     [%- END %]
   </tr>
 [%- FOREACH tz = TAXZONES %]
@@ -29,7 +29,7 @@
     [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
     <td>[% L.chart_picker('income_accno_id_' _ tz.id, CHARTLIST.${tz.id}.income_accno_id, choose=1, type='IC_income,IC_sale', style=style) %]</td>
     [%- ELSE %]
-      <td>[% CHARTLIST.${tz.id}.income_accno %] -- [% CHARTLIST.${tz.id}.income_accno_description %]</td>
+      <td>[% CHARTLIST.${tz.id}.income_accno_description %]</td>
     [%- END %]
   </tr>
   <tr>
@@ -39,7 +39,7 @@
     [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
       <td>[% L.chart_picker('expense_accno_id_' _ tz.id, CHARTLIST.${tz.id}.expense_accno_id, choose=1, type='IC_expense,IC_cogs', style=style) %]</td>
     [%- ELSE %]
-      <td>[% CHARTLIST.${tz.id}.expense_accno %] -- [% CHARTLIST.${tz.id}.expense_accno_description %]</td>
+      <td>[% CHARTLIST.${tz.id}.expense_accno_description %]</td>
     [%- END %]
   </tr>
 [%- END %]
diff --git a/templates/webpages/taxzones/form.html b/templates/webpages/taxzones/form.html
index b12739962..d6153788c 100644
--- a/templates/webpages/taxzones/form.html
+++ b/templates/webpages/taxzones/form.html
@@ -17,7 +17,7 @@
     [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
     <td>[% L.chart_picker('income_accno_id_' _ bg.id, CHARTLIST.${bg.id}.income_accno_id, choose=1, type='IC_income,IC_sale', style=style) %]</td>
     [%- ELSE %]
-    <td>[% CHARTLIST.${bg.id}.income_accno %] -- [% CHARTLIST.${bg.id}.income_accno_description %]</td>
+    <td>[% CHARTLIST.${bg.id}.income_accno_description %]</td>
     [%- END %]
   </tr>
   <tr>
@@ -27,7 +27,7 @@
     [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
     <td>[% L.chart_picker('expense_accno_id_' _ bg.id, CHARTLIST.${bg.id}.expense_accno_id, choose=1, type='IC_expense,IC_cogs', style=style) %]</td>
     [%- ELSE %]
-    <td>[% CHARTLIST.${bg.id}.expense_accno %] -- [% CHARTLIST.${bg.id}.expense_accno_description %]</td>
+    <td>[% CHARTLIST.${bg.id}.expense_accno_description %]</td>
     [%- END %]
   </tr>
 [%- END %]