Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 497f8c56

Von Jan Büren vor etwa 10 Jahren hinzugefügt

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

Vergessene modifies für Commit von gerade hinzugefügt

Unterschiede anzeigen:

SL/DB/MetaSetup/Default.pm
9 9
__PACKAGE__->meta->table('defaults');
10 10

  
11 11
__PACKAGE__->meta->columns(
12
  accounting_method                        => { type => 'text' },
13
  address                                  => { type => 'text' },
14
  allow_new_purchase_delivery_order        => { type => 'boolean', default => 'true', not_null => 1 },
15
  allow_new_purchase_invoice               => { type => 'boolean', default => 'true', not_null => 1 },
16
  allow_sales_invoice_from_sales_order     => { type => 'boolean', default => 'true', not_null => 1 },
17
  allow_sales_invoice_from_sales_quotation => { type => 'boolean', default => 'true', not_null => 1 },
18
  ap_changeable                            => { type => 'integer', default => 2, not_null => 1 },
19
  ap_show_mark_as_paid                     => { type => 'boolean', default => 'true' },
20
  ar_changeable                            => { type => 'integer', default => 2, not_null => 1 },
21
  ar_paid_accno_id                         => { type => 'integer' },
22
  ar_show_mark_as_paid                     => { type => 'boolean', default => 'true' },
23
  articlenumber                            => { type => 'text' },
24
  assemblynumber                           => { type => 'text' },
25
  balance_startdate_method                 => { type => 'text' },
26
  bin_id                                   => { type => 'integer' },
27
  bin_id_ignore_onhand                     => { type => 'integer' },
28
  businessnumber                           => { type => 'text' },
29
  closedto                                 => { type => 'date' },
30
  cnnumber                                 => { type => 'text' },
31
  co_ustid                                 => { type => 'text' },
32
  coa                                      => { type => 'text' },
33
  company                                  => { type => 'text' },
34
  currency_id                              => { type => 'integer', not_null => 1 },
35
  customer_hourly_rate                     => { type => 'numeric', precision => 8, scale => 2 },
36
  customer_projects_only_in_sales          => { type => 'boolean', default => 'false', not_null => 1 },
37
  customernumber                           => { type => 'text' },
38
  datev_check_on_ap_transaction            => { type => 'boolean', default => 'true' },
39
  datev_check_on_ar_transaction            => { type => 'boolean', default => 'true' },
40
  datev_check_on_gl_transaction            => { type => 'boolean', default => 'true' },
41
  datev_check_on_purchase_invoice          => { type => 'boolean', default => 'true' },
42
  datev_check_on_sales_invoice             => { type => 'boolean', default => 'true' },
43
  dunning_ar                               => { type => 'integer' },
44
  dunning_ar_amount_fee                    => { type => 'integer' },
45
  dunning_ar_amount_interest               => { type => 'integer' },
46
  duns                                     => { type => 'text' },
47
  expense_accno_id                         => { type => 'integer' },
48
  fxgain_accno_id                          => { type => 'integer' },
49
  fxloss_accno_id                          => { type => 'integer' },
50
  gl_changeable                            => { type => 'integer', default => 2, not_null => 1 },
51
  id                                       => { type => 'serial', not_null => 1 },
52
  income_accno_id                          => { type => 'integer' },
53
  inventory_accno_id                       => { type => 'integer' },
54
  inventory_system                         => { type => 'text' },
55
  invnumber                                => { type => 'text' },
56
  ir_changeable                            => { type => 'integer', default => 2, not_null => 1 },
57
  ir_show_mark_as_paid                     => { type => 'boolean', default => 'true' },
58
  is_changeable                            => { type => 'integer', default => 2, not_null => 1 },
59
  is_show_mark_as_paid                     => { type => 'boolean', default => 'true' },
60
  itime                                    => { type => 'timestamp', default => 'now()' },
61
  language_id                              => { type => 'integer' },
62
  max_future_booking_interval              => { type => 'integer', default => 360 },
63
  mtime                                    => { type => 'timestamp' },
64
  normalize_part_descriptions              => { type => 'boolean', default => 'true' },
65
  normalize_vc_names                       => { type => 'boolean', default => 'true' },
66
  parts_image_css                          => { type => 'text', default => 'border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;' },
67
  parts_listing_image                      => { type => 'boolean', default => 'true' },
68
  parts_show_image                         => { type => 'boolean', default => 'true' },
69
  payments_changeable                      => { type => 'integer', default => '0', not_null => 1 },
70
  pdonumber                                => { type => 'text' },
71
  ponumber                                 => { type => 'text' },
72
  profit_determination                     => { type => 'text' },
73
  purchase_delivery_order_show_delete      => { type => 'boolean', default => 'true' },
74
  purchase_order_show_delete               => { type => 'boolean', default => 'true' },
75
  reqdate_interval                         => { type => 'integer', default => '0' },
76
  require_transaction_description_ps       => { type => 'boolean', default => 'false', not_null => 1 },
77
  requirement_spec_section_order_part_id   => { type => 'integer' },
78
  revtrans                                 => { type => 'boolean', default => 'false' },
79
  rfqnumber                                => { type => 'text' },
80
  rmanumber                                => { type => 'text' },
81
  sales_delivery_order_show_delete         => { type => 'boolean', default => 'true' },
82
  sales_order_show_delete                  => { type => 'boolean', default => 'true' },
83
  sdonumber                                => { type => 'text' },
84
  sepa_creditor_id                         => { type => 'text' },
85
  servicenumber                            => { type => 'text' },
86
  show_bestbefore                          => { type => 'boolean', default => 'false' },
87
  show_weight                              => { type => 'boolean', default => 'false', not_null => 1 },
88
  signature                                => { type => 'text' },
89
  sonumber                                 => { type => 'text' },
90
  sqnumber                                 => { type => 'text' },
91
  taxnumber                                => { type => 'text' },
92
  templates                                => { type => 'text' },
93
  transfer_default                         => { type => 'boolean', default => 'true' },
94
  transfer_default_ignore_onhand           => { type => 'boolean', default => 'false' },
95
  transfer_default_services                => { type => 'boolean', default => 'true' },
96
  transfer_default_use_master_default_bin  => { type => 'boolean', default => 'false' },
97
  transport_cost_reminder_article_number   => { type => 'text' },
98
  vendornumber                             => { type => 'text' },
99
  version                                  => { type => 'varchar', length => 8 },
100
  vertreter                                => { type => 'boolean', default => 'false' },
101
  warehouse_id                             => { type => 'integer' },
102
  warehouse_id_ignore_onhand               => { type => 'integer' },
103
  webdav                                   => { type => 'boolean', default => 'false' },
104
  webdav_documents                         => { type => 'boolean', default => 'false' },
105
  weightunit                               => { type => 'varchar', length => 5 },
12
  accounting_method                         => { type => 'text' },
13
  address                                   => { type => 'text' },
14
  allow_new_purchase_delivery_order         => { type => 'boolean', default => 'true', not_null => 1 },
15
  allow_new_purchase_invoice                => { type => 'boolean', default => 'true', not_null => 1 },
16
  allow_sales_invoice_from_sales_order      => { type => 'boolean', default => 'true', not_null => 1 },
17
  allow_sales_invoice_from_sales_quotation  => { type => 'boolean', default => 'true', not_null => 1 },
18
  ap_changeable                             => { type => 'integer', default => 2, not_null => 1 },
19
  ap_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
20
  ar_changeable                             => { type => 'integer', default => 2, not_null => 1 },
21
  ar_paid_accno_id                          => { type => 'integer' },
22
  ar_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
23
  articlenumber                             => { type => 'text' },
24
  assemblynumber                            => { type => 'text' },
25
  balance_startdate_method                  => { type => 'text' },
26
  bin_id                                    => { type => 'integer' },
27
  bin_id_ignore_onhand                      => { type => 'integer' },
28
  businessnumber                            => { type => 'text' },
29
  closedto                                  => { type => 'date' },
30
  cnnumber                                  => { type => 'text' },
31
  co_ustid                                  => { type => 'text' },
32
  coa                                       => { type => 'text' },
33
  company                                   => { type => 'text' },
34
  currency_id                               => { type => 'integer', not_null => 1 },
35
  customer_hourly_rate                      => { type => 'numeric', precision => 8, scale => 2 },
36
  customer_projects_only_in_sales           => { type => 'boolean', default => 'false', not_null => 1 },
37
  customernumber                            => { type => 'text' },
38
  datev_check_on_ap_transaction             => { type => 'boolean', default => 'true' },
39
  datev_check_on_ar_transaction             => { type => 'boolean', default => 'true' },
40
  datev_check_on_gl_transaction             => { type => 'boolean', default => 'true' },
41
  datev_check_on_purchase_invoice           => { type => 'boolean', default => 'true' },
42
  datev_check_on_sales_invoice              => { type => 'boolean', default => 'true' },
43
  dunning_ar                                => { type => 'integer' },
44
  dunning_ar_amount_fee                     => { type => 'integer' },
45
  dunning_ar_amount_interest                => { type => 'integer' },
46
  duns                                      => { type => 'text' },
47
  expense_accno_id                          => { type => 'integer' },
48
  fxgain_accno_id                           => { type => 'integer' },
49
  fxloss_accno_id                           => { type => 'integer' },
50
  gl_changeable                             => { type => 'integer', default => 2, not_null => 1 },
51
  id                                        => { type => 'serial', not_null => 1 },
52
  income_accno_id                           => { type => 'integer' },
53
  inventory_accno_id                        => { type => 'integer' },
54
  inventory_system                          => { type => 'text' },
55
  invnumber                                 => { type => 'text' },
56
  ir_changeable                             => { type => 'integer', default => 2, not_null => 1 },
57
  ir_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
58
  is_changeable                             => { type => 'integer', default => 2, not_null => 1 },
59
  is_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
60
  itime                                     => { type => 'timestamp', default => 'now()' },
61
  language_id                               => { type => 'integer' },
62
  max_future_booking_interval               => { type => 'integer', default => 360 },
63
  mtime                                     => { type => 'timestamp' },
64
  normalize_part_descriptions               => { type => 'boolean', default => 'true' },
65
  normalize_vc_names                        => { type => 'boolean', default => 'true' },
66
  parts_image_css                           => { type => 'text', default => 'border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;' },
67
  parts_listing_image                       => { type => 'boolean', default => 'true' },
68
  parts_show_image                          => { type => 'boolean', default => 'true' },
69
  payments_changeable                       => { type => 'integer', default => '0', not_null => 1 },
70
  pdonumber                                 => { type => 'text' },
71
  ponumber                                  => { type => 'text' },
72
  profit_determination                      => { type => 'text' },
73
  purchase_delivery_order_show_delete       => { type => 'boolean', default => 'true' },
74
  purchase_order_show_delete                => { type => 'boolean', default => 'true' },
75
  reqdate_interval                          => { type => 'integer', default => '0' },
76
  require_transaction_description_ps        => { type => 'boolean', default => 'false', not_null => 1 },
77
  requirement_spec_section_order_part_id    => { type => 'integer' },
78
  revtrans                                  => { type => 'boolean', default => 'false' },
79
  rfqnumber                                 => { type => 'text' },
80
  rmanumber                                 => { type => 'text' },
81
  sales_delivery_order_show_delete          => { type => 'boolean', default => 'true' },
82
  sales_order_show_delete                   => { type => 'boolean', default => 'true' },
83
  sdonumber                                 => { type => 'text' },
84
  sepa_creditor_id                          => { type => 'text' },
85
  servicenumber                             => { type => 'text' },
86
  show_bestbefore                           => { type => 'boolean', default => 'false' },
87
  show_weight                               => { type => 'boolean', default => 'false', not_null => 1 },
88
  signature                                 => { type => 'text' },
89
  sonumber                                  => { type => 'text' },
90
  sqnumber                                  => { type => 'text' },
91
  taxnumber                                 => { type => 'text' },
92
  templates                                 => { type => 'text' },
93
  transfer_default                          => { type => 'boolean', default => 'true' },
94
  transfer_default_ignore_onhand            => { type => 'boolean', default => 'false' },
95
  transfer_default_services                 => { type => 'boolean', default => 'true' },
96
  transfer_default_use_master_default_bin   => { type => 'boolean', default => 'false' },
97
  transport_cost_reminder_article_number_id => { type => 'integer' },
98
  vendornumber                              => { type => 'text' },
99
  version                                   => { type => 'varchar', length => 8 },
100
  vertreter                                 => { type => 'boolean', default => 'false' },
101
  warehouse_id                              => { type => 'integer' },
102
  warehouse_id_ignore_onhand                => { type => 'integer' },
103
  webdav                                    => { type => 'boolean', default => 'false' },
104
  webdav_documents                          => { type => 'boolean', default => 'false' },
105
  weightunit                                => { type => 'varchar', length => 5 },
106 106
);
107 107

  
108 108
__PACKAGE__->meta->primary_key_columns([ 'id' ]);
bin/mozilla/oe.pl
564 564

  
565 565
  $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
566 566

  
567
  my $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number;
567
  my $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number_id;
568 568
  print $form->parse_html_template("oe/form_footer", {
569 569
     %TMPL_VAR,
570 570
     webdav          => $::instance_conf->get_webdav,
......
2088 2088

  
2089 2089
  check_oe_access();
2090 2090

  
2091
  my $transport_article = $::instance_conf->get_transport_cost_reminder_article_number;
2091
  my $transport_article_id = $::instance_conf->get_transport_cost_reminder_article_number_id;
2092 2092
  for my $i (1 .. $form->{rowcount}) {
2093
    return if $form->{"partnumber_${i}"} eq $transport_article;
2093
    return if $form->{"id_${i}"} eq $transport_article_id;
2094 2094
  }
2095 2095

  
2096
  return $transport_article;
2096
  # simply return the name of the part
2097
  return SL::DB::Part->new(id => $transport_article_id)->load()->partnumber;
2097 2098

  
2098 2099
  $main::lxdebug->leave_sub();
2099 2100
}
templates/webpages/client_config/_features.html
111 111
  <tr><td class="listheading" colspan="4">[% LxERP.t8('Transport and service costs reminder') %]</td></tr>
112 112
 <tr>
113 113
  <td align="right">[% LxERP.t8('Default transport article number') %]</td>
114
  <td>[% L.input_tag('defaults.transport_cost_reminder_article_number', SELF.defaults.transport_cost_reminder_article_number, style=style) %]</td>
114
  <td>[% L.part_picker('defaults.transport_cost_reminder_article_number_id', SELF.defaults.transport_cost_reminder_article_number_id, style=style) %]</td>
115 115
   <td>[% LxERP.t8('Before saving a sales order, this article will be checked and a warning is generated.') %]</td>
116 116
 </tr>
117 117
 </table>

Auch abrufbar als: Unified diff