Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b2f44e3d

Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt

  • ID b2f44e3d98cbbd622b1497c23602eb79e71a3c64
  • Vorgänger 11e2bd11
  • Nachfolger 24baeb62

Das Definieren, Erstellen und Bearbeiten von benutzerdefinierten Variablen bei Waren, Dienstleistungen und Erzeugnissen implementiert.

Unterschiede anzeigen:

SL/CVar.pm
79 79
  my $h_id     = prepare_query($form, $dbh, $q_id);
80 80

  
81 81
  my $q_new    =
82
    qq|INSERT INTO custom_variable_configs (name, description, type, default_value, options, searchable, includeable, included_by_default, module, id, sortkey)
83
       VALUES                              (?,    ?,           ?,    ?,             ?,       ?,          ?,           ?,                   ?,      ?,
82
    qq|INSERT INTO custom_variable_configs (name, description, type, default_value, options, searchable, includeable, included_by_default, module, flags, id, sortkey)
83
       VALUES                              (?,    ?,           ?,    ?,             ?,       ?,          ?,           ?,                   ?,      ?,     ?,
84 84
         (SELECT COALESCE(MAX(sortkey) + 1, 1) FROM custom_variable_configs))|;
85 85
  my $h_new    = prepare_query($form, $dbh, $q_new);
86 86

  
......
90 90
         type        = ?, default_value       = ?,
91 91
         options     = ?, searchable          = ?,
92 92
         includeable = ?, included_by_default = ?,
93
         module      = ?
93
         module      = ?, flags               = ?
94 94
       WHERE id  = ?|;
95 95
  my $h_update = prepare_query($form, $dbh, $q_update);
96 96

  
......
118 118

  
119 119
    do_statement($form, $h_actual, $q_actual, @{$config}{qw(name description type default_value options)},
120 120
                 $config->{searchable} ? 't' : 'f', $config->{includeable} ? 't' : 'f', $config->{included_by_default} ? 't' : 'f',
121
                 $params{module}, conv_i($config->{id}));
121
                 $params{module}, $config->{flags}, conv_i($config->{id}));
122 122
  }
123 123

  
124 124
  $h_id->finish();
SL/IC.pm
38 38
use List::MoreUtils qw(all);
39 39
use YAML;
40 40

  
41
use SL::CVar;
41 42
use SL::DBUtils;
42 43

  
43 44
sub get_part {
......
565 566
    }
566 567
  }
567 568

  
569
  CVar->save_custom_variables('dbh'       => $dbh,
570
                              'module'    => 'IC',
571
                              'trans_id'  => $form->{id},
572
                              'variables' => $form);
573

  
568 574
  # commit
569 575
  my $rc = $dbh->commit;
570 576
  $dbh->disconnect;
......
957 963
  my $where_clause  = join ' AND ', map { "($_)" } @where_tokens;
958 964
  my $group_clause  = ' GROUP BY ' . join ', ',    map { ($table_prefix{$_} || "p.") . $_ } @group_tokens if scalar @group_tokens;
959 965

  
966
  my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'IC',
967
                                                            'trans_id_field' => 'p.id',
968
                                                            'filter'         => $form);
969

  
970
  if ($cvar_where) {
971
    $where_clause .= qq| AND ($cvar_where)|;
972
    push @bind_vars, @cvar_values;
973
  }
974

  
960 975
  my $query = qq|SELECT DISTINCT $select_clause FROM parts p $join_clause WHERE $where_clause $group_clause $order_clause $limit_clause|;
961 976

  
962 977
  $form->{parts} = selectall_hashref_query($form, $dbh, $query, @bind_vars);
bin/mozilla/amcvar.pl
73 73

  
74 74
  my $previous_config;
75 75

  
76
  foreach (@configs) {
77
    $_->{type_tr} = $translations{$_->{type}};
76
  foreach my $config (@configs) {
77
    $config->{type_tr} = $translations{$config->{type}};
78

  
79
    foreach my $flag (split m/:/, $config->{flags}) {
80
      if ($flag =~ m/(.*?)=(.*)/) {
81
        $config->{"flag_${1}"}    = $2;
82
      } else {
83
        $config->{"flag_${flag}"} = 1;
84
      }
85
    }
78 86

  
79 87
    if ($previous_config) {
80
      $previous_config->{next_id} = $_->{id};
81
      $_->{previous_id}           = $previous_config->{id};
88
      $previous_config->{next_id} = $config->{id};
89
      $config->{previous_id}      = $previous_config->{id};
82 90
    }
83 91

  
84
    $previous_config = $_;
92
    $previous_config = $config;
85 93
  }
86 94

  
87 95
  $form->{title} = $locale->text('List of custom variables');
......
138 146

  
139 147
  $form->{included_by_default} = $form->{inclusion} eq 'yes_default_on';
140 148
  $form->{includeable}         = $form->{inclusion} ne 'no';
149
  $form->{flags}               = join ':', map { m/^flag_(.*)/; "${1}=" . $form->{$_} } grep { m/^flag_/ } keys %{ $form };
141 150

  
142 151
  CVar->save_config('module' => $form->{module},
143 152
                    'config' => $form);
bin/mozilla/ic.pl
36 36
use List::MoreUtils qw(any);
37 37

  
38 38
use SL::AM;
39
use SL::CVar;
39 40
use SL::IC;
40 41
use SL::ReportGenerator;
41 42

  
......
105 106

  
106 107
  $form->{jsscript} = 1;
107 108

  
109
  $form->{CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'IC');
110
  ($form->{CUSTOM_VARIABLES_FILTER_CODE},
111
   $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables'      => $form->{CUSTOM_VARIABLES},
112
                                                                           'include_prefix' => 'l_',
113
                                                                           'include_value'  => 'Y');
114

  
108 115
  $form->header;
109 116

  
110 117
  print $form->parse_html_template('ic/search', { %is_xyz,
......
1010 1017

  
1011 1018
  my ($revers, $lastsort, $description);
1012 1019

  
1020
  my $cvar_configs = CVar->get_configs('module' => 'IC');
1021

  
1013 1022
  $form->{title} = (ucfirst $form->{searchitems}) . "s";
1014 1023
  $form->{title} =~ s/ys$/ies/;
1015 1024
  $form->{title} = $locale->text($form->{title});
......
1151 1160
    qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
1152 1161
       priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal deliverydate);
1153 1162

  
1163
  my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
1164
  my @searchable_custom_variables  = grep { $_->{searchable} }  @{ $cvar_configs };
1165
  my %column_defs_cvars            = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables;
1166

  
1167
  push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
1168

  
1154 1169
  my %column_defs = (
1155 1170
    'bin'                => { 'text' => $locale->text('Bin'), },
1156 1171
    'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
......
1177 1192
    'soldtotal'          => { 'text' => $locale->text('soldtotal'), },
1178 1193
    'unit'               => { 'text' => $locale->text('Unit'), },
1179 1194
    'weight'             => { 'text' => $locale->text('Weight'), },
1195
    %column_defs_cvars,
1180 1196
  );
1181 1197

  
1182 1198
  map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
1183 1199
  map { $column_defs{$_}->{align}   = 'right' } qw(onhand sellprice listprice lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal);
1184 1200

  
1185
  my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, map { "l_$_" } @columns);
1201
  my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, @searchable_custom_variables, map { "l_$_" } @columns);
1186 1202
  my $callback         = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
1187 1203

  
1188 1204
  my @sort_full        = qw(partnumber description onhand soldtotal deliverydate);
......
1219 1235

  
1220 1236
  $report->set_sort_indicator($form->{sort}, $form->{revers} ? 0 : 1);
1221 1237

  
1238
  CVar->add_custom_variables_to_report('module'         => 'IC',
1239
                                       'trans_id_field' => 'id',
1240
                                       'configs'        => $cvar_configs,
1241
                                       'column_defs'    => \%column_defs,
1242
                                       'data'           => $form->{parts});
1243

  
1222 1244
  my @subtotal_columns = qw(sellprice listprice lastcost);
1223 1245
  my %subtotals = map { $_ => 0 } ('onhand', @subtotal_columns);
1224 1246
  my %totals    = map { $_ => 0 } @subtotal_columns;
......
1514 1536

  
1515 1537
  $form->{fokus} = "ic.partnumber";
1516 1538

  
1539
  $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'IC', 'trans_id' => $form->{id});
1540

  
1541
  CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
1542

  
1517 1543
  $form->header;
1518 1544
  #print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS},
1519 1545
  #                                                     ALL_UNITS         => $form->{ALL_UNITS},
locale/de/all
40 40
  'A temporary file could not be created. Please verify that the directory "#1" is writeable by the webserver.' => 'Eine tempor?re Datei konnte nicht angelegt werden. Bitte stellen Sie sicher, dass das Verzeichnis "#1" vom Webserver beschrieben werden darf.',
41 41
  'A temporary file could not be created:' => 'Eine temporäre Datei konnte nicht erstellt werden:',
42 42
  'A unit with this name does already exist.' => 'Eine Einheit mit diesem Namen existiert bereits.',
43
  'A variable marked as \'editable\' can be changed in each quotation, order, invoice etc.' => 'Eine als \'editierbar\' markierte Variable kann in jedem Angebot, Auftrag, jeder Rechnung etc f?r jede Position ge?ndert werden.',
43 44
  'ADDED'                       => 'Hinzugef?gt',
44 45
  'AP'                          => 'Einkauf',
45 46
  'AP Aging'                    => 'Offene Verbindlichkeiten',
......
102 103
  'Add'                         => 'Erfassen',
103 104
  'Add '                        => 'Hinzuf?gen',
104 105
  'Add (Customers and Vendors)' => 'Erfassen (Kunden und Lieferanten)',
106
  'Add (Parts, services, assemblies)' => 'Erfassen (Waren, Dienstleistungen, Erzeugnisse)',
105 107
  'Add (Projects)'              => 'Erfassen (Projekte)',
106 108
  'Add AP Transaction'          => 'Kreditorenbuchung',
107 109
  'Add AR Transaction'          => 'Debitorenbuchung',
......
438 440
  'Customername'                => 'Kundenname',
439 441
  'Customernumberinit'          => 'Kunden-/Lieferantennummernkreis',
440 442
  'Customers'                   => 'Kunden',
443
  'Customers and vendors'       => 'Kunden und Lieferanten',
441 444
  'Customized Report'           => 'Vorgew?hlte Zeitr?ume',
442 445
  'DATEV - Export Assistent'    => 'DATEV-Exportassistent',
443 446
  'DATEV Angaben'               => 'DATEV-Angaben',
......
479 482
  'December'                    => 'Dezember',
480 483
  'Decimalplaces'               => 'Dezimalstellen',
481 484
  'Decrease'                    => 'Verringern',
482
  'Default (no language selected)' => 'Standard (keine Sprache ausgewählt)',
483 485
  'Default Accounts'            => 'Standardkonten',
484 486
  'Default output medium'       => 'Standardausgabekanal',
485 487
  'Default printer'             => 'Standarddrucker',
......
625 627
  'Edit and delete a group'     => 'Gruppen bearbeiten und löschen',
626 628
  'Edit custom variable'        => 'Benutzerdefinierte Variable bearbeiten',
627 629
  'Edit file'                   => 'Datei bearbeiten',
628
  'Edit greetings'              => 'Anreden bearbeiten',
629 630
  'Edit group '                 => 'Gruppe bearbeiten',
630 631
  'Edit group membership'       => 'Gruppenmitgliedschaften bearbeiten',
631 632
  'Edit groups'                 => 'Gruppen bearbeiten',
......
640 641
  'Edit the sales_quotation'    => 'Bearbeiten des Angebots',
641 642
  'Edit the stylesheet'         => 'Stilvorlage bearbeiten',
642 643
  'Edit units'                  => 'Einheiten bearbeiten',
644
  'Editable'                    => 'Bearbeitbar',
643 645
  'Employee'                    => 'Bearbeiter',
644 646
  'Empty transaction!'          => 'Buchung ist leer!',
645 647
  'Enter a description for this new draft.' => 'Geben Sie eine Beschreibung für diesen Entwurf ein.',
......
887 889
  'Line Total'                  => 'Zeilensumme',
888 890
  'Line endings'                => 'Zeilenumbrüche',
889 891
  'List (Customers and Vendors)' => 'Auflisten (Kunden und Lieferanten)',
892
  'List (Parts, services, assemblies)' => 'Auflisten (Waren, Dienstleistungen, Erzeugnisse)',
890 893
  'List (Projects)'             => 'Auflisten (Projekte)',
891 894
  'List Accounting Groups'      => 'Buchungsgruppen anzeigen',
892 895
  'List Accounts'               => 'Konten anzeigen',
......
958 961
  'Mobile1'                     => 'Mobile 1',
959 962
  'Mobile2'                     => 'Mobile 2',
960 963
  'Model'                       => 'Lieferanten-Art-Nr.',
964
  'Module'                      => 'Modul',
961 965
  'Module home page'            => 'Modul-Webseite',
962 966
  'Module name'                 => 'Modulname',
963 967
  'Monat'                       => 'Monat',
......
1068 1072
  'Other values are ignored.'   => 'Andere Eingaben werden ignoriert.',
1069 1073
  'Others'                      => 'Andere',
1070 1074
  'Otherwise all users will only have access to their own settings.' => 'Andernfalls haben alle Benutzer nur Zugriff auf ihre Benutzereinstellungen.',
1075
  'Otherwise the variable is only available for printing.' => 'Andernfalls steht die Variable nur beim Ausdruck zur Verf?gung.',
1071 1076
  'Out of balance transaction!' => 'Buchung ist nicht ausgeglichen!',
1072 1077
  'Out of balance!'             => 'Summen stimmen nicht berein!',
1073 1078
  'Output Number Format'        => 'Zahlenformat (Ausgabe)',
......
1098 1103
  'Parts'                       => 'Waren',
1099 1104
  'Parts Inventory'             => 'Warenliste',
1100 1105
  'Parts must have an entry type.' => 'Waren müssen eine Buchungsgruppe haben.',
1106
  'Parts, services and assemblies' => 'Waren, Dienstleistungen und Erzeugnisse',
1101 1107
  'Password'                    => 'Passwort',
1102 1108
  'Payables'                    => 'Verbindlichkeiten',
1103 1109
  'Payment'                     => 'Zahlungsausgang',
......
1510 1516
  'The following users have been migrated into the authentication database:' => 'Die folgenden Benutzer wurden in die Authentifizierungsdatenbank migriert:',
1511 1517
  'The following warnings occured during an upgrade to the document templates:' => 'Die folgenden Warnungen traten während einer Aktualisierung der Dokumentenvorlagen auf:',
1512 1518
  'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' => 'Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname = Variable Einheit;<br>Variablenname2 = Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Variablennamen und Einheiten d?rfen nur aus alphanumerischen Zeichen bestehen.<br>Es muss jeweils die Gesamte Zeile eingegeben werden',
1513
  'The greetings have been saved.' => 'Die Anreden wurden gespeichert',
1514 1519
  'The group has been added.'   => 'Die Gruppe wurde erfasst.',
1515 1520
  'The group has been deleted.' => 'Die Gruppe wurde gel&ouml;scht.',
1516 1521
  'The group has been saved.'   => 'Die Gruppe wurde gespeichert.',
locale/de/menu
8 8
  'AR Aging'                    => 'Offene Forderungen',
9 9
  'Accounting Menu'             => 'Kontoverwaltung',
10 10
  'Add (Customers and Vendors)' => 'Erfassen (Kunden und Lieferanten)',
11
  'Add (Parts, services, assemblies)' => 'Erfassen (Waren, Dienstleistungen, Erzeugnisse)',
11 12
  'Add (Projects)'              => 'Erfassen (Projekte)',
12 13
  'Add AP Transaction'          => 'Kreditorenbuchung',
13 14
  'Add AR Transaction'          => 'Debitorenbuchung',
......
119 120
  'Lead'                        => 'Kundenquelle',
120 121
  'Licenses'                    => 'Lizenzen',
121 122
  'List (Customers and Vendors)' => 'Auflisten (Kunden und Lieferanten)',
123
  'List (Parts, services, assemblies)' => 'Auflisten (Waren, Dienstleistungen, Erzeugnisse)',
122 124
  'List (Projects)'             => 'Auflisten (Projekte)',
123 125
  'List Accounting Groups'      => 'Buchungsgruppen anzeigen',
124 126
  'List Accounts'               => 'Konten anzeigen',
locale/de/menunew
7 7
  'AR'                          => 'Verkauf',
8 8
  'AR Aging'                    => 'Offene Forderungen',
9 9
  'Add (Customers and Vendors)' => 'Erfassen (Kunden und Lieferanten)',
10
  'Add (Parts, services, assemblies)' => 'Erfassen (Waren, Dienstleistungen, Erzeugnisse)',
10 11
  'Add (Projects)'              => 'Erfassen (Projekte)',
11 12
  'Add AP Transaction'          => 'Kreditorenbuchung',
12 13
  'Add AR Transaction'          => 'Debitorenbuchung',
......
118 119
  'Lead'                        => 'Kundenquelle',
119 120
  'Licenses'                    => 'Lizenzen',
120 121
  'List (Customers and Vendors)' => 'Auflisten (Kunden und Lieferanten)',
122
  'List (Parts, services, assemblies)' => 'Auflisten (Waren, Dienstleistungen, Erzeugnisse)',
121 123
  'List (Projects)'             => 'Auflisten (Projekte)',
122 124
  'List Accounting Groups'      => 'Buchungsgruppen anzeigen',
123 125
  'List Accounts'               => 'Konten anzeigen',
menu.ini
691 691
action=list_cvar_configs
692 692
cvar_module=CT
693 693

  
694
[System--Custom Variables--Add (Parts, services, assemblies)]
695
module=amcvar.pl
696
action=add_cvar_config
697
cvar_module=IC
698

  
699
[System--Custom Variables--List (Parts, services, assemblies)]
700
module=amcvar.pl
701
action=list_cvar_configs
702
cvar_module=IC
703

  
694 704
[System--Custom Variables--Add (Projects)]
695 705
module=amcvar.pl
696 706
action=add_cvar_config
templates/webpages/amcvar/display_cvar_config_form_de.html
12 12

  
13 13
  <p>
14 14
   <table>
15
    <tr>
16
     <td align="right">Modul</td>
17
     <td>
18
      [%- IF module == 'CT' %]
19
      Kunden und Lieferanten
20
      [%- ELSIF module == 'Projects' %]
21
      Projekte
22
      [%- ELSIF module == 'IC' %]
23
      Waren, Dienstleistungen und Erzeugnisse
24
      [%- END %]
25
     </td>
26
    </tr>
27

  
15 28
    <tr>
16 29
     <td align="right">Name<sup><span class="small">(1)</span></sup></td>
17 30
     <td><input name="name" value="[% HTML.escape(name) %]"></td>
......
63 76
      </select>
64 77
     </td>
65 78
    </tr>
79

  
80
    [%- IF module == 'IC' %]
81
    <tr>
82
     <td align="right">Bearbeitbar<sup><span class="small">(5)</span></sup></td>
83
     <td>
84
      <input type="radio" name="flag_editable" id="flag_editable_1" value="1"[% IF flag_editable %] checked[% END %]>
85
      <label for="flag_editable_1">Ja</label>
86
      <input type="radio" name="flag_editable" id="flag_editable_0" value="0"[% UNLESS flag_editable %] checked[% END %]>
87
      <label for="flag_editable_0">Nein</label>
88
     </td>
89
    </tr>
90
    [%- END %]
66 91
   </table>
67 92
  </p>
68 93

  
......
111 136
   Andere Eingaben werden ignoriert.
112 137
  </p>
113 138

  
139
  [%- IF module == 'IC' %]
140
  <p>
141
   (5)
142

  
143
   Eine als 'editierbar' markierte Variable kann in jedem Angebot, Auftrag, jeder Rechnung etc f?r jede Position ge?ndert werden.
144

  
145
   Andernfalls steht die Variable nur beim Ausdruck zur Verf?gung.
146
  </p>
147
  [%- END %]
148

  
114 149
 </form>
115 150

  
116 151
</body>
templates/webpages/amcvar/display_cvar_config_form_master.html
12 12

  
13 13
  <p>
14 14
   <table>
15
    <tr>
16
     <td align="right"><translate>Module</translate></td>
17
     <td>
18
      [%- IF module == 'CT' %]
19
      <translate>Customers and vendors</translate>
20
      [%- ELSIF module == 'Projects' %]
21
      <translate>Projects</translate>
22
      [%- ELSIF module == 'IC' %]
23
      <translate>Parts, services and assemblies</translate>
24
      [%- END %]
25
     </td>
26
    </tr>
27

  
15 28
    <tr>
16 29
     <td align="right"><translate>Name</translate><sup><span class="small">(1)</span></sup></td>
17 30
     <td><input name="name" value="[% HTML.escape(name) %]"></td>
......
63 76
      </select>
64 77
     </td>
65 78
    </tr>
79

  
80
    [%- IF module == 'IC' %]
81
    <tr>
82
     <td align="right"><translate>Editable</translate><sup><span class="small">(5)</span></sup></td>
83
     <td>
84
      <input type="radio" name="flag_editable" id="flag_editable_1" value="1"[% IF flag_editable %] checked[% END %]>
85
      <label for="flag_editable_1"><translate>Yes</translate></label>
86
      <input type="radio" name="flag_editable" id="flag_editable_0" value="0"[% UNLESS flag_editable %] checked[% END %]>
87
      <label for="flag_editable_0"><translate>No</translate></label>
88
     </td>
89
    </tr>
90
    [%- END %]
66 91
   </table>
67 92
  </p>
68 93

  
......
126 151
   <translate>Other values are ignored.</translate>
127 152
  </p>
128 153

  
154
  [%- IF module == 'IC' %]
155
  <p>
156
   (5)
157

  
158
   <translate>A variable marked as 'editable' can be changed in each
159
    quotation, order, invoice etc.</translate>
160

  
161
   <translate>Otherwise the variable is only available for
162
    printing.</translate>
163
  </p>
164
  [%- END %]
165

  
129 166
 </form>
130 167

  
131 168
</body>
templates/webpages/amcvar/list_cvar_configs_de.html
14 14
    <td class="listheading" width="20%">Typ</td>
15 15
    <td class="listheading" width="20%">Durchsuchbar</td>
16 16
    <td class="listheading" width="20%">In Berichten anzeigbar</td>
17
    [%- IF module == 'IC' %]
18
    <td class="listheading" width="20%">Bearbeitbar</td>
19
    [%- END %]
17 20
   </tr>
18 21

  
19 22
   [%- FOREACH cfg = CONFIGS %]
......
58 61
     Nein
59 62
     [%- END %]
60 63
    </td>
64

  
65
    [%- IF module == 'IC' %]
66
    <td>
67
     [%- IF cfg.flag_editable %]
68
     Ja
69
     [%- ELSE %]
70
     Nein
71
     [%- END %]
72
    </td>
73
    [%- END %]
61 74
   </tr>
62 75
   [%- END %]
63 76
  </table>
templates/webpages/amcvar/list_cvar_configs_master.html
14 14
    <td class="listheading" width="20%"><translate>Type</translate></td>
15 15
    <td class="listheading" width="20%"><translate>Searchable</translate></td>
16 16
    <td class="listheading" width="20%"><translate>Includeable in reports</translate></td>
17
    [%- IF module == 'IC' %]
18
    <td class="listheading" width="20%"><translate>Editable</translate></td>
19
    [%- END %]
17 20
   </tr>
18 21

  
19 22
   [%- FOREACH cfg = CONFIGS %]
......
58 61
     <translate>No</translate>
59 62
     [%- END %]
60 63
    </td>
64

  
65
    [%- IF module == 'IC' %]
66
    <td>
67
     [%- IF cfg.flag_editable %]
68
     <translate>Yes</translate>
69
     [%- ELSE %]
70
     <translate>No</translate>
71
     [%- END %]
72
    </td>
73
    [%- END %]
61 74
   </tr>
62 75
   [%- END %]
63 76
  </table>
templates/webpages/ic/form_footer_de.html
26 26

  
27 27
 <br style="clear: left" />
28 28
</div>
29

  
30
[%- IF CUSTOM_VARIABLES.size %]
31
<div id="custom_variables" class="tabcontent">
32

  
33
 <p>
34
  <table>
35
   [%- FOREACH var = CUSTOM_VARIABLES %]
36
   <tr>
37
    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
38
    <td valign="top">[% var.HTML_CODE %]</td>
39
   </tr>
40
   [%- END %]
41
  </table>
42
 </p>
43

  
44
 <br style="clear: left" />
45
</div>
46
[%- END %]
47

  
29 48
</div>
30 49

  
31 50
<input class="submit" type="submit" name="action" value="Erneuern">
templates/webpages/ic/form_footer_master.html
26 26

  
27 27
 <br style="clear: left" />
28 28
</div>
29

  
30
[%- IF CUSTOM_VARIABLES.size %]
31
<div id="custom_variables" class="tabcontent">
32

  
33
 <p>
34
  <table>
35
   [%- FOREACH var = CUSTOM_VARIABLES %]
36
   <tr>
37
    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
38
    <td valign="top">[% var.HTML_CODE %]</td>
39
   </tr>
40
   [%- END %]
41
  </table>
42
 </p>
43

  
44
 <br style="clear: left" />
45
</div>
46
[%- END %]
47

  
29 48
</div>
30 49

  
31 50
<input class="submit" type="submit" name="action" value="<translate>Update</translate>">
templates/webpages/ic/form_header_de.html
24 24

  
25 25
  <ul id="maintab" class="shadetabs">
26 26
   <li class="selected"><a href="#" rel="master_data">Stammdaten</a></li>
27
   [%- IF CUSTOM_VARIABLES.size %]
28
   <li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
29
   [%- END %]
27 30
  </ul>
28 31

  
29 32
  <div class="tabcontentstyle">
templates/webpages/ic/form_header_master.html
24 24

  
25 25
  <ul id="maintab" class="shadetabs">
26 26
   <li class="selected"><a href="#" rel="master_data"><translate>Master Data</translate></a></li>
27
   [%- IF CUSTOM_VARIABLES.size %]
28
   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
29
   [%- END %]
27 30
  </ul>
28 31

  
29 32
  <div class="tabcontentstyle">
templates/webpages/ic/search_de.html
56 56
       <td><input name="microfiche" size="20"></td>
57 57
      </tr>
58 58

  
59
      [% CUSTOM_VARIABLES_FILTER_CODE %]
60

  
59 61
      [%- IF is_assembly %]
60 62
      <tr>
61 63
       <td></td>
......
250 252
          <td>
251 253
          </td>
252 254
         </tr>
255

  
256
         [% CUSTOM_VARIABLES_INCLUSION_CODE %]
253 257
        </table>
254 258
       </td>
255 259
      </tr>
templates/webpages/ic/search_master.html
56 56
       <td><input name="microfiche" size="20"></td>
57 57
      </tr>
58 58

  
59
      [% CUSTOM_VARIABLES_FILTER_CODE %]
60

  
59 61
      [%- IF is_assembly %]
60 62
      <tr>
61 63
       <td></td>
......
250 252
          <td>
251 253
          </td>
252 254
         </tr>
255

  
256
         [% CUSTOM_VARIABLES_INCLUSION_CODE %]
253 257
        </table>
254 258
       </td>
255 259
      </tr>

Auch abrufbar als: Unified diff