Revision 39bdd9e0
Von Jan Büren vor mehr als 3 Jahren hinzugefügt
bin/mozilla/ap.pl | ||
---|---|---|
860 | 860 |
# no restore_from_session_id needed. we like to have a newly generated |
861 | 861 |
# list of invoices for bank transactions |
862 | 862 |
print $form->redirect_header($form->{callback}) if ($form->{callback} =~ /BankTransaction/); |
863 |
$form->redirect($locale->text('AP transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id}) unless $inline; |
|
864 |
# TODO Add callback/return flag in myconfig |
|
865 | 863 |
# With version 3.5 we can add documents, but only after posting. there should be a flag in myconfig for the user |
866 | 864 |
# $form->{callback} ||= 'ap.pl?action=edit&id=' . $form->{id} if $myconfig{no_reset_arap}; |
865 |
# or a client config setting |
|
866 |
if ($::instance_conf->get_ap_add_doc && $::instance_conf->get_doc_storage) { |
|
867 |
my $add_doc_url = build_std_url("script=ap.pl", 'action=edit', 'id=' . E($form->{id})); |
|
868 |
print $form->redirect_header($add_doc_url); |
|
869 |
} |
|
867 | 870 |
|
871 |
$form->redirect($locale->text('AP transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id}) unless $inline; |
|
868 | 872 |
} else { |
869 | 873 |
$form->error($locale->text('Cannot post transaction!')); |
870 | 874 |
} |
bin/mozilla/ar.pl | ||
---|---|---|
817 | 817 |
} |
818 | 818 |
# /saving the history |
819 | 819 |
|
820 |
if ($::instance_conf->get_ar_add_doc && $::instance_conf->get_doc_storage) { |
|
821 |
my $add_doc_url = build_std_url("script=ar.pl", 'action=edit', 'id=' . E($form->{id})); |
|
822 |
print $form->redirect_header($add_doc_url); |
|
823 |
} |
|
820 | 824 |
$form->redirect($locale->text('AR transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id}) unless $inline; |
821 | 825 |
|
822 | 826 |
$main::lxdebug->leave_sub(); |
bin/mozilla/gl.pl | ||
---|---|---|
1395 | 1395 |
if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) { |
1396 | 1396 |
print $form->redirect_header($form->{callback}); |
1397 | 1397 |
$form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id}); |
1398 |
} elsif ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) { |
|
1399 |
my $add_doc_url = build_std_url("script=gl.pl", 'action=edit', 'id=' . E($form->{id})); |
|
1400 |
print $form->redirect_header($add_doc_url); |
|
1401 |
$form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id}); |
|
1398 | 1402 |
} |
1399 | 1403 |
|
1400 | 1404 |
# remove or clarify |
bin/mozilla/ir.pl | ||
---|---|---|
935 | 935 |
$form->save_history; |
936 | 936 |
} |
937 | 937 |
# /saving the history |
938 |
# I keep the old default / comment for refactorer, pls check instance_conf: |
|
939 |
#if ($::instance_conf->get_ir_add_doc && $::instance_conf->get_doc_storage) { |
|
940 |
# my $add_doc_url = build_std_url("script=ir.pl", 'action=edit', 'id=' . E($form->{id})); |
|
941 |
# print $form->redirect_header($add_doc_url); |
|
942 |
#} |
|
938 | 943 |
$form->{callback} = 'ir.pl?action=edit&id=' . $form->{id}; |
939 | 944 |
$form->redirect( $locale->text('Invoice') |
940 | 945 |
. " $form->{invnumber} " |
doc/changelog | ||
---|---|---|
36 | 36 |
Mahnung |
37 | 37 |
|
38 | 38 |
Kleinere neue Features und Detailverbesserungen: |
39 |
- Falls der Mandant zu jeder Buchung einen Beleg hinzufügen möchte, |
|
40 |
ist dies jetzt in der Mandantenkonfiguration einstellbar und falls |
|
41 |
zusätzlich die DMS Funktion aktiv ist, bleibt der Bearbeiter nach |
|
42 |
dem Erfassen einer Buchung in der Maske und kann einen Beleg hinzufügen |
|
39 | 43 |
- Ausgelagerte Lieferscheinen können zurückgelagerte werden insofern der |
40 | 44 |
konfigurierbare Zurücklagerungszeitraum noch nicht überschritten ist. |
41 | 45 |
- Angebote und Aufträge im Ein- und Verkauf können optionale Positionen enthalten. |
locale/de/all | ||
---|---|---|
208 | 208 |
'Add custom data export query' => 'Benutzerdefinierte Datenexport-Abfrage erfassen', |
209 | 209 |
'Add custom variable' => 'Benutzerdefinierte Variable erfassen', |
210 | 210 |
'Add department' => 'Abteilung hinzufügen', |
211 |
'Add document for AP transactions' => 'Dokumente für Kreditorenbuchung hinzufügen (benötigt DMS)', |
|
212 |
'Add document for AR transactions' => 'Dokumente für Debitorenbuchung hinzufügen (benötigt DMS)', |
|
213 |
'Add document for GL transactions' => 'Dokumente für Dialogbuchung hinzufügen (benötigt DMS)', |
|
214 |
'Add document for Purchase invoices' => 'Dokumente für Einkaufsrechnung hinzufügen (benötigt DMS)', |
|
211 | 215 |
'Add empty line (csv_import)' => 'Leere Zeile einfügen', |
212 | 216 |
'Add function block' => 'Funktionsblock hinzufügen', |
213 | 217 |
'Add greeting' => 'Anrede hinzufügen', |
... | ... | |
3067 | 3071 |
'Show delivery value report' => 'Lieferwertbericht anzeigen', |
3068 | 3072 |
'Show details' => 'Details anzeigen', |
3069 | 3073 |
'Show details and reports of parts, services, assemblies' => 'Details und Berichte von Waren, Dienstleistungen und Erzeugnissen anzeigen', |
3074 |
'Show document tab after posting?' => 'Buchungsmaske nicht verlassen', |
|
3070 | 3075 |
'Show documents in WebDAV' => 'Dokumente im WebDAV anzeigen', |
3071 | 3076 |
'Show documents in file storage' => 'Dokumente im Dateimanagement anzeigen', |
3072 | 3077 |
'Show fields used for the best before date?' => 'Felder zur Eingabe des Mindesthaltbarkeitsdatums anzeigen?', |
locale/en/all | ||
---|---|---|
208 | 208 |
'Add custom data export query' => '', |
209 | 209 |
'Add custom variable' => '', |
210 | 210 |
'Add department' => '', |
211 |
'Add document for AP transactions' => '', |
|
212 |
'Add document for AR transactions' => '', |
|
213 |
'Add document for GL transactions' => '', |
|
214 |
'Add document for Purchase invoices' => '', |
|
211 | 215 |
'Add empty line (csv_import)' => '', |
212 | 216 |
'Add function block' => '', |
213 | 217 |
'Add greeting' => '', |
... | ... | |
3067 | 3071 |
'Show delivery value report' => '', |
3068 | 3072 |
'Show details' => '', |
3069 | 3073 |
'Show details and reports of parts, services, assemblies' => '', |
3074 |
'Show document tab after posting?' => '', |
|
3070 | 3075 |
'Show documents in WebDAV' => '', |
3071 | 3076 |
'Show documents in file storage' => '', |
3072 | 3077 |
'Show fields used for the best before date?' => '', |
templates/webpages/client_config/_posting_configuration.html | ||
---|---|---|
38 | 38 |
<tr> </tr> |
39 | 39 |
|
40 | 40 |
<tr> |
41 |
<td align="right">[% LxERP.t8(' Add document for Purchase invoices') %]</td>
|
|
41 |
<td align="right">[% LxERP.t8('Add document for Purchase invoices') %]</td> |
|
42 | 42 |
<td>[% L.yes_no_tag('defaults.ir_add_doc', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ir_add_doc) %]</td> |
43 | 43 |
<td>[% LxERP.t8('Show document tab after posting?') %]</td> |
44 | 44 |
</tr> |
45 | 45 |
<tr> |
46 |
<td align="right">[% LxERP.t8(' Add document for AR transactions') %]</td>
|
|
46 |
<td align="right">[% LxERP.t8('Add document for AR transactions') %]</td> |
|
47 | 47 |
<td>[% L.yes_no_tag('defaults.ar_add_doc', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ar_add_doc) %]</td> |
48 | 48 |
<td>[% LxERP.t8('Show document tab after posting?') %]</td> |
49 | 49 |
</tr> |
50 | 50 |
<tr> |
51 |
<td align="right">[% LxERP.t8(' Add document for AP transactions') %]</td>
|
|
51 |
<td align="right">[% LxERP.t8('Add document for AP transactions') %]</td> |
|
52 | 52 |
<td>[% L.yes_no_tag('defaults.ap_add_doc', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ap_add_doc) %]</td> |
53 | 53 |
<td>[% LxERP.t8('Show document tab after posting?') %]</td> |
54 | 54 |
</tr> |
55 | 55 |
<tr> |
56 |
<td align="right">[% LxERP.t8(' Add document for GL transactions') %]</td>
|
|
56 |
<td align="right">[% LxERP.t8('Add document for GL transactions') %]</td> |
|
57 | 57 |
<td>[% L.yes_no_tag('defaults.gl_add_doc', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.gl_add_doc) %]</td> |
58 | 58 |
<td>[% LxERP.t8('Show document tab after posting?') %]</td> |
59 | 59 |
</tr> |
Auch abrufbar als: Unified diff
Prüfung ob nach einer Buchung noch ein Beleg erfasst werden soll