Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 7f596996

Von Thomas Heck vor etwa 12 Jahren hinzugefügt

  • ID 7f596996a8925fb6fa32c51f9dd4c32a24728c99
  • Vorgänger af0023e0
  • Nachfolger 5249f40a

Umstellung der Kunden-Eigenschaft '"Steuer im Preis inbegriffen" als Default' auf den Datentyp boolean.

Siehe Commit: 7bff84cbc6daa65a74b9f5c83415c98856eb30a1

Unterschiede anzeigen:

SL/CT.pm
363 363
    $form->{c_vendor_id},
364 364
    conv_i($form->{klass}),
365 365
    substr($form->{currency}, 0, 3),
366
    $form->{taxincluded_checked},
366
    $form->{taxincluded_checked} ne '' ? $form->{taxincluded_checked} : undef,
367 367
    $form->{id}
368 368
    );
369 369
  do_query( $form, $dbh, $query, @values );
SL/DB/MetaSetup/Customer.pm
54 54
    bic                 => { type => 'varchar', length => 100 },
55 55
    direct_debit        => { type => 'boolean', default => 'false' },
56 56
    curr                => { type => 'character', length => 3 },
57
    taxincluded_checked => { type => 'varchar', length => 1 },
57
    taxincluded_checked => { type => 'boolean' },
58 58
  ],
59 59

  
60 60
  primary_key_columns => [ 'id' ],
bin/mozilla/is.pl
408 408
  IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
409 409

  
410 410
  if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
411
    if ( $form->{taxincluded_checked} eq 'y' ) {
412
      $form->{taxincluded} = 1;
413
    } elsif ( $form->{taxincluded_checked} eq 'n' ) {
414
      $form->{taxincluded} = 0;
415
    } else {
416
      $form->{taxincluded} = $myconfig{taxincluded_checked};
417
    }
411
    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
418 412
  }
419 413

  
420 414
  foreach my $item (@{ $form->{taxaccounts_array} }) {
bin/mozilla/oe.pl
478 478
  IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
479 479

  
480 480
  if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
481
    if ( $form->{taxincluded_checked} eq 'y' ) {
482
      $form->{taxincluded} = 1;
483
    } elsif ( $form->{taxincluded_checked} eq 'n' ) {
484
      $form->{taxincluded} = 0;
485
    } else {
486
      $form->{taxincluded} = $myconfig{taxincluded_checked};
487
    }
481
    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
488 482
  }
489 483

  
490 484
  if (!$form->{taxincluded}) {
sql/Pg-upgrade2/customer_add_taxincluded_checked_2.sql
1
-- @tag: customer_add_taxincluded_checked_2
2
-- @description: Datentype von taxincluded_checked ändern
3
-- @encoding: utf-8
4
-- @depends: customer_add_taxincluded_checked
5

  
6
ALTER TABLE customer DROP COLUMN taxincluded_checked;
7

  
8
ALTER TABLE customer ADD COLUMN taxincluded_checked boolean;
templates/webpages/ct/form_header.html
285 285

  
286 286
     <tr>
287 287
      <td>[% 'taxincluded checked' | $T8 %]</td>
288
      <td>[% L.select_tag('taxincluded_checked', [[undef, LxERP.t8('use user config')], ['y', LxERP.t8('Yes')], ['n', LxERP.t8('No')]], default = taxincluded_checked) %]</td>
288
      <td>[% L.select_tag('taxincluded_checked', [[undef, LxERP.t8('use user config')], ['1', LxERP.t8('Yes')], ['0', LxERP.t8('No')]], default = taxincluded_checked) %]</td>
289 289
     </tr>
290 290
    </table>
291 291

  

Auch abrufbar als: Unified diff