projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
635df4b
)
Drafts: gl auch eingebunden
author
Sven Schöling
<s.schoeling@linet-services.de>
Tue, 24 May 2016 09:23:31 +0000
(11:23 +0200)
committer
Sven Schöling
<s.schoeling@linet-services.de>
Tue, 24 May 2016 09:23:31 +0000
(11:23 +0200)
SL/Controller/Draft.pm
patch
|
blob
|
history
bin/mozilla/gl.pl
patch
|
blob
|
history
templates/webpages/gl/form_footer.html
patch
|
blob
|
history
templates/webpages/gl/form_header.html
patch
|
blob
|
history
diff --git
a/SL/Controller/Draft.pm
b/SL/Controller/Draft.pm
index
33da3bd
..
9eff3fc
100644
(file)
--- a/
SL/Controller/Draft.pm
+++ b/
SL/Controller/Draft.pm
@@
-19,7
+19,7
@@
use Rose::Object::MakeMethods::Generic (
__PACKAGE__->run_before('check_auth');
__PACKAGE__->run_before('check_auth');
-my %allowed_modules = map { $_ => "bin/mozilla/$_.pl" } qw(is ir ar ap);
+my %allowed_modules = map { $_ => "bin/mozilla/$_.pl" } qw(is ir ar ap
gl
);
#
# actions
#
# actions
diff --git
a/bin/mozilla/gl.pl
b/bin/mozilla/gl.pl
index
1040705
..
8a81819
100644
(file)
--- a/
bin/mozilla/gl.pl
+++ b/
bin/mozilla/gl.pl
@@
-45,7
+45,6
@@
use SL::ReportGenerator;
use SL::DBUtils qw(selectrow_query);
require "bin/mozilla/common.pl";
use SL::DBUtils qw(selectrow_query);
require "bin/mozilla/common.pl";
-require "bin/mozilla/drafts.pl";
require "bin/mozilla/reportgenerator.pl";
# this is for our long dates
require "bin/mozilla/reportgenerator.pl";
# this is for our long dates
@@
-84,8
+83,6
@@
sub add {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $form = $main::form;
my %myconfig = %main::myconfig;
- return $main::lxdebug->leave_sub() if (load_draft_maybe());
-
$form->{title} = "Add";
$form->{callback} = "gl.pl?action=add" unless $form->{callback};
$form->{title} = "Add";
$form->{callback} = "gl.pl?action=add" unless $form->{callback};
@@
-1160,7
+1157,7
@@
sub post {
post_transaction();
post_transaction();
- $form->{callback} = build_std_url("action=add
&DONT_LOAD_DRAFT=1
", "show_details");
+ $form->{callback} = build_std_url("action=add", "show_details");
$form->redirect($form->{callback});
$main::lxdebug->leave_sub();
$form->redirect($form->{callback});
$main::lxdebug->leave_sub();
diff --git
a/templates/webpages/gl/form_footer.html
b/templates/webpages/gl/form_footer.html
index
ede815b
..
054aa5a
100644
(file)
--- a/
templates/webpages/gl/form_footer.html
+++ b/
templates/webpages/gl/form_footer.html
@@
-35,13
+35,9
@@
[% L.submit_tag('action', LxERP.t8('Follow-Up'), onclick='follow_up_window()') %]
[%- ELSE %]
[% L.submit_tag('action', LxERP.t8('Follow-Up'), onclick='follow_up_window()') %]
[%- ELSE %]
- [%- IF draft_id %]
- <p>[% L.checkbox_tag('remove_draft', checked=remove_draft, label=LxERP.t8('Remove Draft')) %]</p>
- [%- END %]
-
[% L.submit_tag('action', LxERP.t8('Update'), id='update_button') %]
[% L.submit_tag('action', LxERP.t8('Post')) %]
[% L.submit_tag('action', LxERP.t8('Update'), id='update_button') %]
[% L.submit_tag('action', LxERP.t8('Post')) %]
- [% L.
submit_tag('action', LxERP.t8('Save Draft
')) %]
+ [% L.
button_tag('kivi.Draft.popup("gl", "unknown", "' _ draft_id _ '", "' _ draft_description _ '")', LxERP.t8('Drafts
')) %]
[% L.hidden_tag('draft_id', draft_id) %]
[% L.hidden_tag('draft_description', draft_description) %]
[%- END %]
[% L.hidden_tag('draft_id', draft_id) %]
[% L.hidden_tag('draft_description', draft_description) %]
[%- END %]
diff --git
a/templates/webpages/gl/form_header.html
b/templates/webpages/gl/form_header.html
index
e349761
..
1ad7197
100644
(file)
--- a/
templates/webpages/gl/form_header.html
+++ b/
templates/webpages/gl/form_header.html
@@
-34,6
+34,7
@@
function updateTaxes(row)
</script>
<script type="text/javascript" src="js/show_form_details.js"></script>
<script type="text/javascript" src="js/follow_up.js"></script>
</script>
<script type="text/javascript" src="js/show_form_details.js"></script>
<script type="text/javascript" src="js/follow_up.js"></script>
+<script type="text/javascript" src="js/kivi.Draft.js"></script>
<form method=post name="gl" action=gl.pl>
<form method=post name="gl" action=gl.pl>