projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vergessenes locales-Update zum letzten Commit.
[kivitendo-erp.git]
/
bin
/
mozilla
/
pe.pl
diff --git
a/bin/mozilla/pe.pl
b/bin/mozilla/pe.pl
index
07ba302
..
ef3a5a0
100644
(file)
--- a/
bin/mozilla/pe.pl
+++ b/
bin/mozilla/pe.pl
@@
-47,11
+47,11
@@
sub add {
# construct callback
$form->{callback} =
# construct callback
$form->{callback} =
- "$form->{script}?action=add&type=$form->{type}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
unless $form->{callback};
-
&{"form_$form->{type}_header"}
;
-
&{"form_$form->{type}_footer"}
;
+
call_sub("form_$form->{type}_header")
;
+
call_sub("form_$form->{type}_footer")
;
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
@@
-72,8
+72,8
@@
sub edit {
if ($form->{type} eq 'pricegroup') {
PE->get_pricegroup(\%myconfig, \%$form);
}
if ($form->{type} eq 'pricegroup') {
PE->get_pricegroup(\%myconfig, \%$form);
}
-
&{"form_$form->{type}_header"}
;
-
&{"form_$form->{type}_footer"}
;
+
call_sub("form_$form->{type}_header")
;
+
call_sub("form_$form->{type}_footer")
;
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
@@
-173,7
+173,6
@@
sub search {
<input type=hidden name=nextsub value=$report>
<input type=hidden name=nextsub value=$report>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-197,7
+196,7
@@
sub project_report {
PE->projects(\%myconfig, \%$form);
$callback =
PE->projects(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=project_report&type=$form->{type}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" .
+ "$form->{script}?action=project_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" .
E($form->{active});
$href = $callback;
E($form->{active});
$href = $callback;
@@
-278,7
+277,7
@@
sub project_report {
|;
$column_data{projectnumber} =
|;
$column_data{projectnumber} =
- qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber}</td>|;
+ qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber}</td>|;
$column_data{description} = qq|<td>$ref->{description} </td>|;
$column_data{active} =
qq|<td>| .
$column_data{description} = qq|<td>$ref->{description} </td>|;
$column_data{active} =
qq|<td>| .
@@
-308,7
+307,6
@@
sub project_report {
<input type=hidden name=type value=$form->{type}>
<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-413,7
+411,6
@@
sub form_project_footer {
<input name=callback type=hidden value="$form->{callback}">
<input name=callback type=hidden value="$form->{callback}">
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-427,11
+424,6
@@
sub form_project_footer {
. $locale->text('Delete') . qq|">|;
}
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
<input type=button onclick=set_history_window(|
# button for saving history
print qq|
<input type=button onclick=set_history_window(|
@@
-440,8
+432,6
@@
print qq|
. $locale->text('history')
. qq|>|;
# /button for saving history
. $locale->text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|
</form>
print qq|
</form>
@@
-474,6
+464,7
@@
sub save {
}
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
}
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
$form->{addition} = "SAVED";
$form->save_history($form->dbconnect(\%myconfig));
}
$form->{addition} = "SAVED";
$form->save_history($form->dbconnect(\%myconfig));
}
@@
-498,6
+489,7
@@
sub delete {
}
# saving the history
if(!exists $form->{addition}) {
}
# saving the history
if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
$form->{addition} = "DELETED";
$form->save_history($form->dbconnect(\%myconfig));
}
$form->{addition} = "DELETED";
$form->save_history($form->dbconnect(\%myconfig));
}
@@
-505,7
+497,7
@@
sub delete {
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
-sub continue {
&{ $form->{nextsub} }
}
+sub continue {
call_sub($form->{"nextsub"});
}
sub partsgroup_report {
$lxdebug->enter_sub();
sub partsgroup_report {
$lxdebug->enter_sub();
@@
-514,7
+506,7
@@
sub partsgroup_report {
PE->partsgroups(\%myconfig, \%$form);
$callback =
PE->partsgroups(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=partsgroup_report&type=$form->{type}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&status=$form->{status}";
+ "$form->{script}?action=partsgroup_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
if ($form->{status} eq 'all') {
$option = $locale->text('All');
if ($form->{status} eq 'all') {
$option = $locale->text('All');
@@
-575,7
+567,7
@@
sub partsgroup_report {
|;
$column_data{partsgroup} =
|;
$column_data{partsgroup} =
- qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partsgroup}</td>|;
+ qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partsgroup}</td>|;
map { print "$column_data{$_}\n" } @column_index;
print "
map { print "$column_data{$_}\n" } @column_index;
print "
@@
-599,7
+591,6
@@
sub partsgroup_report {
<input type=hidden name=type value=$form->{type}>
<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-667,7
+658,6
@@
sub form_partsgroup_footer {
<input name=callback type=hidden value="$form->{callback}">
<input name=callback type=hidden value="$form->{callback}">
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-681,11
+671,6
@@
sub form_partsgroup_footer {
. $locale->text('Delete') . qq|">|;
}
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
<input type=button onclick=set_history_window(|
# button for saving history
print qq|
<input type=button onclick=set_history_window(|
@@
-694,8
+679,6
@@
print qq|
. $locale->text('history')
. qq|>|;
# /button for saving history
. $locale->text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|
</form>
print qq|
</form>
@@
-716,7
+699,7
@@
sub pricegroup_report {
PE->pricegroups(\%myconfig, \%$form);
$callback =
PE->pricegroups(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=pricegroup_report&type=$form->{type}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&status=$form->{status}";
+ "$form->{script}?action=pricegroup_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
if ($form->{status} eq 'all') {
$option = $locale->text('All');
if ($form->{status} eq 'all') {
$option = $locale->text('All');
@@
-779,7
+762,7
@@
sub pricegroup_report {
<tr valign=top class=listrow$i>
|;
$column_data{pricegroup} =
<tr valign=top class=listrow$i>
|;
$column_data{pricegroup} =
- qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup}</td>|;
+ qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup}</td>|;
map { print "$column_data{$_}\n" } @column_index;
map { print "$column_data{$_}\n" } @column_index;
@@
-804,7
+787,6
@@
sub pricegroup_report {
<input type=hidden name=type value=$form->{type}>
<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-876,7
+858,6
@@
sub form_pricegroup_footer {
<input name=callback type=hidden value="$form->{callback}">
<input name=callback type=hidden value="$form->{callback}">
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-890,11
+871,6
@@
sub form_pricegroup_footer {
. $locale->text('Delete') . qq|">|;
}
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
<input type=button onclick=set_history_window(|
# button for saving history
print qq|
<input type=button onclick=set_history_window(|
@@
-903,8
+879,6
@@
print qq|
. $locale->text('history')
. qq|>|;
# /button for saving history
. $locale->text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|
</form>
print qq|
</form>