PriceSource: Priorität auf Preisquellenebene verstehen und umsetzen.

[mfinanz.git] / SL / IC.pm

diff --git a/SL/IC.pm b/SL/IC.pm
index f39c169b299411b8b1eb52cfa78778d4e91de8a3..27af46a50085d766bc0600f91f41982200fda192 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -40,6 +40,7 @@ use YAML;
 
 use SL::CVar;
 use SL::DBUtils;
 
 use SL::CVar;
 use SL::DBUtils;

+use SL::HTML::Restrict;

 use SL::TransNumber;
 
 use strict;
 use SL::TransNumber;
 
 use strict;


@@ -50,7 +51,7 @@ sub get_part {
   my ($self, $myconfig, $form) = @_;
 
   # connect to db
   my ($self, $myconfig, $form) = @_;
 
   # connect to db

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   my $sth;
 
 
   my $sth;
 


@@ -146,30 +147,13 @@ SQL
   }
 
   # get translations
   }
 
   # get translations

-  $form->{language_values} = "";

   $query = qq|SELECT language_id, translation, longdescription
               FROM translation
               WHERE parts_id = ?|;
   $query = qq|SELECT language_id, translation, longdescription
               FROM translation
               WHERE parts_id = ?|;

-  my $trq = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
-  while (my $tr = $trq->fetchrow_hashref("NAME_lc")) {
-    $form->{language_values} .= "---+++---" . join('--++--', @{$tr}{qw(language_id translation longdescription)});
-  }
-  $trq->finish;
-
-  # now get accno for taxes
-  $query =
-    qq|SELECT c.accno
-       FROM chart c, partstax pt
-       WHERE (pt.chart_id = c.id) AND (pt.parts_id = ?)|;
-  $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
-  while (my ($key) = $sth->fetchrow_array) {
-    $form->{amount}{$key} = $key;
-  }
-
-  $sth->finish;
+  $form->{translations} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));

 
   # is it an orphan
 
   # is it an orphan

-  my @referencing_tables = qw(invoice orderitems inventory rmaitems);
+  my @referencing_tables = qw(invoice orderitems inventory);

   my %column_map         = ( );
   my $parts_id           = conv_i($form->{id});
 
   my %column_map         = ( );
   my $parts_id           = conv_i($form->{id});
 


@@ -188,7 +172,7 @@ SQL
 
   $form->{"unit_changeable"} = $form->{orphaned};
 
 
   $form->{"unit_changeable"} = $form->{orphaned};
 

-  $dbh->disconnect;
+  Common::webdav_folder($form) if $::lx_office_conf{features}{webdav};

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


@@ -198,7 +182,7 @@ sub get_pricegroups {
 
   my ($self, $myconfig, $form) = @_;
 
 
   my ($self, $myconfig, $form) = @_;
 

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   # get pricegroups
   my $query = qq|SELECT id, pricegroup FROM pricegroup ORDER BY lower(pricegroup)|;
 
   # get pricegroups
   my $query = qq|SELECT id, pricegroup FROM pricegroup ORDER BY lower(pricegroup)|;


@@ -216,8 +200,6 @@ sub get_pricegroups {
   #correct rows
   $form->{price_rows} = $i - 1;
 
   #correct rows
   $form->{price_rows} = $i - 1;
 

-  $dbh->disconnect;
-

   $main::lxdebug->leave_sub();
 
   return $pricegroups;
   $main::lxdebug->leave_sub();
 
   return $pricegroups;


@@ -230,7 +212,7 @@ sub retrieve_buchungsgruppen {
 
   my ($query, $sth);
 
 
   my ($query, $sth);
 

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   # get buchungsgruppen
   $query = qq|SELECT id, description FROM buchungsgruppen ORDER BY sortkey|;
 
   # get buchungsgruppen
   $query = qq|SELECT id, description FROM buchungsgruppen ORDER BY sortkey|;


@@ -246,6 +228,7 @@ sub save {
   my @values;
   # connect to database, turn off AutoCommit
   my $dbh = $form->get_standard_dbh;
   my @values;
   # connect to database, turn off AutoCommit
   my $dbh = $form->get_standard_dbh;

+  my $restricter = SL::HTML::Restrict->create;

 
   # save the part
   # make up a unique handle and store in partnumber field
 
   # save the part
   # make up a unique handle and store in partnumber field


@@ -260,7 +243,7 @@ sub save {
   map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) }
     qw(rop weight listprice sellprice gv lastcost);
 
   map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) }
     qw(rop weight listprice sellprice gv lastcost);
 

-  my $makemodel = (($form->{make_1}) || ($form->{model_1})) ? 1 : 0;
+  my $makemodel = ($form->{make_1} || $form->{model_1} || ($form->{makemodel_rows} > 1)) ? 1 : 0;

 
   $form->{assembly} = ($form->{item} eq 'assembly') ? 1 : 0;
 
 
   $form->{assembly} = ($form->{item} eq 'assembly') ? 1 : 0;
 


@@ -295,9 +278,6 @@ sub save {
       do_query($form, $dbh, qq|DELETE FROM assembly WHERE id = ?|, conv_i($form->{id}));
     }
 
       do_query($form, $dbh, qq|DELETE FROM assembly WHERE id = ?|, conv_i($form->{id}));
     }
 

-    # delete tax records
-    do_query($form, $dbh, qq|DELETE FROM partstax WHERE parts_id = ?|, conv_i($form->{id}));
-

     # delete translations
     do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
 
     # delete translations
     do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
 


@@ -321,7 +301,7 @@ sub save {
 
     $form->{orphaned} = 1;
   }
 
     $form->{orphaned} = 1;
   }

-  my $partsgroup_id = 0;
+  my $partsgroup_id = undef;

 
   if ($form->{partsgroup}) {
     (my $partsgroup, $partsgroup_id) = split(/--/, $form->{partsgroup});
 
   if ($form->{partsgroup}) {
     (my $partsgroup, $partsgroup_id) = split(/--/, $form->{partsgroup});


@@ -339,13 +319,15 @@ sub save {
 
   if ($form->{"item"} ne "assembly") {
     $subq_expense =
 
   if ($form->{"item"} ne "assembly") {
     $subq_expense =

-      qq|(SELECT bg.expense_accno_id_0
-          FROM buchungsgruppen bg
-          WHERE bg.id = | . conv_i($form->{"buchungsgruppen_id"}, 'NULL') . qq|)|;
+      qq|(SELECT tc.expense_accno_id
+          FROM taxzone_charts tc
+          WHERE tc.buchungsgruppen_id = | . conv_i($form->{"buchungsgruppen_id"}, 'NULL') . qq| and tc.taxzone_id = 0)|;

   } else {
     $subq_expense = "NULL";
   }
 
   } else {
     $subq_expense = "NULL";
   }
 

+  normalize_text_blocks();
+

   $query =
     qq|UPDATE parts SET
          partnumber = ?,
   $query =
     qq|UPDATE parts SET
          partnumber = ?,


@@ -361,11 +343,12 @@ sub save {
          notes = ?,
          formel = ?,
          rop = ?,
          notes = ?,
          formel = ?,
          rop = ?,

-         bin = ?,
+         warehouse_id = ?,
+         bin_id = ?,

          buchungsgruppen_id = ?,
          payment_id = ?,
          inventory_accno_id = $subq_inventory,
          buchungsgruppen_id = ?,
          payment_id = ?,
          inventory_accno_id = $subq_inventory,

-         income_accno_id = (SELECT bg.income_accno_id_0 FROM buchungsgruppen bg WHERE bg.id = ?),
+         income_accno_id = (SELECT tc.income_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = 0 and tc.buchungsgruppen_id = ?),

          expense_accno_id = $subq_expense,
          obsolete = ?,
          image = ?,
          expense_accno_id = $subq_expense,
          obsolete = ?,
          image = ?,


@@ -390,10 +373,11 @@ sub save {
              $form->{lastcost},
              $form->{weight},
              $form->{unit},
              $form->{lastcost},
              $form->{weight},
              $form->{unit},

-             $form->{notes},
+             $restricter->process($form->{notes}),

              $form->{formel},
              $form->{rop},
              $form->{formel},
              $form->{rop},

-             $form->{bin},
+             conv_i($form->{warehouse_id}),
+             conv_i($form->{bin_id}),

              conv_i($form->{buchungsgruppen_id}),
              conv_i($form->{payment_id}),
              conv_i($form->{buchungsgruppen_id}),
              conv_i($form->{buchungsgruppen_id}),
              conv_i($form->{payment_id}),
              conv_i($form->{buchungsgruppen_id}),


@@ -416,16 +400,17 @@ sub save {
   # delete translation records
   do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
 
   # delete translation records
   do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
 

-  if ($form->{language_values} ne "") {
-    foreach my $item (split(/---\+\+\+---/, $form->{language_values})) {
-      my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item);
-      if ($translation ne "") {
-        $query = qq|INSERT into translation (parts_id, language_id, translation, longdescription)
-                    VALUES ( ?, ?, ?, ? )|;
-        @values = (conv_i($form->{id}), conv_i($language_id), $translation, $longdescription);
-        do_query($form, $dbh, $query, @values);
-      }
+  my @translations = grep { $_->{language_id} && $_->{translation} } @{ $form->{translations} || [] };
+  if (@translations) {
+    $query = qq|INSERT into translation (parts_id, language_id, translation, longdescription)
+                VALUES ( ?, ?, ?, ? )|;
+    $sth   = $dbh->prepare($query);
+
+    foreach my $translation (@translations) {
+      do_statement($form, $sth, $query, conv_i($form->{id}), conv_i($translation->{language_id}), $translation->{translation}, $restricter->process($translation->{longdescription}));

     }
     }

+
+    $sth->finish();

   }
 
   # delete price records
   }
 
   # delete price records


@@ -434,10 +419,9 @@ sub save {
   $query = qq|INSERT INTO prices (parts_id, pricegroup_id, price) VALUES(?, ?, ?)|;
   $sth   = prepare_query($form, $dbh, $query);
 
   $query = qq|INSERT INTO prices (parts_id, pricegroup_id, price) VALUES(?, ?, ?)|;
   $sth   = prepare_query($form, $dbh, $query);
 

-  # insert price records only if different to sellprice

   for my $i (1 .. $form->{price_rows}) {
     my $price = $form->parse_amount($myconfig, $form->{"price_$i"});
   for my $i (1 .. $form->{price_rows}) {
     my $price = $form->parse_amount($myconfig, $form->{"price_$i"});

-    next unless $price && ($price != $form->{sellprice});
+    next unless $price;

 
     @values = (conv_i($form->{id}), conv_i($form->{"pricegroup_id_$i"}), $price);
     do_statement($form, $sth, $query, @values);
 
     @values = (conv_i($form->{id}), conv_i($form->{"pricegroup_id_$i"}), $price);
     do_statement($form, $sth, $query, @values);


@@ -470,19 +454,24 @@ sub save {
       }
     }
 
       }
     }
 

-  # insert taxes
-  foreach my $item (split(/ /, $form->{taxaccounts})) {
-    if ($form->{"IC_tax_$item"}) {
-      $query =
-        qq|INSERT INTO partstax (parts_id, chart_id)
-           VALUES (?, (SELECT id FROM chart WHERE accno = ?))|;
-      @values = (conv_i($form->{id}), $item);
-      do_query($form, $dbh, $query, @values);
-    }
-  }
-

   # add assembly records
   if ($form->{item} eq 'assembly') {
   # add assembly records
   if ($form->{item} eq 'assembly') {

+    # check additional assembly row
+    my $i = $form->{assembly_rows};
+    # if last row is not empty add them
+    if ($form->{"partnumber_$i"} ne "") {
+      $query = qq|SELECT id FROM parts WHERE partnumber = ?|;
+      my ($partid) = selectrow_query($form, $dbh, $query,$form->{"partnumber_$i"} );
+      if ( $partid ) {
+        $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+        $form->{"id_$i"} = $partid;
+        $form->{"bom_$i"} = 0;
+        $form->{assembly_rows}++;
+      }
+      else {
+        $::form->error($::locale->text("uncorrect partnumber ").$form->{"partnumber_$i"});
+      }
+    }

 
     for my $i (1 .. $form->{assembly_rows}) {
       $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
 
     for my $i (1 .. $form->{assembly_rows}) {
       $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});


@@ -495,7 +484,6 @@ sub save {
         do_query($form, $dbh, $query, @values);
       }
     }
         do_query($form, $dbh, $query, @values);
       }
     }

-

     my @a = localtime;
     $a[5] += 1900;
     $a[4]++;
     my @a = localtime;
     $a[5] += 1900;
     $a[4]++;


@@ -575,7 +563,7 @@ sub retrieve_assemblies {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   my $where = qq|NOT p.obsolete|;
   my @values;
 
   my $where = qq|NOT p.obsolete|;
   my @values;


@@ -593,7 +581,7 @@ sub retrieve_assemblies {
   # retrieve assembly items
   my $query =
     qq|SELECT p.id, p.partnumber, p.description,
   # retrieve assembly items
   my $query =
     qq|SELECT p.id, p.partnumber, p.description,

-         p.bin, p.onhand, p.rop,
+              p.onhand, p.rop,

          (SELECT sum(p2.inventory_accno_id)
           FROM parts p2, assembly a
           WHERE (p2.id = a.parts_id) AND (a.id = p.id)) AS inventory
          (SELECT sum(p2.inventory_accno_id)
           FROM parts p2, assembly a
           WHERE (p2.id = a.parts_id) AND (a.id = p.id)) AS inventory


@@ -602,8 +590,6 @@ sub retrieve_assemblies {
 
   $form->{assembly_items} = selectall_hashref_query($form, $dbh, $query, @values);
 
 
   $form->{assembly_items} = selectall_hashref_query($form, $dbh, $query, @values);
 

-  $dbh->disconnect;
-

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


@@ -613,18 +599,17 @@ sub delete {
   my ($self, $myconfig, $form) = @_;
   my @values = (conv_i($form->{id}));
   # connect to database, turn off AutoCommit
   my ($self, $myconfig, $form) = @_;
   my @values = (conv_i($form->{id}));
   # connect to database, turn off AutoCommit

-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   my %columns = ( "assembly" => "id", "parts" => "id" );
 
 
   my %columns = ( "assembly" => "id", "parts" => "id" );
 

-  for my $table (qw(prices partstax makemodel inventory assembly translation parts)) {
+  for my $table (qw(prices makemodel inventory assembly translation parts)) {

     my $column = defined($columns{$table}) ? $columns{$table} : "parts_id";
     do_query($form, $dbh, qq|DELETE FROM $table WHERE $column = ?|, @values);
   }
 
   # commit
   my $rc = $dbh->commit;
     my $column = defined($columns{$table}) ? $columns{$table} : "parts_id";
     do_query($form, $dbh, qq|DELETE FROM $table WHERE $column = ?|, @values);
   }
 
   # commit
   my $rc = $dbh->commit;

-  $dbh->disconnect;

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


@@ -667,7 +652,7 @@ sub assembly_item {
   }
 
   # connect to database
   }
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   my $query =
     qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
 
   my $query =
     qq|SELECT p.id, p.partnumber, p.description, p.sellprice,


@@ -679,8 +664,6 @@ sub assembly_item {
        WHERE $where|;
   $form->{item_list} = selectall_hashref_query($form, $dbh, $query, @values);
 
        WHERE $where|;
   $form->{item_list} = selectall_hashref_query($form, $dbh, $query, @values);
 

-  $dbh->disconnect;
-

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


@@ -697,7 +680,7 @@ sub assembly_item {
 #   partnumber ean description partsgroup microfiche drawing
 #
 # column flags:
 #   partnumber ean description partsgroup microfiche drawing
 #
 # column flags:

-#   l_partnumber l_description l_listprice l_sellprice l_lastcost l_priceupdate l_weight l_unit l_bin l_rop l_image l_drawing l_microfiche l_partsgroup
+#   l_partnumber l_description l_listprice l_sellprice l_lastcost l_priceupdate l_weight l_unit l_rop l_image l_drawing l_microfiche l_partsgroup

 #
 # exclusives:
 #   itemstatus  = active | onhand | short | obsolete | orphaned
 #
 # exclusives:
 #   itemstatus  = active | onhand | short | obsolete | orphaned


@@ -747,7 +730,7 @@ sub all_parts {
   my @apoe_filters         = qw(transdate);
   my @like_filters         = (@simple_filters, @invoice_oi_filters);
   my @all_columns          = (@simple_filters, @makemodel_filters, @apoe_filters, @project_filters, qw(serialnumber));
   my @apoe_filters         = qw(transdate);
   my @like_filters         = (@simple_filters, @invoice_oi_filters);
   my @all_columns          = (@simple_filters, @makemodel_filters, @apoe_filters, @project_filters, qw(serialnumber));

-  my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit bin rop image));
+  my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit rop image));

   my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
   my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module qty);
   my @deliverydate_flags   = qw(deliverydate);
   my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
   my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module qty);
   my @deliverydate_flags   = qw(deliverydate);


@@ -990,7 +973,7 @@ sub all_parts {
 
   my $token_builder = $make_token_builder->(\%joins_needed);
 
 
   my $token_builder = $make_token_builder->(\%joins_needed);
 

-  my @sort_cols    = (@simple_filters, qw(id bin priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate));
+  my @sort_cols    = (@simple_filters, qw(id priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate));

      $form->{sort} = 'id' unless grep { $form->{"l_$_"} } grep { $form->{sort} eq $_ } @sort_cols; # sort by id if unknown or invisible column
   my $sort_order   = ($form->{revers} ? ' DESC' : ' ASC');
   my $order_clause = " ORDER BY " . $token_builder->($form->{sort}) . ($form->{revers} ? ' DESC' : ' ASC');
      $form->{sort} = 'id' unless grep { $form->{"l_$_"} } grep { $form->{sort} eq $_ } @sort_cols; # sort by id if unknown or invisible column
   my $sort_order   = ($form->{revers} ? ' DESC' : ' ASC');
   my $order_clause = " ORDER BY " . $token_builder->($form->{sort}) . ($form->{revers} ? ' DESC' : ' ASC');


@@ -1048,7 +1031,7 @@ sub all_parts {
   if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
     $query =
       qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,
   if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
     $query =
       qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,

-           p.unit, p.bin, p.notes,
+           p.unit, p.notes,

            p.sellprice, p.listprice, p.lastcost,
            p.rop, p.weight, p.priceupdate,
            p.image, p.drawing, p.microfiche,
            p.sellprice, p.listprice, p.lastcost,
            p.rop, p.weight, p.priceupdate,
            p.image, p.drawing, p.microfiche,


@@ -1097,7 +1080,7 @@ SQL
 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();
 

-  return wantarray ? @{ $form->{parts} } : $form->{parts};
+  return @{ $form->{parts} };

 }
 
 sub _create_filter_for_priceupdate {
 }
 
 sub _create_filter_for_priceupdate {


@@ -1227,7 +1210,7 @@ sub update_prices {
   my $num_updated = 0;
 
   # connect to database
   my $num_updated = 0;
 
   # connect to database

-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   for my $column (qw(sellprice listprice)) {
     next if ($form->{$column} eq "");
 
   for my $column (qw(sellprice listprice)) {
     next if ($form->{$column} eq "");


@@ -1288,7 +1271,6 @@ sub update_prices {
   $sth_multiply->finish();
 
   my $rc= $dbh->commit;
   $sth_multiply->finish();
 
   my $rc= $dbh->commit;

-  $dbh->disconnect;

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


@@ -1301,7 +1283,7 @@ sub create_links {
   my ($self, $module, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $module, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   my @values = ('%' . $module . '%');
   my $query;
 
   my @values = ('%' . $module . '%');
   my $query;


@@ -1357,7 +1339,6 @@ sub create_links {
     ($form->{priceupdate}) = selectrow_query($form, $dbh, qq|SELECT current_date|);
   }
 
     ($form->{priceupdate}) = selectrow_query($form, $dbh, qq|SELECT current_date|);
   }
 

-  $dbh->disconnect;

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


@@ -1366,7 +1347,7 @@ sub get_parts {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form, $sortorder) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form, $sortorder) = @_;

-  my $dbh   = $form->dbconnect($myconfig);
+  my $dbh   = $form->get_standard_dbh;

   my $order = qq| p.partnumber|;
   my $where = qq|1 = 1|;
   my @values;
   my $order = qq| p.partnumber|;
   my $where = qq|1 = 1|;
   my @values;


@@ -1409,7 +1390,6 @@ sub get_parts {
   }    #while
   $form->{rows} = $j;
   $sth->finish;
   }    #while
   $form->{rows} = $j;
   $sth->finish;

-  $dbh->disconnect;

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


@@ -1437,7 +1417,7 @@ sub retrieve_languages {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = $form->get_standard_dbh;

 
   my @values;
   my $where;
 
   my @values;
   my $where;


@@ -1459,8 +1439,6 @@ sub retrieve_languages {
 
   my $languages = selectall_hashref_query($form, $dbh, $query, @values);
 
 
   my $languages = selectall_hashref_query($form, $dbh, $query, @values);
 

-  $dbh->disconnect;
-

   $main::lxdebug->leave_sub();
 
   return $languages;
   $main::lxdebug->leave_sub();
 
   return $languages;


@@ -1513,8 +1491,22 @@ sub retrieve_accounts {
 
   # transdate madness.
   my $transdate = "";
 
   # transdate madness.
   my $transdate = "";

-  if ($form->{type} eq "invoice") {
-    if (($form->{vc} eq "vendor") || !$form->{deliverydate}) {
+  if ($form->{type} eq "invoice" or $form->{type} eq "credit_note") {
+    # use deliverydate for sales and purchase invoice, if it exists
+    # also use deliverydate for credit notes
+    if (!$form->{deliverydate}) {
+      $transdate = $form->{invdate};
+    } else {
+      $transdate = $form->{deliverydate};
+    }
+  } elsif ($form->{script} eq 'ir.pl') {
+    # when a purchase invoice is opened from the report of purchase invoices
+    # $form->{type} isn't set, but $form->{script} is, not sure why this is or
+    # whether this distinction matters in some other scenario. Otherwise one
+    # could probably take out this elsif and add a
+    # " or $form->{script} eq 'ir.pl' "
+    # to the above if-statement
+    if (!$form->{deliverydate}) {

       $transdate = $form->{invdate};
     } else {
       $transdate = $form->{deliverydate};
       $transdate = $form->{invdate};
     } else {
       $transdate = $form->{deliverydate};


@@ -1523,6 +1515,8 @@ sub retrieve_accounts {
     # if credit_note has a deliverydate, use this instead of invdate
     # useful for credit_notes of invoices from an old period with different tax
     # if there is no deliverydate then invdate is used, old default (see next elsif)
     # if credit_note has a deliverydate, use this instead of invdate
     # useful for credit_notes of invoices from an old period with different tax
     # if there is no deliverydate then invdate is used, old default (see next elsif)

+    # Falls hier der Stichtag für Steuern anders bestimmt wird,
+    # entsprechend auch bei Taxkeys.pm anpassen

     $transdate = $form->{deliverydate};
   } elsif (($form->{type} eq "credit_note") || ($form->{script} eq 'ir.pl')) {
     $transdate = $form->{invdate};
     $transdate = $form->{deliverydate};
   } elsif (($form->{type} eq "credit_note") || ($form->{script} eq 'ir.pl')) {
     $transdate = $form->{invdate};


@@ -1546,17 +1540,21 @@ sub retrieve_accounts {
     SELECT
       p.id, p.inventory_accno_id AS is_part,
       bg.inventory_accno_id,
     SELECT
       p.id, p.inventory_accno_id AS is_part,
       bg.inventory_accno_id,

-      bg.income_accno_id_$form->{taxzone_id} AS income_accno_id,
-      bg.expense_accno_id_$form->{taxzone_id} AS expense_accno_id,
+      tc.income_accno_id AS income_accno_id,
+      tc.expense_accno_id AS expense_accno_id,

       c1.accno AS inventory_accno,
       c2.accno AS income_accno,
       c3.accno AS expense_accno
     FROM parts p
     LEFT JOIN buchungsgruppen bg ON p.buchungsgruppen_id = bg.id
       c1.accno AS inventory_accno,
       c2.accno AS income_accno,
       c3.accno AS expense_accno
     FROM parts p
     LEFT JOIN buchungsgruppen bg ON p.buchungsgruppen_id = bg.id

+    LEFT JOIN taxzone_charts tc on bg.id = tc.buchungsgruppen_id

     LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id
     LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id

-    LEFT JOIN chart c2 ON bg.income_accno_id_$form->{taxzone_id} = c2.id
-    LEFT JOIN chart c3 ON bg.expense_accno_id_$form->{taxzone_id} = c3.id
-    WHERE p.id IN ($in)
+    LEFT JOIN chart c2 ON tc.income_accno_id = c2.id
+    LEFT JOIN chart c3 ON tc.expense_accno_id = c3.id
+    WHERE
+    tc.taxzone_id = '$form->{taxzone_id}'
+    and
+    p.id IN ($in)

 SQL
 
   my $sth_tax = prepare_query($::form, $dbh, <<SQL);
 SQL
 
   my $sth_tax = prepare_query($::form, $dbh, <<SQL);


@@ -1642,8 +1640,8 @@ sub prepare_parts_for_printing {
   my $self     = shift;
   my %params   = @_;
 
   my $self     = shift;
   my %params   = @_;
 

-  my $myconfig = \%main::myconfig;
-  my $form     = $main::form;
+  my $myconfig = $params{myconfig} || \%main::myconfig;
+  my $form     = $params{form}     || $main::form;

 
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 
 
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 


@@ -1703,8 +1701,37 @@ sub prepare_parts_for_printing {
     }
   }
 
     }
   }
 

+  my $parts = SL::DB::Manager::Part->get_all(query => [ id => \@part_ids ]);
+  my %parts_by_id = map { $_->id => $_ } @$parts;
+
+  for my $i (1..$rowcount) {
+    my $id = $form->{"${prefix}${i}"};
+    next unless $id;
+
+    push @{ $form->{TEMPLATE_ARRAYS}{part_type} },  $parts_by_id{$id}->type;
+  }
+

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

+sub normalize_text_blocks {
+  $main::lxdebug->enter_sub();
+
+  my $self     = shift;
+  my %params   = @_;
+
+  my $form     = $params{form}     || $main::form;
+
+  # check if feature is enabled (select normalize_part_descriptions from defaults)
+  return unless ($::instance_conf->get_normalize_part_descriptions);
+
+  foreach (qw(description notes)) {
+    $form->{$_} =~ s/\s+$//s;
+    $form->{$_} =~ s/^\s+//s;
+    $form->{$_} =~ s/ {2,}/ /g;
+  }
+   $main::lxdebug->leave_sub();
+}
+

 
 1;
 
 1;