Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f8f46881

Von Tamino Steinert vor etwa 1 Jahr hinzugefügt

  • ID f8f468816ccea81387b5cdf00699720849481242
  • Vorgänger 777afb79
  • Nachfolger 0949cead

EmailJournal: DB: Beleg-Type um erweitert

Unterschiede anzeigen:

SL/BackgroundJob/ImportRecordEmails.pm
18 18
    $folder,
19 19
    {
20 20
      email_journal => {
21
        status => 'record_imported',
22
        extended_status => $record_type,
21
        status => 'imported',
22
        record_type => $record_type,
23 23
      },
24 24
    }
25 25
  );
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' ], db_type => 'email_journal_record_type' },
24 25
  sender_id          => { type => 'integer' },
25 26
  sent_on            => { type => 'timestamp', default => 'now()', not_null => 1 },
26
  status             => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported', 'record_imported' ], db_type => 'email_journal_status', not_null => 1 },
27
  status             => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported' ], db_type => 'email_journal_status', not_null => 1 },
27 28
  subject            => { type => 'text', not_null => 1 },
28 29
  uid                => { type => 'integer' },
29 30
);
SL/Presenter/EmailJournal.pm
39 39
    sent            => t8('sent'),
40 40
    send_failed     => t8('send failed'),
41 41
    imported        => t8('imported'),
42
    record_imported => t8('record imported'),
43 42
  );
44 43

  
45 44
  my $status = $email_journal_entry->status;
locale/de/all
5120 5120
  'reclamation item'            => 'Reklamationsitem',
5121 5121
  'reclamation reasons'         => 'Reklamationsgründe',
5122 5122
  'record exchange rate'        => 'Beleg-Wechselkurs',
5123
  'record imported'             => 'Belegimport',
5124 5123
  'release_material'            => 'Materialausgabebe',
5125 5124
  'renew'                       => 'erneuern',
5126 5125
  'reorder item'                => 'Eintrag umsortieren',
locale/en/all
5117 5117
  'reclamation item'            => '',
5118 5118
  'reclamation reasons'         => '',
5119 5119
  'record exchange rate'        => '',
5120
  'record imported'             => '',
5121 5120
  'release_material'            => '',
5122 5121
  'renew'                       => '',
5123 5122
  'reorder item'                => '',
sql/Pg-upgrade2/email_journal_record_import_types.sql
1
-- @tag: email_journal_record_import_types
2
-- @description: vorgesehener Beleg Typ seperat in E-Mail-Journal speichern
3
-- @depends: release_3_8_0 email_journal_extend_status
4

  
5
-- UNDO: ALTER TYPE email_journal_status ADD VALUE 'record_imported' AFTER 'imported';
6
CREATE TYPE email_journal_status_new AS ENUM ('sent', 'send_failed', 'imported');
7
ALTER TABLE email_journal ADD COLUMN status_new email_journal_status_new;
8
UPDATE email_journal SET status_new = 'imported'    WHERE status = 'record_imported';
9
UPDATE email_journal SET status_new = 'imported'    WHERE status = 'imported';
10
UPDATE email_journal SET status_new = 'sent'        WHERE status = 'sent';
11
UPDATE email_journal SET status_new = 'send_failed' WHERE status = 'send_failed';
12
ALTER TABLE email_journal DROP COLUMN status;
13
ALTER TABLE email_journal RENAME COLUMN status_new TO status;
14
ALTER TABLE email_journal ALTER COLUMN status SET NOT NULL;
15
DROP TYPE email_journal_status;
16
ALTER TYPE email_journal_status_new RENAME TO email_journal_status;
17

  
18
CREATE TYPE email_journal_record_type AS ENUM (
19
  -- order
20
  'sales_order', 'purchase_order', 'sales_quotation', 'request_quotation',
21
  'purchase_quotation_intake', 'sales_order_intake',
22
  -- delivery order
23
  'sales_delivery_order', 'purchase_delivery_order',
24
  'supplier_delivery_order', 'rma_delivery_order',
25
  -- reclamation
26
  'sales_reclamation', 'purchase_reclamation',
27
  -- invoice
28
  'invoice', 'invoice_for_advance_payment',
29
  'invoice_for_advance_payment_storno', 'final_invoice', 'invoice_storno',
30
  'credit_note', 'credit_note_storno',
31
  -- purchase invoice
32
  'purchase_invoice', 'purchase_credit_note',
33
  --transaction
34
  'ap_transaction', 'ar_transaction', 'gl_transaction'
35
);
36
ALTER TABLE email_journal ADD COLUMN record_type email_journal_record_type;
templates/design40_webpages/email_journal/_filter.html
27 27
                 [ "send_failed", LxERP.t8("send failed") ],
28 28
                 [ "sent", LxERP.t8("sent") ],
29 29
                 [ "imported", LxERP.t8("imported") ]
30
                 [ "record_imported", LxERP.t8("record imported") ]
31 30
               ], default=filter.status_eq_ignore_empty) %]
32 31
      </td>
33 32
    </tr>
templates/design40_webpages/email_journal/show.html
48 48
</div>
49 49
[% END %]
50 50

  
51
[% IF SELF.entry.status == 'imported' || SELF.entry.status == 'record_imported' %]
51
[% IF SELF.entry.status == 'imported' %]
52 52
<div class="wrapper input-panel control-panel" style="display:block">
53 53
  <form method="post" action="controller.pl" id="record_action_form">
54 54
    [% L.hidden_tag('email_journal_id', SELF.entry.id) %]
templates/webpages/email_journal/_filter.html
31 31
               [ "send_failed", LxERP.t8("send failed") ],
32 32
               [ "sent", LxERP.t8("sent") ],
33 33
               [ "imported", LxERP.t8("imported") ]
34
               [ "record_imported", LxERP.t8("record imported") ]
35 34
             ], default=filter.status_eq_ignore_empty) %]</td>
36 35
   </tr>
37 36
  </table>

Auch abrufbar als: Unified diff