Waren und Lieferanten als benutzerdefinierte Variablen hinzugefügt.

Mit einfachen vendor_ und part_selectoren im L-Plugin, die das
select_tag verwenden. vc_limit wird nicht berücksichtigt und das
ganze ist nur rudimentär getestet.

diff --git a/SL/CVar.pm b/SL/CVar.pm
index 714744a1acbddf79f859c19a1ac8942c04d0d374..c0b3f43f07944590e13f608c8e2dde05dd27b1de 100644 (file)
--- a/SL/CVar.pm
+++ b/SL/CVar.pm
@@ -7,7 +7,7 @@ use Scalar::Util qw(blessed);
 use Data::Dumper;
 
 use SL::DBUtils;
 use Data::Dumper;
 
 use SL::DBUtils;

-use SL::MoreCommon qw(listify);
+use SL::MoreCommon qw(any listify);

 
 sub get_configs {
   $main::lxdebug->enter_sub();
 
 sub get_configs {
   $main::lxdebug->enter_sub();


@@ -243,6 +243,8 @@ sub get_custom_variables {
                      : $cvar->{type} eq 'timestamp' ? $act_var->{timestamp_value}
                      : $cvar->{type} eq 'number'    ? $act_var->{number_value}
                      : $cvar->{type} eq 'customer'  ? $act_var->{number_value}
                      : $cvar->{type} eq 'timestamp' ? $act_var->{timestamp_value}
                      : $cvar->{type} eq 'number'    ? $act_var->{number_value}
                      : $cvar->{type} eq 'customer'  ? $act_var->{number_value}

+                     : $cvar->{type} eq 'vendor'    ? $act_var->{number_value}
+                     : $cvar->{type} eq 'part'      ? $act_var->{number_value}

                      : $cvar->{type} eq 'bool'      ? $act_var->{bool_value}
                      :                                $act_var->{text_value};
       $cvar->{valid} = $valid;
                      : $cvar->{type} eq 'bool'      ? $act_var->{bool_value}
                      :                                $act_var->{text_value};
       $cvar->{valid} = $valid;


@@ -279,6 +281,12 @@ sub get_custom_variables {
     } elsif ($cvar->{type} eq 'customer') {
       require SL::DB::Customer;
       $cvar->{value} = SL::DB::Manager::Customer->find_by(id => $cvar->{value} * 1);
     } elsif ($cvar->{type} eq 'customer') {
       require SL::DB::Customer;
       $cvar->{value} = SL::DB::Manager::Customer->find_by(id => $cvar->{value} * 1);

+    } elsif ($cvar->{type} eq 'vendor') {
+      require SL::DB::Vendor;
+      $cvar->{value} = SL::DB::Manager::Vendor->find_by(id => $cvar->{value} * 1);
+    } elsif ($cvar->{type} eq 'part') {
+      require SL::DB::Part;
+      $cvar->{value} = SL::DB::Manager::Part->find_by(id => $cvar->{value} * 1);

     }
   }
 
     }
   }
 


@@ -340,7 +348,7 @@ sub save_custom_variables {
 
     } elsif ($config->{type} eq 'bool') {
       push @values, $value ? 't' : 'f', undef, undef, undef;
 
     } elsif ($config->{type} eq 'bool') {
       push @values, $value ? 't' : 'f', undef, undef, undef;

-    } elsif ($config->{type} eq 'customer') {
+    } elsif (any { $config->{type} eq $_ } qw(customer vendor part)) {

       push @values, undef, undef, undef, $value * 1;
     }
 
       push @values, undef, undef, undef, $value * 1;
     }
 


@@ -498,10 +506,16 @@ sub build_filter_query {
 
       $not = 'NOT' if ($params{filter}->{$name} eq 'no');
       push @sub_where,  qq|COALESCE(cvar.bool_value, false) = TRUE|;
 
       $not = 'NOT' if ($params{filter}->{$name} eq 'no');
       push @sub_where,  qq|COALESCE(cvar.bool_value, false) = TRUE|;

-    } elsif ($config->{type} eq 'customer') {
+    } elsif (any { $config->{type} eq $_ } qw(customer vendor part)) {

       next unless $params{filter}->{$name};
 
       next unless $params{filter}->{$name};
 

-      push @sub_where, qq|cvar.number_value * 1 IN (SELECT id FROM customer WHERE name ILIKE ?)|;
+      my $table = $config->{type};
+      push @sub_where, qq|cvar.number_value * 1 IN (SELECT id FROM $table WHERE name ILIKE ?)|;
+      push @sub_values, "%$params{filter}->{$name}%";
+    } elsif ($config->{type} eq 'part') {
+      next unless $params{filter}->{$name};
+
+      push @sub_where, qq|cvar.number_value * 1 IN (SELECT id FROM parts WHERE partnumber ILIKE ?)|;

       push @sub_values, "%$params{filter}->{$name}%";
     }
 
       push @sub_values, "%$params{filter}->{$name}%";
     }
 


@@ -577,6 +591,8 @@ sub add_custom_variables_to_report {
         : $cfg->{type} eq 'timestamp' ? $ref->{timestamp_value}
         : $cfg->{type} eq 'number'    ? $form->format_amount($myconfig, $ref->{number_value} * 1, $cfg->{precision})
         : $cfg->{type} eq 'customer'  ? (SL::DB::Manager::Customer->find_by(id => 1*$ref->{number_value}) || SL::DB::Customer->new)->name
         : $cfg->{type} eq 'timestamp' ? $ref->{timestamp_value}
         : $cfg->{type} eq 'number'    ? $form->format_amount($myconfig, $ref->{number_value} * 1, $cfg->{precision})
         : $cfg->{type} eq 'customer'  ? (SL::DB::Manager::Customer->find_by(id => 1*$ref->{number_value}) || SL::DB::Customer->new)->name

+        : $cfg->{type} eq 'vendor'    ? (SL::DB::Manager::Vendor->find_by(id => 1*$ref->{number_value})   || SL::DB::Vendor->new)->name
+        : $cfg->{type} eq 'part'      ? (SL::DB::Manager::Part->find_by(id => 1*$ref->{number_value})     || SL::DB::Part->new)->partnumber

         : $cfg->{type} eq 'bool'      ? ($ref->{bool_value} ? $locale->text('Yes') : $locale->text('No'))
         :                               $ref->{text_value};
     }
         : $cfg->{type} eq 'bool'      ? ($ref->{bool_value} ? $locale->text('Yes') : $locale->text('No'))
         :                               $ref->{text_value};
     }

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index f7ffc11b2d046493c957b99a5f90ee0cc46c4e22..0b4967d3484f77c125cba4547d7e5811829d7d6b 100644 (file)
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -342,6 +342,36 @@ autocomplete_customer('#$name_e\_name');
 JS
 }
 
 JS
 }
 

+# simple version with select_tag
+sub vendor_selector {
+  my ($self, $name, $value, %params) = @_;
+
+  my $actual_vendor_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"}) ? $::form->{"$name"}->id : $::form->{"$name"}) :
+                         (ref $value && $value->can('id')) ? $value->id : '';
+  my $options_str = $self->options_for_select(SL::DB::Manager::Vendor->get_all(),
+                                              default      => $actual_vendor_id,
+                                              title_sub    => sub { $_[0]->vendornumber . " : " . $_[0]->name },
+                                              'with_empty' => 1);
+  
+  return $self->select_tag($name, $options_str, %params);
+}
+
+
+# simple version with select_tag
+sub part_selector {
+  my ($self, $name, $value, %params) = @_;
+
+  my $actual_part_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"})? $::form->{"$name"}->id : $::form->{"$name"}) :
+                       (ref $value && $value->can('id')) ? $value->id : '';
+  my $options_str = $self->options_for_select(SL::DB::Manager::Part->get_all(),
+                                              default      => $actual_part_id,
+                                              title_sub    => sub { $_[0]->partnumber . " : " . $_[0]->description },
+                                              'with_empty' => 1);
+  
+  return $self->select_tag($name, $options_str, %params);
+}
+
+

 sub javascript_tag {
   my $self = shift;
   my $code = '';
 sub javascript_tag {
   my $self = shift;
   my $code = '';

diff --git a/bin/mozilla/amcvar.pl b/bin/mozilla/amcvar.pl
index 25e3ec738eeeccf1318918a0be017a1574fc26fd..343350a242de0151da1c0d795c9178cd93cc0418 100644 (file)
--- a/bin/mozilla/amcvar.pl
+++ b/bin/mozilla/amcvar.pl
@@ -55,9 +55,11 @@ our %translations = ('text'      => $locale->text('Free-form text'),
                      'bool'      => $locale->text('Yes/No (Checkbox)'),
                      'select'    => $locale->text('Selection'),
                      'customer'  => $locale->text('Customer'),
                      'bool'      => $locale->text('Yes/No (Checkbox)'),
                      'select'    => $locale->text('Selection'),
                      'customer'  => $locale->text('Customer'),

+                     'vendor'    => $locale->text('Vendor'),
+                     'part'      => $locale->text('Part'),

                      );
 
                      );
 

-our @types = qw(text textfield number date bool select customer); # timestamp
+our @types = qw(text textfield number date bool select customer vendor part); # timestamp

 
 our @modules = ({ module => 'CT',       description => $locale->text('Customers and vendors')          },
                 { module => 'Contacts', description => $locale->text('Contact persons')                },
 
 our @modules = ({ module => 'CT',       description => $locale->text('Customers and vendors')          },
                 { module => 'Contacts', description => $locale->text('Contact persons')                },

diff --git a/templates/webpages/amcvar/render_inputs.html b/templates/webpages/amcvar/render_inputs.html
index a69101bf00c0cb069881102a0b8d2f9c870fdf9c..dc9c09fe8369e5fe9eaf22af5656056a090e714c 100644 (file)
--- a/templates/webpages/amcvar/render_inputs.html
+++ b/templates/webpages/amcvar/render_inputs.html
@@ -27,6 +27,12 @@
 [%- ELSIF var.type == 'customer' %]
 [% L.customer_picker(var_name, var.value) %]
 
 [%- ELSIF var.type == 'customer' %]
 [% L.customer_picker(var_name, var.value) %]
 

+[%- ELSIF var.type == 'vendor' %]
+[% L.vendor_selector(var_name, var.value) %]
+
+[%- ELSIF var.type == 'part' %]
+[% L.part_selector(var_name, var.value) %]
+

 [%- ELSIF var.type == 'select' %]
 
 <select name="[% var_name %]">
 [%- ELSIF var.type == 'select' %]
 
 <select name="[% var_name %]">

diff --git a/templates/webpages/amcvar/render_inputs_block.html b/templates/webpages/amcvar/render_inputs_block.html
index 3f7461cc8972f2bd92693656aa01c860dbba8943..33623f61d43026feba817efe66536d1e6f79bbb0 100644 (file)
--- a/templates/webpages/amcvar/render_inputs_block.html
+++ b/templates/webpages/amcvar/render_inputs_block.html
@@ -30,6 +30,12 @@
 [%- ELSIF cvar.var.type == 'customer' %]
 [%- L.customer_picker(render_input_blocks__cvar_name, cvar.value) %]
 
 [%- ELSIF cvar.var.type == 'customer' %]
 [%- L.customer_picker(render_input_blocks__cvar_name, cvar.value) %]
 

+[%- ELSIF cvar.var.type == 'vendor' %]
+[% L.vendor_selector(render_input_blocks__cvar_name, cvar.value) %]
+
+[%- ELSIF cvar.var.type == 'part' %]
+[% L.part_selector(render_input_blocks__cvar_name, cvar.value) %]
+

 [%- ELSIF cvar.var.type == 'number' %]
 [%- L.input_tag(render_input_blocks__cvar_name, LxERP.format_amount(cvar.value, -2)) %]
 
 [%- ELSIF cvar.var.type == 'number' %]
 [%- L.input_tag(render_input_blocks__cvar_name, LxERP.format_amount(cvar.value, -2)) %]