Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 537f8f59

Von Tamino Steinert vor 12 Monaten hinzugefügt

  • ID 537f8f59b1e9d656f7ca677653ab2c7abe4a29a8
  • Vorgänger 817e6304
  • Nachfolger 0292a56e

EmailJournal: Belegtype Catch-All hinzugefügt

Unterschiede anzeigen:

SL/BackgroundJob/ImportRecordEmails.pm
115 115
    || {};
116 116
  # overwrite with background job data
117 117
  $config->{$_} = $data->{$_} for keys %$data;
118
  $config->{record_type} ||= 'catch_all';
118 119

  
119 120
  $record_type = $config->{record_type};
120 121
  if ($record_type) {
......
164 165
=item record_type
165 166

  
166 167
The record type to set for each imported email journal. This is used to get
167
a specific config under [record_emails_imap/record_type/<record_type>].
168
a specific config under [record_emails_imap/record_type/<record_type>]. The
169
default value is C<catch_all>
168 170

  
169 171
=item folder
170 172

  
SL/DB/MetaSetup/EmailJournal.pm
21 21
  mtime              => { type => 'timestamp', default => 'now()', not_null => 1 },
22 22
  obsolete           => { type => 'boolean', default => 'false', not_null => 1 },
23 23
  recipients         => { type => 'text', not_null => 1 },
24
  record_type        => { type => 'enum', check_in => [ 'sales_order', 'purchase_order', 'sales_quotation', 'request_quotation', 'purchase_quotation_intake', 'sales_order_intake', 'sales_delivery_order', 'purchase_delivery_order', 'supplier_delivery_order', 'rma_delivery_order', 'sales_reclamation', 'purchase_reclamation', 'invoice', 'invoice_for_advance_payment', 'invoice_for_advance_payment_storno', 'final_invoice', 'invoice_storno', 'credit_note', 'credit_note_storno', 'purchase_invoice', 'purchase_credit_note', 'ap_transaction', 'ar_transaction', 'gl_transaction', 'purchase_order_confirmation' ], db_type => 'email_journal_record_type' },
24
  record_type        => { type => 'enum', check_in => [ 'sales_order', 'purchase_order', 'sales_quotation', 'request_quotation', 'purchase_quotation_intake', 'sales_order_intake', 'sales_delivery_order', 'purchase_delivery_order', 'supplier_delivery_order', 'rma_delivery_order', 'sales_reclamation', 'purchase_reclamation', 'invoice', 'invoice_for_advance_payment', 'invoice_for_advance_payment_storno', 'final_invoice', 'invoice_storno', 'credit_note', 'credit_note_storno', 'purchase_invoice', 'purchase_credit_note', 'ap_transaction', 'ar_transaction', 'gl_transaction', 'purchase_order_confirmation', 'catch_all' ], db_type => 'email_journal_record_type' },
25 25
  sender_id          => { type => 'integer' },
26 26
  sent_on            => { type => 'timestamp', default => 'now()', not_null => 1 },
27 27
  status             => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported' ], db_type => 'email_journal_status', not_null => 1 },
locale/de/all
707 707
  'Cash'                        => 'Zahlungsverkehr',
708 708
  'Cash accounting'             => 'Ist-Versteuerung',
709 709
  'Cash basis accounting'       => 'Einnahmen-Überschuss-Rechnung',
710
  'Catch-all'                   => 'Catch-All',
710 711
  'Category'                    => 'Artikelkategorie',
711 712
  'Cc'                          => 'Cc',
712 713
  'Cc E-mail'                   => 'CC (E-Mail)',
locale/en/all
707 707
  'Cash'                        => '',
708 708
  'Cash accounting'             => '',
709 709
  'Cash basis accounting'       => '',
710
  'Catch-all'                   => '',
710 711
  'Category'                    => '',
711 712
  'Cc'                          => '',
712 713
  'Cc E-mail'                   => '',
sql/Pg-upgrade2/email_journal_record_types_add_chatall.sql
1
-- @tag: email_journal_record_types_add_catch_all
2
-- @description: E-Mail-Journal Beleg Type um generischen Type erweitern
3
-- @depends: email_journal_record_import_types
4

  
5
ALTER TYPE email_journal_record_type ADD VALUE IF NOT EXISTS 'catch_all';
templates/design40_webpages/email_journal/_filter.html
35 35
      <td>
36 36
        [%
37 37
          SET record_type_options = [];
38
          record_type_options.push({text=LxERP.t8("Catch-all"), record_type='catch_all'});
38 39
          FOREACH record_info = RECORD_TYPES_WITH_INFO;
39 40
            IF (!record_info.is_template);
40 41
              record_type_options.push(record_info);
templates/webpages/email_journal/_filter.html
38 38
      <td>
39 39
        [%
40 40
          SET record_type_options = [];
41
          record_type_options.push({text=LxERP.t8("Catch-all"), record_type='catch_all'});
41 42
          FOREACH record_info = RECORD_TYPES_WITH_INFO;
42 43
            IF (!record_info.is_template);
43 44
              record_type_options.push(record_info);

Auch abrufbar als: Unified diff