Revision cada7dd4
Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt
| SL/BackgroundJob/ImportRecordEmails.pm | ||
|---|---|---|
|
$folder,
|
||
|
{
|
||
|
email_journal => {
|
||
|
status => 'record_imported',
|
||
|
extended_status => $record_type,
|
||
|
status => 'imported',
|
||
|
record_type => $record_type,
|
||
|
},
|
||
|
}
|
||
|
);
|
||
| SL/DB/MetaSetup/EmailJournal.pm | ||
|---|---|---|
|
mtime => { type => 'timestamp', default => 'now()', not_null => 1 },
|
||
|
obsolete => { type => 'boolean', default => 'false', not_null => 1 },
|
||
|
recipients => { type => 'text', not_null => 1 },
|
||
|
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' },
|
||
|
sender_id => { type => 'integer' },
|
||
|
sent_on => { type => 'timestamp', default => 'now()', not_null => 1 },
|
||
|
status => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported', 'record_imported' ], db_type => 'email_journal_status', not_null => 1 },
|
||
|
status => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported' ], db_type => 'email_journal_status', not_null => 1 },
|
||
|
subject => { type => 'text', not_null => 1 },
|
||
|
uid => { type => 'integer' },
|
||
|
);
|
||
| SL/Presenter/EmailJournal.pm | ||
|---|---|---|
|
sent => t8('sent'),
|
||
|
send_failed => t8('send failed'),
|
||
|
imported => t8('imported'),
|
||
|
record_imported => t8('record imported'),
|
||
|
);
|
||
|
|
||
|
my $status = $email_journal_entry->status;
|
||
| locale/de/all | ||
|---|---|---|
|
'reclamation item' => 'Reklamationsitem',
|
||
|
'reclamation reasons' => 'Reklamationsgründe',
|
||
|
'record exchange rate' => 'Beleg-Wechselkurs',
|
||
|
'record imported' => 'Belegimport',
|
||
|
'release_material' => 'Materialausgabebe',
|
||
|
'renew' => 'erneuern',
|
||
|
'reorder item' => 'Eintrag umsortieren',
|
||
| locale/en/all | ||
|---|---|---|
|
'reclamation item' => '',
|
||
|
'reclamation reasons' => '',
|
||
|
'record exchange rate' => '',
|
||
|
'record imported' => '',
|
||
|
'release_material' => '',
|
||
|
'renew' => '',
|
||
|
'reorder item' => '',
|
||
| sql/Pg-upgrade2/email_journal_record_import_types.sql | ||
|---|---|---|
|
-- @tag: email_journal_record_import_types
|
||
|
-- @description: vorgesehener Beleg Typ seperat in E-Mail-Journal speichern
|
||
|
-- @depends: release_3_8_0 email_journal_extend_status
|
||
|
|
||
|
-- UNDO: ALTER TYPE email_journal_status ADD VALUE 'record_imported' AFTER 'imported';
|
||
|
CREATE TYPE email_journal_status_new AS ENUM ('sent', 'send_failed', 'imported');
|
||
|
ALTER TABLE email_journal ADD COLUMN status_new email_journal_status_new;
|
||
|
UPDATE email_journal SET status_new = 'imported' WHERE status = 'record_imported';
|
||
|
UPDATE email_journal SET status_new = 'imported' WHERE status = 'imported';
|
||
|
UPDATE email_journal SET status_new = 'sent' WHERE status = 'sent';
|
||
|
UPDATE email_journal SET status_new = 'send_failed' WHERE status = 'send_failed';
|
||
|
ALTER TABLE email_journal DROP COLUMN status;
|
||
|
ALTER TABLE email_journal RENAME COLUMN status_new TO status;
|
||
|
ALTER TABLE email_journal ALTER COLUMN status SET NOT NULL;
|
||
|
DROP TYPE email_journal_status;
|
||
|
ALTER TYPE email_journal_status_new RENAME TO email_journal_status;
|
||
|
|
||
|
CREATE TYPE email_journal_record_type AS ENUM (
|
||
|
-- order
|
||
|
'sales_order', 'purchase_order', 'sales_quotation', 'request_quotation',
|
||
|
'purchase_quotation_intake', 'sales_order_intake',
|
||
|
-- delivery order
|
||
|
'sales_delivery_order', 'purchase_delivery_order',
|
||
|
'supplier_delivery_order', 'rma_delivery_order',
|
||
|
-- reclamation
|
||
|
'sales_reclamation', 'purchase_reclamation',
|
||
|
-- invoice
|
||
|
'invoice', 'invoice_for_advance_payment',
|
||
|
'invoice_for_advance_payment_storno', 'final_invoice', 'invoice_storno',
|
||
|
'credit_note', 'credit_note_storno',
|
||
|
-- purchase invoice
|
||
|
'purchase_invoice', 'purchase_credit_note',
|
||
|
--transaction
|
||
|
'ap_transaction', 'ar_transaction', 'gl_transaction'
|
||
|
);
|
||
|
ALTER TABLE email_journal ADD COLUMN record_type email_journal_record_type;
|
||
| templates/design40_webpages/email_journal/_filter.html | ||
|---|---|---|
|
[ "send_failed", LxERP.t8("send failed") ],
|
||
|
[ "sent", LxERP.t8("sent") ],
|
||
|
[ "imported", LxERP.t8("imported") ]
|
||
|
[ "record_imported", LxERP.t8("record imported") ]
|
||
|
], default=filter.status_eq_ignore_empty) %]
|
||
|
</td>
|
||
|
</tr>
|
||
| templates/design40_webpages/email_journal/show.html | ||
|---|---|---|
|
</div>
|
||
|
[% END %]
|
||
|
|
||
|
[% IF SELF.entry.status == 'imported' || SELF.entry.status == 'record_imported' %]
|
||
|
[% IF SELF.entry.status == 'imported' %]
|
||
|
<div class="wrapper input-panel control-panel" style="display:block">
|
||
|
<form method="post" action="controller.pl" id="record_action_form">
|
||
|
[% L.hidden_tag('email_journal_id', SELF.entry.id) %]
|
||
| templates/webpages/email_journal/_filter.html | ||
|---|---|---|
|
[ "send_failed", LxERP.t8("send failed") ],
|
||
|
[ "sent", LxERP.t8("sent") ],
|
||
|
[ "imported", LxERP.t8("imported") ]
|
||
|
[ "record_imported", LxERP.t8("record imported") ]
|
||
|
], default=filter.status_eq_ignore_empty) %]</td>
|
||
|
</tr>
|
||
|
</table>
|
||
Auch abrufbar als: Unified diff
EmailJournal: DB: Beleg-Type um erweitert