Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ce15be44

Von Kivitendo Admin vor fast 9 Jahren hinzugefügt

  • ID ce15be44bdc43e0e7221ff2f9cae67ad4747ef03
  • Vorgänger 0c1285eb
  • Nachfolger e8c424de

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.

Unterschiede anzeigen:

templates/webpages/buchungsgruppen/form.html
18 18 
    [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
19 19 
    <td>[% L.chart_picker("config.inventory_accno_id", SELF.config.inventory_accno_id, choose=1, type='IC', style=style) %]</td>
20 20 
    [%- ELSE %]
21 
      <td>[%- CHARTLIST.inventory_accno %] -- [%- CHARTLIST.inventory_accno_description %]</td>
21 
      <td>[%- CHARTLIST.inventory_accno_description %]</td>
22 22 
    [%- END %]
23 23 
  </tr>
24 24 
[%- FOREACH tz = TAXZONES %]
......
29 29 
    [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
30 30 
    <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>
31 31 
    [%- ELSE %]
32 
      <td>[% CHARTLIST.${tz.id}.income_accno %] -- [% CHARTLIST.${tz.id}.income_accno_description %]</td>
32 
      <td>[% CHARTLIST.${tz.id}.income_accno_description %]</td>
33 33 
    [%- END %]
34 34 
  </tr>
35 35 
  <tr>
......
39 39 
    [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
40 40 
      <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>
41 41 
    [%- ELSE %]
42 
      <td>[% CHARTLIST.${tz.id}.expense_accno %] -- [% CHARTLIST.${tz.id}.expense_accno_description %]</td>
42 
      <td>[% CHARTLIST.${tz.id}.expense_accno_description %]</td>
43 43 
    [%- END %]
44 44 
  </tr>
45 45 
[%- END %]
templates/webpages/taxzones/form.html
17 17 
    [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
18 18 
    <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>
19 19 
    [%- ELSE %]
20 
    <td>[% CHARTLIST.${bg.id}.income_accno %] -- [% CHARTLIST.${bg.id}.income_accno_description %]</td>
20 
    <td>[% CHARTLIST.${bg.id}.income_accno_description %]</td>
21 21 
    [%- END %]
22 22 
  </tr>
23 23 
  <tr>
......
27 27 
    [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
28 28 
    <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>
29 29 
    [%- ELSE %]
30 
    <td>[% CHARTLIST.${bg.id}.expense_accno %] -- [% CHARTLIST.${bg.id}.expense_accno_description %]</td>
30 
    <td>[% CHARTLIST.${bg.id}.expense_accno_description %]</td>
31 31 
    [%- END %]
32 32 
  </tr>
33 33 
[%- END %]

Auch abrufbar als: Unified diff