Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 880122f8

Von Bernd Bleßmann vor etwa 11 Jahren hinzugefügt

  • ID 880122f8e55b8817d0e7c59bece8f3a556e49d49
  • Vorgänger f6b3cfa6
  • Nachfolger 5ef8b310

Rabatt in Kunden-/Lieferanten-Bericht mit aufnehmen können.

Unterschiede anzeigen:

SL/CT.pm
634 634
      "zipcode"            => "ct.zipcode",
635 635
      "city"               => "ct.city",
636 636
      "country"            => "ct.country",
637
      "discount"           => "ct.discount",
637 638
      "salesman"           => "e.name"
638 639
    );
639 640

  
......
649 650
  }
650 651
  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
651 652

  
652
  if ($sortorder !~ /(business|id)/ && !$join_records) {
653
  if ($sortorder !~ /(business|id|discount)/ && !$join_records) {
653 654
    $sortorder  = "lower($sortorder) ${sortdir}";
654 655
  } else {
655 656
    $sortorder .= " ${sortdir}";
bin/mozilla/ct.pl
170 170
  }
171 171

  
172 172
  my @columns = (
173
    'id',        'name',      "$form->{db}number",   'contact',   'phone',
173
    'id',        'name',      "$form->{db}number",   'contact',   'phone',    'discount',
174 174
    'fax',       'email',     'taxnumber',           'street',    'zipcode' , 'city',
175 175
    'business',  'invnumber', 'ordnumber',           'quonumber', 'salesman', 'country'
176 176
  );
......
200 200
    'city'              => { 'text' => $locale->text('City'), },
201 201
    'country'           => { 'text' => $locale->text('Country'), },
202 202
    'salesman'          => { 'text' => $locale->text('Salesman'), },
203
    'discount'          => { 'text' => $locale->text('Discount'), },
203 204
    %column_defs_cvars,
204 205
  );
205 206

  
......
268 269

  
269 270
    if ($ref->{id} ne $previous_id) {
270 271
      $previous_id = $ref->{id};
272
      $ref->{discount} = $form->format_amount(\%myconfig, $ref->{discount} * 100.0, 2);
271 273
      map { $row->{$_}->{data} = $ref->{$_} } @columns;
272 274

  
273 275
      $row->{name}->{link}  = build_std_url('script=controller.pl', 'action=CustomerVendor/edit', 'id=' . E($ref->{id}), 'callback', @hidden_nondefault);
templates/webpages/ct/search.html
154 154
        <label for="l_country">[% 'Country' | $T8 %]</label>
155 155
      </td>
156 156
      </tr>
157
      [% IF IS_CUSTOMER %]
158 157
      <tr>
159 158
       <td>
160
        <input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y">
161
        <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
159
        <input name="l_discount" id="l_discount" type="checkbox" class="checkbox" value="Y">
160
        <label for="l_discount">[% 'Discount' | $T8 %]</label>
162 161
       </td>
163
      </tr>
162
      [% IF IS_CUSTOMER %]
163
      <td>
164
       <input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y">
165
       <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
166
      </td>
164 167
      [% END %]
168
      </tr>
165 169

  
166 170
      [% CUSTOM_VARIABLES_INCLUSION_CODE %]
167 171

  

Auch abrufbar als: Unified diff