Preisgruppen: Bei Zeilen mit noch nicht zugewiesenem Artikel wird gar keine Drop...

diff --git a/SL/IS.pm b/SL/IS.pm
index 686f8644c7c1b410821f894579ba2e6516aadbee..66564344cb02fb4b5232519b3287ad4cc5a27fbd 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -685,8 +685,8 @@ sub post_invoice {
         ? qq|'$form->{"deliverydate_$i"}'|
         : "NULL";
 
         ? qq|'$form->{"deliverydate_$i"}'|
         : "NULL";
 

-      # get pricegroup_id and save ist
-      ($null, my $pricegroup_id) = split /--/, $form->{"sellprice_drag_$i"};
+      # get pricegroup_id and save it
+      ($null, my $pricegroup_id) = split /--/, $form->{"sellprice_pg_$i"};

       $pricegroup_id *= 1;
       my $subtotal = $form->{"subtotal_$i"} * 1;
 
       $pricegroup_id *= 1;
       my $subtotal = $form->{"subtotal_$i"} * 1;
 


@@ -2062,12 +2062,15 @@ sub get_pricegroups_for_parts {
 
   my $dbh = $form->dbconnect($myconfig);
 
 
   my $dbh = $form->dbconnect($myconfig);
 

+  $form->{"PRICES"} = {};
+

   my $i  = 1;
   my $id = 0;
   my $dimension_units = AM->retrieve_units($myconfig, $form, "dimension");
   my $service_units = AM->retrieve_units($myconfig, $form, "service");
   my $all_units = AM->retrieve_units($myconfig, $form);
   while (($form->{"id_$i"}) or ($form->{"new_id_$i"})) {
   my $i  = 1;
   my $id = 0;
   my $dimension_units = AM->retrieve_units($myconfig, $form, "dimension");
   my $service_units = AM->retrieve_units($myconfig, $form, "service");
   my $all_units = AM->retrieve_units($myconfig, $form);
   while (($form->{"id_$i"}) or ($form->{"new_id_$i"})) {

+    $form->{"PRICES"}{$i} = [];

 
     $id = $form->{"id_$i"};
 
 
     $id = $form->{"id_$i"};
 


@@ -2077,7 +2080,7 @@ sub get_pricegroups_for_parts {
     }
 
     ($price, $selectedpricegroup_id) = split /--/,
     }
 
     ($price, $selectedpricegroup_id) = split /--/,

-      $form->{"sellprice_drag_$i"};
+      $form->{"sellprice_pg_$i"};

 
     $pricegroup_old = $form->{"pricegroup_old_$i"};
     $form->{"new_pricegroup_$i"} = $selectedpricegroup_id;
 
     $pricegroup_old = $form->{"pricegroup_old_$i"};
     $form->{"new_pricegroup_$i"} = $selectedpricegroup_id;


@@ -2183,7 +2186,7 @@ sub get_pricegroups_for_parts {
                   and ($pkr->{price} == $form->{"sellprice_$i"})) {
 
                 # $pkr->{price}                         = $form->{"sellprice_$i"};
                   and ($pkr->{price} == $form->{"sellprice_$i"})) {
 
                 # $pkr->{price}                         = $form->{"sellprice_$i"};

-                  } else {
+              } else {

                 $pkr->{price} = $form->{"sellprice_$i"};
               }
             }
                 $pkr->{price} = $form->{"sellprice_$i"};
               }
             }

diff --git a/SL/OE.pm b/SL/OE.pm
index 2e5c8d696d2511bdc2e43ebd0dae011320ec7f2a..7813f3350b7d6b8efcf37a0bd577e29186d96777 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -351,7 +351,7 @@ sub save {
         ($form->{"reqdate_$i"}) ? qq|'$form->{"reqdate_$i"}'| : "NULL";
 
       # get pricegroup_id and save ist
         ($form->{"reqdate_$i"}) ? qq|'$form->{"reqdate_$i"}'| : "NULL";
 
       # get pricegroup_id and save ist

-      ($null, my $pricegroup_id) = split /--/, $form->{"sellprice_drag_$i"};
+      ($null, my $pricegroup_id) = split /--/, $form->{"sellprice_pg_$i"};

       $pricegroup_id *= 1;
       $subtotal = $form->{"subtotal_$i"} * 1;
 
       $pricegroup_id *= 1;
       $subtotal = $form->{"subtotal_$i"} * 1;
 

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index b88d36dde4073435ba144ffca7fe610ada2afb7d..bbdbeafbafa8d706147bb1421c1c6262ff0a7471 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -112,7 +112,7 @@ sub display_row {
       or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
       or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
       or ($form->{type} =~ /sales_order/)) {
       or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
       or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
       or ($form->{type} =~ /sales_order/)) {

-    push @column_index, qw(sellprice_drag);
+    push @column_index, qw(sellprice_pg);

   }
 
   push @column_index, qw(sellprice);
   }
 
   push @column_index, qw(sellprice);


@@ -172,7 +172,7 @@ sub display_row {
       qq|<th align=left nowrap width=15 class=listheading>|
     . $locale->text('Price')
     . qq|</th>|;
       qq|<th align=left nowrap width=15 class=listheading>|
     . $locale->text('Price')
     . qq|</th>|;

-  $column_data{sellprice_drag} =
+  $column_data{sellprice_pg} =

       qq|<th align=left nowrap width=15 class=listheading>|
     . $locale->text('Pricegroup')
     . qq|</th>|;
       qq|<th align=left nowrap width=15 class=listheading>|
     . $locale->text('Pricegroup')
     . qq|</th>|;


@@ -329,7 +329,7 @@ sub display_row {
                             $is_assigned ? $form->{"unit_$i"} : undef))
       . "</td>";
 
                             $is_assigned ? $form->{"unit_$i"} : undef))
       . "</td>";
 

-    # build in dragdrop for pricesgroups
+    # build in drop down list for pricesgroups

     if ($form->{"prices_$i"}) {
       if  ($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"}) {
         $price_tmp = $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces);
     if ($form->{"prices_$i"}) {
       if  ($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"}) {
         $price_tmp = $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces);


@@ -337,31 +337,27 @@ sub display_row {
         $price_tmp = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
       }
 
         $price_tmp = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
       }
 

-      $column_data{sellprice_drag} =
-        qq|<td align=right><select name="sellprice_drag_$i">$form->{"prices_$i"}</select></td>|;
+      $column_data{sellprice_pg} =
+        qq|<td align=right><select name="sellprice_pg_$i">$form->{"prices_$i"}</select></td>|;

       $column_data{sellprice} =
         qq|<td><input name="sellprice_$i" size=10 value=$price_tmp></td>|;
     } else {
 
       # for last row and report
       $column_data{sellprice} =
         qq|<td><input name="sellprice_$i" size=10 value=$price_tmp></td>|;
     } else {
 
       # for last row and report

-      # set pricegroup dragdrop from report menu
+      # set pricegroup drop down list from report menu

       if ($form->{"sellprice_$i"} != 0) {
         $prices =
           qq|<option value="$form->{"sellprice_$i"}--$form->{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"}</option>\n|;
 
         $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
 
       if ($form->{"sellprice_$i"} != 0) {
         $prices =
           qq|<option value="$form->{"sellprice_$i"}--$form->{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"}</option>\n|;
 
         $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
 

-        $column_data{sellprice_drag} =
-          qq|<td align=right><select name="sellprice_drag_$i">$prices</select></td>|;
+        $column_data{sellprice_pg} =
+          qq|<td align=right><select name="sellprice_pg_$i">$prices</select></td>|;

 
       } else {
 
         # for last row
 
       } else {
 
         # for last row

-        $column_data{sellprice_drag} =
-          qq|<td align=right><input name="sellprice_$i" size=9 value=|
-          . $form->format_amount(\%myconfig, $form->{"prices_$i"},
-                                 $decimalplaces)
-          . qq|></td>|;
+        $column_data{sellprice_pg} = qq|<td align=right>&nbsp;</td>|;

       }
 
       $column_data{sellprice} =
       }
 
       $column_data{sellprice} =


@@ -504,13 +500,16 @@ sub display_row {
 # build html-code for pricegroups in variable $form->{prices_$j}
 
 sub set_pricegroup {
 # build html-code for pricegroups in variable $form->{prices_$j}
 
 sub set_pricegroup {

-  my $rowcount = shift;

   $lxdebug->enter_sub();
   $lxdebug->enter_sub();

+  my $rowcount = shift;
+  $lxdebug->dump(0, "holy luja!", $form->{PRICES});

   for $j (1 .. $rowcount) {
     my $pricegroup_old = $form->{"pricegroup_old_$i"};
   for $j (1 .. $rowcount) {
     my $pricegroup_old = $form->{"pricegroup_old_$i"};

+    $lxdebug->message(0, "klaus1 for j $j");

     if ($form->{PRICES}{$j}) {
     if ($form->{PRICES}{$j}) {

+      $lxdebug->message(0, "klaus2");

       $len    = 0;
       $len    = 0;

-      $prices = '';
+      $prices = '<option value="--">' . $locale->text("none (pricegroup)") . '</option>';

       $price  = 0;
       foreach $item (@{ $form->{PRICES}{$j} }) {
 
       $price  = 0;
       foreach $item (@{ $form->{PRICES}{$j} }) {
 


@@ -520,7 +519,7 @@ sub set_pricegroup {
         $pricegroup_id = $item->{pricegroup_id};
         $pricegroup    = $item->{pricegroup};
 
         $pricegroup_id = $item->{pricegroup_id};
         $pricegroup    = $item->{pricegroup};
 

-        # build dragdrop for pricegroups
+        # build drop down list for pricegroups

         $prices .=
           qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
 
         $prices .=
           qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
 


@@ -540,10 +539,8 @@ sub set_pricegroup {
         if ($pricegroup_id == 0) {
           $form->{"price_new_$j"} = $form->{"sellprice_$j"};
         }
         if ($pricegroup_id == 0) {
           $form->{"price_new_$j"} = $form->{"sellprice_$j"};
         }

-        if ($len > 1) {
-          $form->{"prices_$j"} = $prices;
-        }

       }
       }

+      $form->{"prices_$j"} = $prices;

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

diff --git a/locale/de/all b/locale/de/all
index 9973da2d109d7b01c729d6855c5e510a5728d63b..28ad31b0f0706d91b3cd20dfeeefc93e00eae04b 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1092,6 +1092,7 @@ gestartet',
   'list'                        => 'auflisten',
   'localhost'                   => 'lokaler Rechner',
   'month'                       => 'monatliche Abgabe',
   'list'                        => 'auflisten',
   'localhost'                   => 'lokaler Rechner',
   'month'                       => 'monatliche Abgabe',

+  'none (pricegroup)'           => 'keine',

   'number'                      => 'Nummer',
   'posted!'                     => 'gebucht',
   'prices updated!'             => ' Preise aktualisiert!',
   'number'                      => 'Nummer',
   'posted!'                     => 'gebucht',
   'prices updated!'             => ' Preise aktualisiert!',

diff --git a/locale/de/cn b/locale/de/cn
index 2a2484cd54f2180ba2e5f331468dbe3eee33e3d5..4147e6b29beb34ed16a77e347a003bca0f7fbbc1 100644 (file)
--- a/locale/de/cn
+++ b/locale/de/cn
@@ -179,6 +179,7 @@ $self{texts} = {
   'button'                      => '?',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'button'                      => '?',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',

+  'none (pricegroup)'           => 'keine',

   'posted!'                     => 'gebucht',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'posted!'                     => 'gebucht',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',

diff --git a/locale/de/dn b/locale/de/dn
index 478c616f2d005b7cbcac3cb1f86d0468f22d7249..4f7068f36bb1a77e310e333992147dd75d9710c3 100644 (file)
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -171,6 +171,7 @@ gestartet',
   'eMail Send?'                 => 'eMail-Versand?',
   'eMail?'                      => 'eMail?',
   'emailed to'                  => 'gemailt an',
   'eMail Send?'                 => 'eMail-Versand?',
   'eMail?'                      => 'eMail?',
   'emailed to'                  => 'gemailt an',

+  'none (pricegroup)'           => 'keine',

   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
 };
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
 };

diff --git a/locale/de/ic b/locale/de/ic
index b5346aedb7010f93d96eb8062b546e5b89f558a0..d9dc721ac5e7dc3ce4403353a6ce2ec45459cb0c 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -218,6 +218,7 @@ aktualisieren wollen?',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'list'                        => 'auflisten',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'list'                        => 'auflisten',

+  'none (pricegroup)'           => 'keine',

   'number'                      => 'Nummer',
   'prices updated!'             => ' Preise aktualisiert!',
   'sent'                        => 'gesendet',
   'number'                      => 'Nummer',
   'prices updated!'             => ' Preise aktualisiert!',
   'sent'                        => 'gesendet',

diff --git a/locale/de/io b/locale/de/io
index f3b7c37c893868e1f6dec581b6c5c606ac93c6a9..a7a413b2f342e47fff0cb0501acfc14e5e0c0889 100644 (file)
--- a/locale/de/io
+++ b/locale/de/io
@@ -114,6 +114,7 @@ $self{texts} = {
   'What type of item is this?'  => 'Was ist dieser Artikel?',
   'Zipcode'                     => 'PLZ',
   'emailed to'                  => 'gemailt an',
   'What type of item is this?'  => 'Was ist dieser Artikel?',
   'Zipcode'                     => 'PLZ',
   'emailed to'                  => 'gemailt an',

+  'none (pricegroup)'           => 'keine',

   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
 };
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
 };

diff --git a/locale/de/ir b/locale/de/ir
index 1f54d75b9036d494b26e7eb606354d9eb499ae92..626ac7c55b65afacd4faf0103fd15aae6f9ad8d0 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -169,6 +169,7 @@ $self{texts} = {
   'button'                      => '?',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'button'                      => '?',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',

+  'none (pricegroup)'           => 'keine',

   'posted!'                     => 'gebucht',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'posted!'                     => 'gebucht',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',

diff --git a/locale/de/is b/locale/de/is
index a6b765c80c7a2a69c80df758661e4b1fe5c84405..7c1d80a0b7de8ca5b92134bb1f33c6ee5182e2dd 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -194,6 +194,7 @@ $self{texts} = {
   'button'                      => '?',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'button'                      => '?',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',

+  'none (pricegroup)'           => 'keine',

   'posted!'                     => 'gebucht',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'posted!'                     => 'gebucht',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',

diff --git a/locale/de/oe b/locale/de/oe
index 9a4236bd6edeb4777a40fa58cb906c9459db6104..e067681503af4b291cf3f0777200c966059e5410 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -232,6 +232,7 @@ $self{texts} = {
   'days'                        => 'Tage',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'days'                        => 'Tage',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',

+  'none (pricegroup)'           => 'keine',

   'saved!'                      => 'gespeichert',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'saved!'                      => 'gespeichert',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',