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

Siehe Commit: 7bff84cbc6daa65a74b9f5c83415c98856eb30a1

diff --git a/SL/CT.pm b/SL/CT.pm
index 45745f42dae59831aa111e8129970a099ef1851f..fbdd4ba11a66d6c5043de6e431f07ad1f09d0bbe 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -363,7 +363,7 @@ sub save_customer {
     $form->{c_vendor_id},
     conv_i($form->{klass}),
     substr($form->{currency}, 0, 3),
     $form->{c_vendor_id},
     conv_i($form->{klass}),
     substr($form->{currency}, 0, 3),

-    $form->{taxincluded_checked},
+    $form->{taxincluded_checked} ne '' ? $form->{taxincluded_checked} : undef,

     $form->{id}
     );
   do_query( $form, $dbh, $query, @values );
     $form->{id}
     );
   do_query( $form, $dbh, $query, @values );

diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm
index a1d1dec5f157e00c2b7333dab397f72705ffdbb3..51779f377433f8a534fe0053de88592b95028e19 100644 (file)
--- a/SL/DB/MetaSetup/Customer.pm
+++ b/SL/DB/MetaSetup/Customer.pm
@@ -54,7 +54,7 @@ __PACKAGE__->meta->setup(
     bic                 => { type => 'varchar', length => 100 },
     direct_debit        => { type => 'boolean', default => 'false' },
     curr                => { type => 'character', length => 3 },
     bic                 => { type => 'varchar', length => 100 },
     direct_debit        => { type => 'boolean', default => 'false' },
     curr                => { type => 'character', length => 3 },

-    taxincluded_checked => { type => 'varchar', length => 1 },
+    taxincluded_checked => { type => 'boolean' },

   ],
 
   primary_key_columns => [ 'id' ],
   ],
 
   primary_key_columns => [ 'id' ],

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 9d48cf2d8c42d15b19a27eb894ccf19c2fadc8a6..20b497c313eb5bf6968282931ba8a1df615f6fe1 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -408,13 +408,7 @@ sub form_footer {
   IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
 
   if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
   IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
 
   if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {

-    if ( $form->{taxincluded_checked} eq 'y' ) {
-      $form->{taxincluded} = 1;
-    } elsif ( $form->{taxincluded_checked} eq 'n' ) {
-      $form->{taxincluded} = 0;
-    } else {
-      $form->{taxincluded} = $myconfig{taxincluded_checked};
-    }
+    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};

   }
 
   foreach my $item (@{ $form->{taxaccounts_array} }) {
   }
 
   foreach my $item (@{ $form->{taxaccounts_array} }) {

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 72ad0d79930fd63915b196032a1b993cbe1fc9e6..4eab4dce345384123db7b1699349984cec85f3d9 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -478,13 +478,7 @@ sub form_footer {
   IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
 
   if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
   IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
 
   if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {

-    if ( $form->{taxincluded_checked} eq 'y' ) {
-      $form->{taxincluded} = 1;
-    } elsif ( $form->{taxincluded_checked} eq 'n' ) {
-      $form->{taxincluded} = 0;
-    } else {
-      $form->{taxincluded} = $myconfig{taxincluded_checked};
-    }
+    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};

   }
 
   if (!$form->{taxincluded}) {
   }
 
   if (!$form->{taxincluded}) {

diff --git a/sql/Pg-upgrade2/customer_add_taxincluded_checked_2.sql b/sql/Pg-upgrade2/customer_add_taxincluded_checked_2.sql
new file mode 100644 (file)
index 0000000..900eee0
--- /dev/null
+++ b/sql/Pg-upgrade2/customer_add_taxincluded_checked_2.sql
@@ -0,0 +1,8 @@
+-- @tag: customer_add_taxincluded_checked_2
+-- @description: Datentype von taxincluded_checked ändern
+-- @encoding: utf-8
+-- @depends: customer_add_taxincluded_checked
+
+ALTER TABLE customer DROP COLUMN taxincluded_checked;
+
+ALTER TABLE customer ADD COLUMN taxincluded_checked boolean;

diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
index d2e5c3508643e72fe1eb5ce768009a1bb4bfc925..26e71b13957fc6bab38ece75676e8ab89be4b2a0 100644 (file)
--- a/templates/webpages/ct/form_header.html
+++ b/templates/webpages/ct/form_header.html
@@ -285,7 +285,7 @@
 
      <tr>
       <td>[% 'taxincluded checked' | $T8 %]</td>
 
      <tr>
       <td>[% 'taxincluded checked' | $T8 %]</td>

-      <td>[% L.select_tag('taxincluded_checked', [[undef, LxERP.t8('use user config')], ['y', LxERP.t8('Yes')], ['n', LxERP.t8('No')]], default = taxincluded_checked) %]</td>
+      <td>[% L.select_tag('taxincluded_checked', [[undef, LxERP.t8('use user config')], ['1', LxERP.t8('Yes')], ['0', LxERP.t8('No')]], default = taxincluded_checked) %]</td>

      </tr>
     </table>
 
      </tr>
     </table>