projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
am.pl
diff --git
a/bin/mozilla/am.pl
b/bin/mozilla/am.pl
index
f967c79
..
c114c7e
100644
(file)
--- a/
bin/mozilla/am.pl
+++ b/
bin/mozilla/am.pl
@@
-336,7
+336,7
@@
sub account_header {
# account where AR_tax or AP_tax is set are not orphaned if they are used as
# tax-o-matic account
# account where AR_tax or AP_tax is set are not orphaned if they are used as
# tax-o-matic account
- if ( $form->{id} &&
!
$form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
+ if ( $form->{id} && $form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
if (SL::DB::Manager::Tax->find_by(chart_id => $form->{id})) {
$form->{orphaned} = 0;
}
if (SL::DB::Manager::Tax->find_by(chart_id => $form->{id})) {
$form->{orphaned} = 0;
}
@@
-944,7
+944,7
@@
sub edit_defaults {
# default language
my $all_languages = SL::DB::Manager::Language->get_all;
# default language
my $all_languages = SL::DB::Manager::Language->get_all;
-#
EÜR = cash, Bilanzierung = accrual
+#
cash = IST-Versteuerung, accrual = SOLL-Versteuerung
foreach my $key (keys %{ $form->{IC} }) {
foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {
foreach my $key (keys %{ $form->{IC} }) {
foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {
@@
-1590,7
+1590,7
@@
sub add_price_factor {
$form->{title} = $locale->text('Add Price Factor');
$form->{callback} ||= build_std_url('action=add_price_factor');
$form->{title} = $locale->text('Add Price Factor');
$form->{callback} ||= build_std_url('action=add_price_factor');
- $
form->{fokus} = 'description'
;
+ $
::request->{layout}->focus('#description')
;
$form->header();
print $form->parse_html_template('am/edit_price_factor');
$form->header();
print $form->parse_html_template('am/edit_price_factor');
@@
-1609,7
+1609,7
@@
sub edit_price_factor {
$form->{title} = $locale->text('Edit Price Factor');
$form->{callback} ||= build_std_url('action=add_price_factor');
$form->{title} = $locale->text('Edit Price Factor');
$form->{callback} ||= build_std_url('action=add_price_factor');
- $
form->{fokus} = 'description'
;
+ $
::request->{layout}->focus('#description')
;
AM->get_price_factor(\%myconfig, $form);
AM->get_price_factor(\%myconfig, $form);
@@
-1697,7
+1697,7
@@
sub add_warehouse {
$form->{title} = $locale->text('Add Warehouse');
$form->{callback} ||= build_std_url('action=add_warehouse');
$form->{title} = $locale->text('Add Warehouse');
$form->{callback} ||= build_std_url('action=add_warehouse');
- $
form->{fokus} = 'description'
;
+ $
::request->{layout}->focus('#description')
;
$form->header();
print $form->parse_html_template('am/edit_warehouse');
$form->header();
print $form->parse_html_template('am/edit_warehouse');
@@
-1720,7
+1720,7
@@
sub edit_warehouse {
$form->{title} = $locale->text('Edit Warehouse');
$form->{callback} ||= build_std_url('action=list_warehouses');
$form->{title} = $locale->text('Edit Warehouse');
$form->{callback} ||= build_std_url('action=list_warehouses');
- $
form->{fokus} = 'description'
;
+ $
::request->{layout}->focus('#description')
;
$form->header();
print $form->parse_html_template('am/edit_warehouse');
$form->header();
print $form->parse_html_template('am/edit_warehouse');