Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision eabd6694

Von Kivitendo Admin vor mehr als 10 Jahren hinzugefügt

  • ID eabd66947cdb825339e188ba52b9b18f9b88ae51
  • Vorgänger a6fc1f81
  • Nachfolger 1f9b0c55

Buchungsgruppe anlegen/bearbeiten/anzeigen - Logik umgestellt

3 Fälle in Maske berücksichtigen:

  • neue BG: Konten-Dropdown mit Standardkonten vorausgewählt
  • existierende BG nicht in Benutzung: Konten-Dropdown mit gespeicherten
    Konten vorausgewählt
  • existierende BG in Benutzung: gespeicherte Konten als Text anzeigen

Unterschiede anzeigen:

templates/webpages/buchungsgruppen/form.html
12 12 
  </tr>
13 13 
  <tr>
14 14 
    <th align="right">[% 'Inventory account' | $T8 %]</th>
15 
    [%- IF SELF.config.id AND NOT SELF.config.orphaned %]
16 
    <td>[%- CHARTLIST.inventory_accno %] -- [%- CHARTLIST.inventory_accno_description %]</td>
17 
    [%- ELSIF NOT SELF.config.id AND NOT SELF.config.orphaned %]
18 
    <td>[%- L.select_tag("config.inventory_accno_id", ACCOUNTS.ic, title_sub=\account_label, default=SELF.defaults.inventory_accno_id) %]</td>
15 
    [%- IF NOT SELF.config.id %]
16 
      <td>[%- L.select_tag("config.inventory_accno_id", ACCOUNTS.ic, title_sub=\account_label, default=SELF.defaults.inventory_accno_id) %]</td>
17 
    [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
18 
      <td>[%- L.select_tag("config.inventory_accno_id", ACCOUNTS.ic, title_sub=\account_label, default=SELF.config.inventory_accno_id) %]</td>
19 19 
    [%- ELSE %]
20 
    <td>[%- L.select_tag("config.inventory_accno_id", ACCOUNTS.ic, title_sub=\account_label, default=SELF.config.inventory_accno_id) %]</td>
20 
      <td>[%- CHARTLIST.inventory_accno %] -- [%- CHARTLIST.inventory_accno_description %]</td>
21 21 
    [%- END %]
22 22 
  </tr>
23 23 
[%- FOREACH tz = TAXZONES %]
24 24 
  <tr>
25 25 
    <th align="right">[% 'Revenue' | $T8 %] [% HTML.escape(tz.description) %]</th>
26 
    [%- IF SELF.config.id AND NOT SELF.config.orphaned %]
27 
    <td>[% CHARTLIST.${tz.id}.income_accno %] -- [% CHARTLIST.${tz.id}.income_accno_description %]</td>
28 
    [%- ELSIF NOT SELF.config.id AND NOT SELF.config.orphaned %]
29 
    <td>[%- L.select_tag('income_accno_id_' _ tz.id, ACCOUNTS.ic_income, title_sub=\account_label, default=SELF.defaults.income_accno_id) %]</td>
26 
    [%- IF NOT SELF.config.id %]
27 
      <td>[%- L.select_tag('income_accno_id_' _ tz.id, ACCOUNTS.ic_income, title_sub=\account_label, default=SELF.defaults.income_accno_id) %]</td>
28 
    [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
29 
      <td>[%- L.select_tag('income_accno_id_' _ tz.id, ACCOUNTS.ic_income, title_sub=\account_label, default=CHARTLIST.${tz.id}.income_accno_id) %]</td>
30 30 
    [%- ELSE %]
31 
    <td>[%- L.select_tag('income_accno_id_' _ tz.id, ACCOUNTS.ic_income, title_sub=\account_label, default=CHARTLIST.${tz.id}.income_accno_id) %]</td>
31 
      <td>[% CHARTLIST.${tz.id}.income_accno %] -- [% CHARTLIST.${tz.id}.income_accno_description %]</td>
32 32 
    [%- END %]
33 33 
  </tr>
34 34 
  <tr>
35 35 
    <th align="right">[% 'Expense' | $T8 %] [% HTML.escape(tz.description) %]</th>
36 
    [%- IF SELF.config.id AND NOT SELF.config.orphaned %]
37 
    <td>[% CHARTLIST.${tz.id}.expense_accno %] -- [% CHARTLIST.${tz.id}.expense_accno_description %]</td>
38 
    [%- ELSIF NOT SELF.config.id AND NOT SELF.config.orphaned %]
39 
    <td>[%- L.select_tag('expense_accno_id_' _ tz.id, ACCOUNTS.ic_expense, title_sub=\account_label, default=SELF.defaults.expense_accno_id) %]</td>
36 
    [%- IF NOT SELF.config.id %]
37 
      <td>[%- L.select_tag('expense_accno_id_' _ tz.id, ACCOUNTS.ic_expense, title_sub=\account_label, default=SELF.defaults.expense_accno_id) %]</td>
38 
    [%- ELSIF SELF.config.id AND SELF.config.orphaned %]
39 
      <td>[%- L.select_tag('expense_accno_id_' _ tz.id, ACCOUNTS.ic_expense, title_sub=\account_label, default=CHARTLIST.${tz.id}.expense_accno_id) %]</td>
40 40 
    [%- ELSE %]
41 
    <td>[%- L.select_tag('expense_accno_id_' _ tz.id, ACCOUNTS.ic_expense, title_sub=\account_label, default=CHARTLIST.${tz.id}.expense_accno_id) %]</td>
41 
      <td>[% CHARTLIST.${tz.id}.expense_accno %] -- [% CHARTLIST.${tz.id}.expense_accno_description %]</td>
42 42 
    [%- END %]
43 43 
  </tr>
44 44 
[%- END %]

Auch abrufbar als: Unified diff