Steuernamen übersetztbar gemacht.

diff --git a/SL/AM.pm b/SL/AM.pm
index adb240d280dee0be791c9e0a18f11040dfbd83a0..3fdf175cdb83015088707d53a2ea25dcc7b10932 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -45,6 +45,7 @@ use SL::DBUtils;
 use SL::DB::AuthUser;
 use SL::DB::Default;
 use SL::DB::Employee;
 use SL::DB::AuthUser;
 use SL::DB::Default;
 use SL::DB::Employee;

+use SL::GenericTranslations;

 
 use strict;
 
 
 use strict;
 


@@ -1652,21 +1653,31 @@ sub save_tax {
                   taxnumber      = (SELECT accno FROM chart WHERE id= ? ),
                   chart_categories = ?
                 WHERE id = ?|;
                   taxnumber      = (SELECT accno FROM chart WHERE id= ? ),
                   chart_categories = ?
                 WHERE id = ?|;

-    push(@values, $form->{id});

 
   } else {
     #ok
 
   } else {
     #ok

+    ($form->{id}) = selectfirst_array_query($form, $dbh, qq|SELECT nextval('id')|);

     $query = qq|INSERT INTO tax (
                   taxkey,
                   taxdescription,
                   rate,
                   chart_id,
                   taxnumber,
     $query = qq|INSERT INTO tax (
                   taxkey,
                   taxdescription,
                   rate,
                   chart_id,
                   taxnumber,

-                  chart_categories
+                  chart_categories,
+                  id

                 )
                 )

-                VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ? )|;
+                VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ?, ?)|;

   }
   }

+  push(@values, $form->{id});

   do_query($form, $dbh, $query, @values);
   do_query($form, $dbh, $query, @values);

+  
+  foreach my $language_id (keys %{ $form->{translations} }) {
+    GenericTranslations->save('dbh'              => $dbh,
+                              'translation_type' => 'SL::DB::Tax/taxdescription',
+                              'translation_id'   => $form->{id},
+                              'language_id'      => $language_id,
+                              'translation'      => $form->{translations}->{$language_id});
+  }

 
   $dbh->commit();
 
 
   $dbh->commit();
 

diff --git a/SL/DB/Tax.pm b/SL/DB/Tax.pm
index 0279dbf745fa977e0ea9e100248fb9d42c30049c..c027061fb5ae6846218db4f2c3fcc077ee76fbf4 100644 (file)
--- a/SL/DB/Tax.pm
+++ b/SL/DB/Tax.pm
@@ -3,6 +3,7 @@ package SL::DB::Tax;
 use strict;
 
 use SL::DB::MetaSetup::Tax;
 use strict;
 
 use SL::DB::MetaSetup::Tax;

+use SL::DB::Helper::TranslatedAttributes;

 
 __PACKAGE__->meta->initialize;
 
 
 __PACKAGE__->meta->initialize;
 

diff --git a/SL/IS.pm b/SL/IS.pm
index 372e533e386091f3c2d93ce47d8fb4e9d3fe0a08..cfaf730e8bc523e33efaea4365d3cc7c18969a10 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -49,6 +49,7 @@ use SL::IC;
 use SL::IO;
 use SL::TransNumber;
 use SL::DB::Default;
 use SL::IO;
 use SL::TransNumber;
 use SL::DB::Default;

+use SL::DB::Tax;

 use Data::Dumper;
 
 use strict;
 use Data::Dumper;
 
 use strict;


@@ -386,8 +387,11 @@ sub invoice_details {
     push(@{ $form->{TEMPLATE_ARRAYS}->{tax_nofmt} },      $taxamount );
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate} },        $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate_nofmt} },  $form->{"${item}_rate"} * 100);
     push(@{ $form->{TEMPLATE_ARRAYS}->{tax_nofmt} },      $taxamount );
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate} },        $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate_nofmt} },  $form->{"${item}_rate"} * 100);

-    push(@{ $form->{TEMPLATE_ARRAYS}->{taxdescription} }, $form->{"${item}_description"} . q{ } . 100 * $form->{"${item}_rate"} . q{%});

     push(@{ $form->{TEMPLATE_ARRAYS}->{taxnumber} },      $form->{"${item}_taxnumber"});
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxnumber} },      $form->{"${item}_taxnumber"});

+
+    my $tax_obj     = SL::DB::Manager::Tax->find_by(taxnumber => $form->{"${item}_taxnumber"});
+    my $description = $tax_obj->translated_attribute('taxdescription',  $form->{language_id}, 0) if $tax_obj;
+    push(@{ $form->{TEMPLATE_ARRAYS}->{taxdescription} }, $description . q{ } . 100 * $form->{"${item}_rate"} . q{%});

   }
 
   for my $i (1 .. $form->{paidaccounts}) {
   }
 
   for my $i (1 .. $form->{paidaccounts}) {

diff --git a/SL/OE.pm b/SL/OE.pm
index 683bb0e7ca9bde55dae066b77044b85345ac8c55..12cbb8aa126d1aa36636415e24727363a04d2ce1 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -43,6 +43,7 @@ use SL::CVar;
 use SL::DB::Order;
 use SL::DB::PeriodicInvoicesConfig;
 use SL::DB::Status;
 use SL::DB::Order;
 use SL::DB::PeriodicInvoicesConfig;
 use SL::DB::Status;

+use SL::DB::Tax;

 use SL::DBUtils;
 use SL::IC;
 
 use SL::DBUtils;
 use SL::IC;
 


@@ -1284,8 +1285,11 @@ sub order_details {
     push(@{ $form->{TEMPLATE_ARRAYS}->{tax_nofmt} },      $taxamount);
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate} },        $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate_nofmt} },  $form->{"${item}_rate"} * 100);
     push(@{ $form->{TEMPLATE_ARRAYS}->{tax_nofmt} },      $taxamount);
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate} },        $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate_nofmt} },  $form->{"${item}_rate"} * 100);

-    push(@{ $form->{TEMPLATE_ARRAYS}->{taxdescription} }, $form->{"${item}_description"} . q{ } . 100 * $form->{"${item}_rate"} . q{%});

     push(@{ $form->{TEMPLATE_ARRAYS}->{taxnumber} },      $form->{"${item}_taxnumber"});
     push(@{ $form->{TEMPLATE_ARRAYS}->{taxnumber} },      $form->{"${item}_taxnumber"});

+
+    my $tax_obj     = SL::DB::Manager::Tax->find_by(taxnumber => $form->{"${item}_taxnumber"});
+    my $description = $tax_obj->translated_attribute('taxdescription',  $form->{language_id}, 0) if $tax_obj;
+    push(@{ $form->{TEMPLATE_ARRAYS}->{taxdescription} }, $description . q{ } . 100 * $form->{"${item}_rate"} . q{%});

   }
 
   $form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
   }
 
   $form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 8a487603393010ebd4cc5a15e3b8458d3586e5d3..e12c1ea51b9b18e77913b2018c81d586943dfae0 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -43,6 +43,8 @@ use SL::USTVA;
 use SL::Iconv;
 use SL::TODO;
 use SL::DB::Printer;
 use SL::Iconv;
 use SL::TODO;
 use SL::DB::Printer;

+use SL::DB::Tax;
+use SL::DB::Language;

 use CGI;
 
 require "bin/mozilla/common.pl";
 use CGI;
 
 require "bin/mozilla/common.pl";


@@ -1415,6 +1417,7 @@ sub add_tax {
 
   my $parameters_ref = {
 #    ChartTypeIsAccount         => $ChartTypeIsAccount,
 
   my $parameters_ref = {
 #    ChartTypeIsAccount         => $ChartTypeIsAccount,

+    LANGUAGES => SL::DB::Manager::Language->get_all_sorted,

   };
 
   # Ausgabe des Templates
   };
 
   # Ausgabe des Templates


@@ -1450,6 +1453,8 @@ sub edit_tax {
   $form->header();
 
   my $parameters_ref = {
   $form->header();
 
   my $parameters_ref = {

+    LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
+    TAX       => SL::DB::Manager::Tax->find_by(id => $form->{id}),

   };
 
   # Ausgabe des Templates
   };
 
   # Ausgabe des Templates


@@ -1528,6 +1533,9 @@ sub save_tax {
     $form->error($locale->text('Tax Percent is a number between 0 and 100'));
   }
 
     $form->error($locale->text('Tax Percent is a number between 0 and 100'));
   }
 

+  my @translation_keys  =  grep { $_ =~ '^translation_\d+' } keys %$form;
+  $form->{translations} = { map { $_ =~ '^translation_(\d+)'; $1 => $form->{$_} } @translation_keys };
+

   AM->save_tax(\%myconfig, \%$form);
   $form->redirect($locale->text('Tax saved!'));
 
   AM->save_tax(\%myconfig, \%$form);
   $form->redirect($locale->text('Tax saved!'));
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index dc47d27faa6dcc7c6592dee1c2402e316d568431..b9b32bfaadff7541a926760f5e22beca4c2064b8 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -442,7 +442,7 @@ sub form_header {
         shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
         message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus),
         @custom_hiddens,
         shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
         message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus),
         @custom_hiddens,

-        map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} ];  # deleted: discount
+        map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ];  # deleted: discount

 
   %TMPL_VAR = (
      %TMPL_VAR,
 
   %TMPL_VAR = (
      %TMPL_VAR,

diff --git a/templates/webpages/am/edit_tax.html b/templates/webpages/am/edit_tax.html
index f7e7cf9e1d194b5f5388e2e75588968b908238a2..83a10c428e62245f53f2cc9d209c7df9d73b1139 100644 (file)
--- a/templates/webpages/am/edit_tax.html
+++ b/templates/webpages/am/edit_tax.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE L %]
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE L %]

+[%- USE LxERP %]

  <form method="post" action="am.pl">
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
   <input type="hidden" name="type" value="tax">
  <form method="post" action="am.pl">
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
   <input type="hidden" name="type" value="tax">


@@ -21,6 +22,15 @@
     <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
    </tr>
 
     <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
    </tr>
 

+   [%- FOREACH language = LANGUAGES %]
+    <tr>
+     <td>[%- HTML.escape(language.description) %] ([%- LxERP.t8('Translation') %])</td>
+     <td>
+      <input name="translation_[% language.id %]" value="[%- HTML.escape(TAX.translated_attribute('taxdescription', language, 1)) %]" size="60">
+     </td>
+    </tr>
+   [%- END %]
+

    <tr>
     <td>[% 'tax_percent' | $T8 %]</td>
     <td>[% IF tax_already_used %]<p>[% HTML.escape(rate) %] %</p>
    <tr>
     <td>[% 'tax_percent' | $T8 %]</td>
     <td>[% IF tax_already_used %]<p>[% HTML.escape(rate) %] %</p>