Vorauswahl der Sprache fuer Kunden in defaults

diff --git a/SL/AM.pm b/SL/AM.pm
index 1501b22e7146994b0cf52004717ea0e3f9fd483e..ab983b75797aaf2e0ff47dbfa27f45cbb939a953 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1065,7 +1065,8 @@ sub save_defaults {
         pdonumber          = ?,
         curr               = ?,
         businessnumber     = ?,
         pdonumber          = ?,
         curr               = ?,
         businessnumber     = ?,

-        weightunit         = ?|;
+        weightunit         = ?,
+        language_id        = ?|;

   my @values = ($accnos{inventory_accno}, $accnos{income_accno}, $accnos{expense_accno},
                 $accnos{fxgain_accno},    $accnos{fxloss_accno}, $accnos{ar_paid_accno},
                 $form->{invnumber},       $form->{cnnumber},
   my @values = ($accnos{inventory_accno}, $accnos{income_accno}, $accnos{expense_accno},
                 $accnos{fxgain_accno},    $accnos{fxloss_accno}, $accnos{ar_paid_accno},
                 $form->{invnumber},       $form->{cnnumber},


@@ -1075,7 +1076,8 @@ sub save_defaults {
                 $form->{articlenumber},   $form->{servicenumber},
                 $form->{sdonumber},       $form->{pdonumber},
                 $currency,
                 $form->{articlenumber},   $form->{servicenumber},
                 $form->{sdonumber},       $form->{pdonumber},
                 $currency,

-                $form->{businessnumber},  $form->{weightunit});
+                $form->{businessnumber},  $form->{weightunit},
+                $form->{language_id});

   do_query($form, $dbh, $query, @values);
 
   $dbh->commit();
   do_query($form, $dbh, $query, @values);
 
   $dbh->commit();

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 7406c22f8eed6830e2876410a62d3077ad04581f..53ecc68e9b7924ec53883c0d4f11ff5e93a192a4 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -46,6 +46,7 @@ __PACKAGE__->meta->setup(
     accounting_method          => { type => 'text' },
     inventory_system           => { type => 'text' },
     profit_determination       => { type => 'text' },
     accounting_method          => { type => 'text' },
     inventory_system           => { type => 'text' },
     profit_determination       => { type => 'text' },

+    language_id                => { type => 'integer' },

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

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 9abf79883f5127cc672663e0fa5956ae83416b91..687314056158976beea5dcf35e6b3c38e332f6e8 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1549,6 +1549,9 @@ sub edit_defaults {
 
   map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
 
 
   map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
 

+  # default language
+  my @ALL_LANGUAGES = SL::DB::Manager::Language->get_all;
+

 # EÜR = cash, Bilanzierung = accrual 
 
   foreach my $key (keys %{ $form->{IC} }) {
 # EÜR = cash, Bilanzierung = accrual 
 
   foreach my $key (keys %{ $form->{IC} }) {


@@ -1568,7 +1571,8 @@ sub edit_defaults {
   $form->{title} = $locale->text('Ranges of numbers and default accounts');
 
   $form->header();
   $form->{title} = $locale->text('Ranges of numbers and default accounts');
 
   $form->header();

-  print $form->parse_html_template('am/edit_defaults');
+  print $form->parse_html_template('am/edit_defaults',
+                                   { ALL_LANGUAGES => @ALL_LANGUAGES, });

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index cdb08529d606d0f23eaf422a812e41ec482d31c9..284f06175ab57b123ae136121dc3ac59a1d14af8 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -50,6 +50,7 @@ use POSIX qw(strftime);
 use SL::CT;
 use SL::CVar;
 use SL::DB::Business;
 use SL::CT;
 use SL::CVar;
 use SL::DB::Business;

+use SL::DB::Default;

 use SL::ReportGenerator;
 
 require "bin/mozilla/common.pl";
 use SL::ReportGenerator;
 
 require "bin/mozilla/common.pl";


@@ -336,6 +337,13 @@ sub form_header {
 
   $form->{NOTES} ||= [ ];
 
 
   $form->{NOTES} ||= [ ];
 

+  if (!$form->{'language_id'}) {
+    my $l_id = SL::DB::Default->get->{'language_id'};
+    if ($l_id) {
+      $form->{'default_language_id'} = $l_id;
+    }
+  }
+

   $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'CT', 'trans_id' => $form->{id});
 
   CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
   $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'CT', 'trans_id' => $form->{id});
 
   CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });

diff --git a/sql/Pg-upgrade2/defaults_add_language_id.sql b/sql/Pg-upgrade2/defaults_add_language_id.sql
new file mode 100644 (file)
index 0000000..7376a4e
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_add_language_id.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_add_language_id
+-- @description: Id der Standardsprache in defaults speichern
+-- @depends: release_2_6_2
+-- @charset: utf-8
+ALTER TABLE defaults ADD COLUMN language_id integer;

diff --git a/templates/webpages/am/edit_defaults.html b/templates/webpages/am/edit_defaults.html
index 8829ba60c792165f0c3be2c904ec3982d384b0ac..d8aee75354ff0696d54aaa9e592080707fa2a327 100644 (file)
--- a/templates/webpages/am/edit_defaults.html
+++ b/templates/webpages/am/edit_defaults.html
@@ -156,6 +156,20 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+     <th align="right">[% 'Language' | $T8 %]</th>
+     <td>
+      [%- INCLUDE 'generic/multibox.html'
+           name          = 'language_id',
+           default       = defaults_language_id,
+           style         = 'size:20; maxength:5',
+           DATA          = ALL_LANGUAGES,
+           id_key        = 'id',
+           label_key     = 'description',
+           -%]
+      </td>
+    </tr>
+

     <tr class="listheading">
      <th colspan="4">[% 'Configuration' | $T8 %]</th>
     </tr>
     <tr class="listheading">
      <th colspan="4">[% 'Configuration' | $T8 %]</th>
     </tr>

diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
index 91d863678a1d0307318186b7aea5cb5ff0b9d276..796f2a3ba9d2dbfe0a8086c48252c2c83115c8c9 100644 (file)
--- a/templates/webpages/ct/form_header.html
+++ b/templates/webpages/ct/form_header.html
@@ -231,6 +231,7 @@
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'language_id',
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'language_id',

+             default    = default_language_id,

              DATA       = languages,
              show_empty = 1,
              id_key     = 'id',
              DATA       = languages,
              show_empty = 1,
              id_key     = 'id',