Transportkosten-Erinnerungs-Artikel auf ID anstatt partnumber umgestellt Teil II

Vergessene modifies für Commit von gerade hinzugefügt

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 8ddda02..d615345 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -9,100 +9,100 @@ use base qw(SL::DB::Object);
 __PACKAGE__->meta->table('defaults');
 
 __PACKAGE__->meta->columns(
-  accounting_method                        => { type => 'text' },
-  address                                  => { type => 'text' },
-  allow_new_purchase_delivery_order        => { type => 'boolean', default => 'true', not_null => 1 },
-  allow_new_purchase_invoice               => { type => 'boolean', default => 'true', not_null => 1 },
-  allow_sales_invoice_from_sales_order     => { type => 'boolean', default => 'true', not_null => 1 },
-  allow_sales_invoice_from_sales_quotation => { type => 'boolean', default => 'true', not_null => 1 },
-  ap_changeable                            => { type => 'integer', default => 2, not_null => 1 },
-  ap_show_mark_as_paid                     => { type => 'boolean', default => 'true' },
-  ar_changeable                            => { type => 'integer', default => 2, not_null => 1 },
-  ar_paid_accno_id                         => { type => 'integer' },
-  ar_show_mark_as_paid                     => { type => 'boolean', default => 'true' },
-  articlenumber                            => { type => 'text' },
-  assemblynumber                           => { type => 'text' },
-  balance_startdate_method                 => { type => 'text' },
-  bin_id                                   => { type => 'integer' },
-  bin_id_ignore_onhand                     => { type => 'integer' },
-  businessnumber                           => { type => 'text' },
-  closedto                                 => { type => 'date' },
-  cnnumber                                 => { type => 'text' },
-  co_ustid                                 => { type => 'text' },
-  coa                                      => { type => 'text' },
-  company                                  => { type => 'text' },
-  currency_id                              => { type => 'integer', not_null => 1 },
-  customer_hourly_rate                     => { type => 'numeric', precision => 8, scale => 2 },
-  customer_projects_only_in_sales          => { type => 'boolean', default => 'false', not_null => 1 },
-  customernumber                           => { type => 'text' },
-  datev_check_on_ap_transaction            => { type => 'boolean', default => 'true' },
-  datev_check_on_ar_transaction            => { type => 'boolean', default => 'true' },
-  datev_check_on_gl_transaction            => { type => 'boolean', default => 'true' },
-  datev_check_on_purchase_invoice          => { type => 'boolean', default => 'true' },
-  datev_check_on_sales_invoice             => { type => 'boolean', default => 'true' },
-  dunning_ar                               => { type => 'integer' },
-  dunning_ar_amount_fee                    => { type => 'integer' },
-  dunning_ar_amount_interest               => { type => 'integer' },
-  duns                                     => { type => 'text' },
-  expense_accno_id                         => { type => 'integer' },
-  fxgain_accno_id                          => { type => 'integer' },
-  fxloss_accno_id                          => { type => 'integer' },
-  gl_changeable                            => { type => 'integer', default => 2, not_null => 1 },
-  id                                       => { type => 'serial', not_null => 1 },
-  income_accno_id                          => { type => 'integer' },
-  inventory_accno_id                       => { type => 'integer' },
-  inventory_system                         => { type => 'text' },
-  invnumber                                => { type => 'text' },
-  ir_changeable                            => { type => 'integer', default => 2, not_null => 1 },
-  ir_show_mark_as_paid                     => { type => 'boolean', default => 'true' },
-  is_changeable                            => { type => 'integer', default => 2, not_null => 1 },
-  is_show_mark_as_paid                     => { type => 'boolean', default => 'true' },
-  itime                                    => { type => 'timestamp', default => 'now()' },
-  language_id                              => { type => 'integer' },
-  max_future_booking_interval              => { type => 'integer', default => 360 },
-  mtime                                    => { type => 'timestamp' },
-  normalize_part_descriptions              => { type => 'boolean', default => 'true' },
-  normalize_vc_names                       => { type => 'boolean', default => 'true' },
-  parts_image_css                          => { type => 'text', default => 'border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;' },
-  parts_listing_image                      => { type => 'boolean', default => 'true' },
-  parts_show_image                         => { type => 'boolean', default => 'true' },
-  payments_changeable                      => { type => 'integer', default => '0', not_null => 1 },
-  pdonumber                                => { type => 'text' },
-  ponumber                                 => { type => 'text' },
-  profit_determination                     => { type => 'text' },
-  purchase_delivery_order_show_delete      => { type => 'boolean', default => 'true' },
-  purchase_order_show_delete               => { type => 'boolean', default => 'true' },
-  reqdate_interval                         => { type => 'integer', default => '0' },
-  require_transaction_description_ps       => { type => 'boolean', default => 'false', not_null => 1 },
-  requirement_spec_section_order_part_id   => { type => 'integer' },
-  revtrans                                 => { type => 'boolean', default => 'false' },
-  rfqnumber                                => { type => 'text' },
-  rmanumber                                => { type => 'text' },
-  sales_delivery_order_show_delete         => { type => 'boolean', default => 'true' },
-  sales_order_show_delete                  => { type => 'boolean', default => 'true' },
-  sdonumber                                => { type => 'text' },
-  sepa_creditor_id                         => { type => 'text' },
-  servicenumber                            => { type => 'text' },
-  show_bestbefore                          => { type => 'boolean', default => 'false' },
-  show_weight                              => { type => 'boolean', default => 'false', not_null => 1 },
-  signature                                => { type => 'text' },
-  sonumber                                 => { type => 'text' },
-  sqnumber                                 => { type => 'text' },
-  taxnumber                                => { type => 'text' },
-  templates                                => { type => 'text' },
-  transfer_default                         => { type => 'boolean', default => 'true' },
-  transfer_default_ignore_onhand           => { type => 'boolean', default => 'false' },
-  transfer_default_services                => { type => 'boolean', default => 'true' },
-  transfer_default_use_master_default_bin  => { type => 'boolean', default => 'false' },
-  transport_cost_reminder_article_number   => { type => 'text' },
-  vendornumber                             => { type => 'text' },
-  version                                  => { type => 'varchar', length => 8 },
-  vertreter                                => { type => 'boolean', default => 'false' },
-  warehouse_id                             => { type => 'integer' },
-  warehouse_id_ignore_onhand               => { type => 'integer' },
-  webdav                                   => { type => 'boolean', default => 'false' },
-  webdav_documents                         => { type => 'boolean', default => 'false' },
-  weightunit                               => { type => 'varchar', length => 5 },
+  accounting_method                         => { type => 'text' },
+  address                                   => { type => 'text' },
+  allow_new_purchase_delivery_order         => { type => 'boolean', default => 'true', not_null => 1 },
+  allow_new_purchase_invoice                => { type => 'boolean', default => 'true', not_null => 1 },
+  allow_sales_invoice_from_sales_order      => { type => 'boolean', default => 'true', not_null => 1 },
+  allow_sales_invoice_from_sales_quotation  => { type => 'boolean', default => 'true', not_null => 1 },
+  ap_changeable                             => { type => 'integer', default => 2, not_null => 1 },
+  ap_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
+  ar_changeable                             => { type => 'integer', default => 2, not_null => 1 },
+  ar_paid_accno_id                          => { type => 'integer' },
+  ar_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
+  articlenumber                             => { type => 'text' },
+  assemblynumber                            => { type => 'text' },
+  balance_startdate_method                  => { type => 'text' },
+  bin_id                                    => { type => 'integer' },
+  bin_id_ignore_onhand                      => { type => 'integer' },
+  businessnumber                            => { type => 'text' },
+  closedto                                  => { type => 'date' },
+  cnnumber                                  => { type => 'text' },
+  co_ustid                                  => { type => 'text' },
+  coa                                       => { type => 'text' },
+  company                                   => { type => 'text' },
+  currency_id                               => { type => 'integer', not_null => 1 },
+  customer_hourly_rate                      => { type => 'numeric', precision => 8, scale => 2 },
+  customer_projects_only_in_sales           => { type => 'boolean', default => 'false', not_null => 1 },
+  customernumber                            => { type => 'text' },
+  datev_check_on_ap_transaction             => { type => 'boolean', default => 'true' },
+  datev_check_on_ar_transaction             => { type => 'boolean', default => 'true' },
+  datev_check_on_gl_transaction             => { type => 'boolean', default => 'true' },
+  datev_check_on_purchase_invoice           => { type => 'boolean', default => 'true' },
+  datev_check_on_sales_invoice              => { type => 'boolean', default => 'true' },
+  dunning_ar                                => { type => 'integer' },
+  dunning_ar_amount_fee                     => { type => 'integer' },
+  dunning_ar_amount_interest                => { type => 'integer' },
+  duns                                      => { type => 'text' },
+  expense_accno_id                          => { type => 'integer' },
+  fxgain_accno_id                           => { type => 'integer' },
+  fxloss_accno_id                           => { type => 'integer' },
+  gl_changeable                             => { type => 'integer', default => 2, not_null => 1 },
+  id                                        => { type => 'serial', not_null => 1 },
+  income_accno_id                           => { type => 'integer' },
+  inventory_accno_id                        => { type => 'integer' },
+  inventory_system                          => { type => 'text' },
+  invnumber                                 => { type => 'text' },
+  ir_changeable                             => { type => 'integer', default => 2, not_null => 1 },
+  ir_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
+  is_changeable                             => { type => 'integer', default => 2, not_null => 1 },
+  is_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
+  itime                                     => { type => 'timestamp', default => 'now()' },
+  language_id                               => { type => 'integer' },
+  max_future_booking_interval               => { type => 'integer', default => 360 },
+  mtime                                     => { type => 'timestamp' },
+  normalize_part_descriptions               => { type => 'boolean', default => 'true' },
+  normalize_vc_names                        => { type => 'boolean', default => 'true' },
+  parts_image_css                           => { type => 'text', default => 'border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;' },
+  parts_listing_image                       => { type => 'boolean', default => 'true' },
+  parts_show_image                          => { type => 'boolean', default => 'true' },
+  payments_changeable                       => { type => 'integer', default => '0', not_null => 1 },
+  pdonumber                                 => { type => 'text' },
+  ponumber                                  => { type => 'text' },
+  profit_determination                      => { type => 'text' },
+  purchase_delivery_order_show_delete       => { type => 'boolean', default => 'true' },
+  purchase_order_show_delete                => { type => 'boolean', default => 'true' },
+  reqdate_interval                          => { type => 'integer', default => '0' },
+  require_transaction_description_ps        => { type => 'boolean', default => 'false', not_null => 1 },
+  requirement_spec_section_order_part_id    => { type => 'integer' },
+  revtrans                                  => { type => 'boolean', default => 'false' },
+  rfqnumber                                 => { type => 'text' },
+  rmanumber                                 => { type => 'text' },
+  sales_delivery_order_show_delete          => { type => 'boolean', default => 'true' },
+  sales_order_show_delete                   => { type => 'boolean', default => 'true' },
+  sdonumber                                 => { type => 'text' },
+  sepa_creditor_id                          => { type => 'text' },
+  servicenumber                             => { type => 'text' },
+  show_bestbefore                           => { type => 'boolean', default => 'false' },
+  show_weight                               => { type => 'boolean', default => 'false', not_null => 1 },
+  signature                                 => { type => 'text' },
+  sonumber                                  => { type => 'text' },
+  sqnumber                                  => { type => 'text' },
+  taxnumber                                 => { type => 'text' },
+  templates                                 => { type => 'text' },
+  transfer_default                          => { type => 'boolean', default => 'true' },
+  transfer_default_ignore_onhand            => { type => 'boolean', default => 'false' },
+  transfer_default_services                 => { type => 'boolean', default => 'true' },
+  transfer_default_use_master_default_bin   => { type => 'boolean', default => 'false' },
+  transport_cost_reminder_article_number_id => { type => 'integer' },
+  vendornumber                              => { type => 'text' },
+  version                                   => { type => 'varchar', length => 8 },
+  vertreter                                 => { type => 'boolean', default => 'false' },
+  warehouse_id                              => { type => 'integer' },
+  warehouse_id_ignore_onhand                => { type => 'integer' },
+  webdav                                    => { type => 'boolean', default => 'false' },
+  webdav_documents                          => { type => 'boolean', default => 'false' },
+  weightunit                                => { type => 'varchar', length => 5 },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 4e4e64d..459c629 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -564,7 +564,7 @@ sub form_footer {
 
   $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
-  my $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number;
+  my $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number_id;
   print $form->parse_html_template("oe/form_footer", {
      %TMPL_VAR,
      webdav          => $::instance_conf->get_webdav,
@@ -2088,12 +2088,13 @@ sub check_transport_cost_reminder_article_number {
 
   check_oe_access();
 
-  my $transport_article = $::instance_conf->get_transport_cost_reminder_article_number;
+  my $transport_article_id = $::instance_conf->get_transport_cost_reminder_article_number_id;
   for my $i (1 .. $form->{rowcount}) {
-    return if $form->{"partnumber_${i}"} eq $transport_article;
+    return if $form->{"id_${i}"} eq $transport_article_id;
   }
 
-  return $transport_article;
+  # simply return the name of the part
+  return SL::DB::Part->new(id => $transport_article_id)->load()->partnumber;
 
   $main::lxdebug->leave_sub();
 }

diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index bc817b0..58cccb0 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -111,7 +111,7 @@
   <tr><td class="listheading" colspan="4">[% LxERP.t8('Transport and service costs reminder') %]</td></tr>
  <tr>
   <td align="right">[% LxERP.t8('Default transport article number') %]</td>
-  <td>[% L.input_tag('defaults.transport_cost_reminder_article_number', SELF.defaults.transport_cost_reminder_article_number, style=style) %]</td>
+  <td>[% L.part_picker('defaults.transport_cost_reminder_article_number_id', SELF.defaults.transport_cost_reminder_article_number_id, style=style) %]</td>
    <td>[% LxERP.t8('Before saving a sales order, this article will be checked and a warning is generated.') %]</td>
  </tr>
  </table>