Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a00e1b52

Von Sven Schöling vor mehr als 14 Jahren hinzugefügt

  • ID a00e1b52cd1207ae9db2d93fb7f7d85dbd7f1934
  • Vorgänger 8ab8cad9
  • Nachfolger 052dbdbe

Angebotssuche: Einige Strings waren noch nciht von Auftrag->Angebot übersetzt.

Fix für Bug 1294

Unterschiede anzeigen:

bin/mozilla/oe.pl
685 685

  
686 686
  $form->header();
687 687

  
688
  print $form->parse_html_template('oe/search', { %myconfig });
688
  print $form->parse_html_template('oe/search', {
689
    %myconfig,
690
    is_order => $form->{type} =~ /_order/,
691
  });
689 692

  
690 693
  $main::lxdebug->leave_sub();
691 694
}
......
786 789
  my %column_defs = (
787 790
    'ids'                     => { 'text' => '', },
788 791
    'transdate'               => { 'text' => $locale->text('Date'), },
789
    'reqdate'                 => { 'text' => $locale->text('Required by'), },
792
    'reqdate'                 => { 'text' => $form->{type} =~ /_order/ ? $locale->text('Required by') : $locale->text('Valid until') },
790 793
    'id'                      => { 'text' => $locale->text('ID'), },
791 794
    'ordnumber'               => { 'text' => $locale->text('Order'), },
792 795
    'quonumber'               => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
doc/changelog
167 167
  1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098 1100 1101 1108
168 168
  1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155
169 169
  1164 1173 1177 1186 1188 1190 1191 1195 1197 1198 1199 1200 1201 1209 1213
170
  1243 1248 1250 1262 1286 1287 1289
170
  1243 1248 1250 1262 1286 1287 1289 1294
171 171

  
172 172

  
173 173
2009-06-02 - Version 2.6.0
locale/de/login
338 338
  'USt-IdNr.'                   => 'USt-IdNr.',
339 339
  'Unit'                        => 'Einheit',
340 340
  'Unknown dependency \'%s\'.'  => 'Unbekannte Abhängigkeit \'%s\'.',
341
  'Valid until'                 => 'g?ltig bis',
341 342
  'Value'                       => 'Wert',
342 343
  'Variable'                    => 'Variable',
343 344
  'Vendor'                      => 'Lieferant',
locale/de/oe
311 311
  'USt-IdNr.'                   => 'USt-IdNr.',
312 312
  'Unit'                        => 'Einheit',
313 313
  'Unknown dependency \'%s\'.'  => 'Unbekannte Abhängigkeit \'%s\'.',
314
  'Valid until'                 => 'g?ltig bis',
314 315
  'Value'                       => 'Wert',
315 316
  'Variable'                    => 'Variable',
316 317
  'Vendor'                      => 'Lieferant',
locale/de/todo
334 334
  'USt-IdNr.'                   => 'USt-IdNr.',
335 335
  'Unit'                        => 'Einheit',
336 336
  'Unknown dependency \'%s\'.'  => 'Unbekannte Abhängigkeit \'%s\'.',
337
  'Valid until'                 => 'g?ltig bis',
337 338
  'Value'                       => 'Wert',
338 339
  'Variable'                    => 'Variable',
339 340
  'Vendor'                      => 'Lieferant',
templates/webpages/oe/search_de.html
1 1
[%- USE HTML %]
2
[%- USE T8 %]
2 3
[%- SET vclabel = vc == 'customer' ? 'Kunde' : 'Lieferant' %]
3 4
[%- SET vcnumberlabel = vc == 'customer' ? 'Kundennummer' : 'Lieferantennummer' %]
4 5
<body>
......
100 101
     </td>
101 102
    </tr>
102 103
    <tr>
103
     <th align="right">Auftragsdatum Von</th>
104
     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
104 105
     <td>
105
      <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
106
      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
106 107
      <input type="button" name="transdatefrom" id="trigger3" value="?">
107 108
     </td>
108 109
     <th align="right">bis</th>
......
112 113
     </td>
113 114
    </tr>
114 115
    <tr>
115
     <th align="right">Lieferdatum Von</th>
116
     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
116 117
     <td>
117 118
      <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
118 119
      <input type=button name=reqdatefrom id="trigger5" value=?>
......
166 167
        </td>
167 168
        <td>
168 169
         <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
169
         <label for="l_reqdate">Lieferdatum</label>
170
         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
170 171
        </td>
171 172
       </tr>
172 173
       <tr>
templates/webpages/oe/search_master.html
1 1
[%- USE HTML %]
2
[%- USE T8 %]
2 3
[%- SET vclabel = vc == 'customer' ? '<translate>Customer</translate>' : '<translate>Vendor</translate>' %]
3 4
[%- SET vcnumberlabel = vc == 'customer' ? '<translate>Customer Number</translate>' : '<translate>Vendor Number</translate>' %]
4 5
<body>
......
100 101
     </td>
101 102
    </tr>
102 103
    <tr>
103
     <th align="right"><translate>Order Date</translate> <translate>From</translate></th>
104
     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
104 105
     <td>
105
      <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
106
      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
106 107
      <input type="button" name="transdatefrom" id="trigger3" value="?">
107 108
     </td>
108 109
     <th align="right"><translate>Bis</translate></th>
......
112 113
     </td>
113 114
    </tr>
114 115
    <tr>
115
     <th align="right"><translate>Delivery Date</translate> <translate>From</translate></th>
116
     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
116 117
     <td>
117 118
      <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
118 119
      <input type=button name=reqdatefrom id="trigger5" value=?>
......
166 167
        </td>
167 168
        <td>
168 169
         <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
169
         <label for="l_reqdate"><translate>Required by</translate></label>
170
         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
170 171
        </td>
171 172
       </tr>
172 173
       <tr>

Auch abrufbar als: Unified diff