X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=ca1ee4c0d89b75ed1b3fcf9f4a17b198a20ae3a3;hb=a9d015d8e68020faaed94c1d9db08e0151b84c92;hp=fcaf0b2a5691949519f8ef9991e45f69405b968b;hpb=e07e9534d0c611913e31bc620c65e46701e5f000;p=kivitendo-erp.git diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index fcaf0b2a5..ca1ee4c0d 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -40,16 +40,15 @@ use Data::Dumper; 1; - - -require "$form->{path}/common.pl"; +require "bin/mozilla/common.pl"; # end of main -sub add { &{"add_$form->{type}"} } -sub edit { &{"edit_$form->{type}"} } -sub save { &{"save_$form->{type}"} } -sub delete { &{"delete_$form->{type}"} } +sub add { call_sub("add_$form->{type}"); } +sub delete { call_sub("delete_$form->{type}"); } +sub save { call_sub("save_$form->{type}"); } +sub edit { call_sub("edit_$form->{type}"); } +sub continue { call_sub($form->{"nextsub"}); } sub add_account { $lxdebug->enter_sub(); @@ -59,7 +58,7 @@ sub add_account { AM->get_account(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &account_header; @@ -96,13 +95,16 @@ sub account_header { $form->{description} =~ s/\"/"/g; if (@{ $form->{TAXKEY} }) { - foreach $item (@{ $form->{TAXKEY} }) { + foreach my $item (@{ $form->{TAXKEY} }) { + + $item->{rate} = $item->{rate} * 100 . '%'; + if ($item->{tax} == $form->{tax}) { $form->{selecttaxkey} .= - "{tax} selected>$item->{taxdescription}\n"; + "{tax} selected>$item->{taxdescription} ($item->{rate})\n"; } else { $form->{selecttaxkey} .= - "{tax}>$item->{taxdescription}\n"; + "{tax}>$item->{taxdescription} ($item->{rate})\n"; } } @@ -483,7 +485,6 @@ sub form_footer { -{path}> {login}> {password}> @@ -532,7 +533,7 @@ sub list_account { # construct callback $callback = - "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}"; $form->header; @@ -597,7 +598,7 @@ sub list_account { $ca->{link_edit_account} = qq|$form->{script}?action=edit_account&id=$ca->{id}| - .qq|&path=$form->{path}&login=$form->{login}| + .qq|&login=$form->{login}| .qq|&password=$form->{password}&callback=$callback|; } @@ -642,7 +643,7 @@ sub add_department { $form->{role} = "P"; $form->{callback} = - "$form->{script}?action=add_department&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_department&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &department_header; @@ -670,7 +671,7 @@ sub list_department { AM->departments(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_department&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_department&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -726,7 +727,7 @@ sub list_department { $profitcenter = ($ref->{role} eq "P") ? "X" : ""; $column_data{description} = - qq|{script}?action=edit_department&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; + qq|{script}?action=edit_department&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; $column_data{cost} = qq|$costcenter|; $column_data{profit} = qq|$profitcenter|; @@ -753,7 +754,6 @@ sub list_department { -{path}> {login}> {password}> @@ -850,7 +850,7 @@ sub add_lead { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_lead&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &lead_header; @@ -880,7 +880,7 @@ sub list_lead { AM->lead(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_lead&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -924,7 +924,7 @@ sub list_lead { $lead = $ref->{lead}; $column_data{description} = - qq|{script}?action=edit_lead&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}|; + qq|{script}?action=edit_lead&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}|; map { print "$column_data{$_}\n" } @column_index; @@ -946,7 +946,6 @@ sub list_lead { -{path}> {login}> {password}> @@ -1027,7 +1026,7 @@ sub add_business { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_business&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &business_header; @@ -1057,7 +1056,7 @@ sub list_business { AM->business(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_business&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_business&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -1110,13 +1109,11 @@ sub list_business { |; $discount = - $form->format_amount(\%myconfig, $ref->{discount} * 100, 1, " "); + $form->format_amount(\%myconfig, $ref->{discount} * 100); $description = - ($ref->{salesman}) - ? "$ref->{description}" - : "$ref->{description}"; + $ref->{description}; $column_data{description} = - qq|{script}?action=edit_business&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$description|; + qq|{script}?action=edit_business&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$description|; $column_data{discount} = qq|$discount|; $column_data{customernumberinit} = qq|$ref->{customernumberinit}|; @@ -1144,7 +1141,6 @@ sub list_business { -{path}> {login}> {password}> @@ -1164,7 +1160,6 @@ sub business_header { $lxdebug->enter_sub(); $form->{title} = $locale->text("$form->{title} Business"); - $form->{salesman} = "checked" if $form->{salesman}; # $locale->text('Add Business') # $locale->text('Edit Business') @@ -1200,10 +1195,6 @@ sub business_header { | . $locale->text('Customernumberinit') . qq| {customernumberinit}> - - | . $locale->text('Salesman') . qq| - {salesman}> - @@ -1216,6 +1207,7 @@ sub save_business { $lxdebug->enter_sub(); $form->isblank("description", $locale->text('Description missing!')); + $form->{discount} = $form->parse_amount(\%myconfig, $form->{discount}) / 100; AM->save_business(\%myconfig, \%$form); $form->redirect($locale->text('Business saved!')); @@ -1237,7 +1229,7 @@ sub add_language { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_language&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &language_header; @@ -1267,7 +1259,7 @@ sub list_language { AM->language(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_language&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_language&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -1333,7 +1325,7 @@ sub list_language { $column_data{description} = - qq|{script}?action=edit_language&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; + qq|{script}?action=edit_language&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; $column_data{template_code} = qq|$ref->{template_code}|; $column_data{article_code} = qq|$ref->{article_code}|; @@ -1375,7 +1367,6 @@ sub list_language { -{path}> {login}> {password}> @@ -1509,7 +1500,7 @@ sub add_buchungsgruppe { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_buchungsgruppe&login=$form->{login}&password=$form->{password}" unless $form->{callback}; AM->get_buchungsgruppe(\%myconfig, \%$form); $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"}; @@ -1544,7 +1535,7 @@ sub list_buchungsgruppe { AM->buchungsgruppe(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_buchungsgruppe&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -1628,7 +1619,7 @@ sub list_buchungsgruppe { my $swap_link = qq|$form->{script}?action=swap_buchungsgruppen&|; map({ $swap_link .= $_ . "=" . $form->escape($form->{$_}) . "&" } - qw(login password path)); + qw(login password)); my $row = 0; foreach $ref (@{ $form->{ALL} }) { @@ -1645,7 +1636,7 @@ sub list_buchungsgruppe { $column_data{up} = qq|| . qq|| . - qq|| . + qq|| . qq||; } else { $column_data{up} = qq| |; @@ -1658,12 +1649,12 @@ sub list_buchungsgruppe { $column_data{down} = qq|| . qq|| . - qq|| . + qq|| . qq||; } $column_data{description} = - qq|{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; + qq|{script}?action=edit_buchungsgruppe&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; $column_data{inventory_accno} = qq|$ref->{inventory_accno}|; $column_data{income_accno_0} = qq|$ref->{income_accno_0}|; @@ -1703,7 +1694,6 @@ sub list_buchungsgruppe { -{path}> {login}> {password}> @@ -1895,7 +1885,7 @@ sub add_printer { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_printer&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &printer_header; @@ -1925,7 +1915,7 @@ sub list_printer { AM->printer(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_printer&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -1979,7 +1969,7 @@ sub list_printer { $column_data{printer_description} = - qq|{script}?action=edit_printer&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}|; + qq|{script}?action=edit_printer&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}|; $column_data{printer_command} = qq|$ref->{printer_command}|; $column_data{template_code} = qq|$ref->{template_code}|; @@ -2007,7 +1997,6 @@ sub list_printer { -{path}> {login}> {password}> @@ -2091,14 +2080,13 @@ sub delete_printer { $lxdebug->leave_sub(); } - sub add_payment { $lxdebug->enter_sub(); $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_payment&login=$form->{login}&password=$form->{password}" unless $form->{callback}; $form->{terms_netto} = 0; @@ -2213,7 +2201,7 @@ sub list_payment { $column_data{up} = qq|| . qq|| . - qq|| . + qq|| . qq||; } else { $column_data{up} = qq| |; @@ -2226,7 +2214,7 @@ sub list_payment { $column_data{down} = qq|| . qq|| . - qq|| . + qq|| . qq||; } @@ -2268,7 +2256,6 @@ sub list_payment { -{path}> {login}> {password}> @@ -2416,317 +2403,6 @@ sub swap_payment_terms { $lxdebug->leave_sub(); } -sub add_sic { - $lxdebug->enter_sub(); - - $form->{title} = "Add"; - - $form->{callback} = - "$form->{script}?action=add_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; - - &sic_header; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub edit_sic { - $lxdebug->enter_sub(); - - $form->{title} = "Edit"; - - AM->get_sic(\%myconfig, \%$form); - - &sic_header; - - $form->{orphaned} = 1; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub list_sic { - $lxdebug->enter_sub(); - - AM->sic(\%myconfig, \%$form); - - $form->{callback} = - "$form->{script}?action=list_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}"; - - $callback = $form->escape($form->{callback}); - - $form->{title} = $locale->text('Standard Industrial Codes'); - - @column_index = qw(code description); - - $column_header{code} = - qq|| . $locale->text('Code') . qq||; - $column_header{description} = - qq|| . $locale->text('Description') . qq||; - - $form->header; - - print qq| - - - - - $form->{title} - - - - - - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - - foreach $ref (@{ $form->{ALL} }) { - - $i++; - $i %= 2; - - if ($ref->{sictype} eq 'H') { - print qq| - -|; - $column_data{code} = - qq|{script}?action=edit_sic&code=$ref->{code}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{code}|; - $column_data{description} = qq|$ref->{description}|; - - } else { - print qq| - -|; - - $column_data{code} = - qq|{script}?action=edit_sic&code=$ref->{code}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{code}|; - $column_data{description} = qq|$ref->{description}|; - - } - - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; - } - - print qq| - - - - - - - - - -{script}> - - - - - -{path}> -{login}> -{password}> - - - - - - -