Merge branch 'lieferschein-auslager-vorbelegung-loeschen-wenn-nicht-im-lager-2379'

diff --git a/SL/AM.pm b/SL/AM.pm
index 3fdf175..8b2d7b2 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1643,7 +1643,7 @@ sub save_tax {
   $chart_categories .= 'E' if $form->{expense};
   $chart_categories .= 'C' if $form->{costs};
 
-  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id}, $chart_categories);
+  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, conv_i($form->{chart_id}), conv_i($form->{chart_id}), $chart_categories);
   if ($form->{id} ne "") {
     $query = qq|UPDATE tax SET
                   taxkey         = ?,
@@ -1670,7 +1670,7 @@ sub save_tax {
   }
   push(@values, $form->{id});
   do_query($form, $dbh, $query, @values);
-  
+
   foreach my $language_id (keys %{ $form->{translations} }) {
     GenericTranslations->save('dbh'              => $dbh,
                               'translation_type' => 'SL::DB::Tax/taxdescription',

diff --git a/SL/WH.pm b/SL/WH.pm
index 3087dff..7e4d519 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -38,6 +38,9 @@ use SL::AM;
 use SL::DBUtils;
 use SL::Form;
 
+use SL::DB::Unit;
+use SL::DB::Assembly;
+
 use warnings;
 use strict;
 
@@ -158,6 +161,17 @@ sub transfer_assembly {
   my %params   = @_;
   Common::check_params(\%params, qw(assembly_id dst_warehouse_id login qty unit dst_bin_id chargenumber bestbefore comment));
 
+
+  my $unit = SL::DB::Manager::Unit->find_by(name => $params{unit});        
+  if ($unit) {
+    my $assembly = SL::DB::Manager::Assembly->get_all(
+      query => [ id => $params{assembly_id} ],
+      with_objects => ['part'],
+      limit => 1,
+    )->[0];
+    $params{qty} = $unit->convert_to($params{qty}, $assembly->part->unit_obj);
+  }
+
 #  my $maxcreate=WH->check_assembly_max_create(assembly_id =>$params{'assembly_id'}, dbh => $my_dbh);
 
   my $myconfig = \%main::myconfig;

diff --git a/templates/webpages/am/edit_tax.html b/templates/webpages/am/edit_tax.html
index 83a10c4..cb86eb2 100644 (file)
--- a/templates/webpages/am/edit_tax.html
+++ b/templates/webpages/am/edit_tax.html
@@ -41,7 +41,7 @@
 
    <tr>
     <td>[% 'tax_chartaccno' | $T8 %]</td>
-    <td><select name="chart_id"><option value="0">[% 'None' | $T8 %]</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
+    <td><select name="chart_id"><option value="">[% 'None' | $T8 %]</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
    </tr>
 
     <td>[% 'Account categories' | $T8 %]</td>