X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=1ebd59816fdda79dd8df2138eb5b87a67a661bfe;hb=7e6bdfc6728ec15377f5b78dd1fb4eaefed84962;hp=a21cfbbfd789166aceb5bdd5136cf7939e9a1eeb;hpb=5bfd9281b2152b84f444469eec2674dc8fc4f631;p=kivitendo-erp.git diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index a21cfbbfd..1ebd59816 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -40,6 +40,8 @@ use Data::Dumper; 1; +require "$form->{path}/common.pl"; + # end of main sub add { &{"add_$form->{type}"} } @@ -92,14 +94,13 @@ sub account_header { $form->{description} =~ s/\"/"/g; if (@{ $form->{TAXKEY} }) { - $form->{selecttaxkey} = ""; @@ -330,8 +331,8 @@ sub account_header { {inventory_accno_id}> {income_accno_id}> {expense_accno_id}> -{fxgain_accno_id}> -{fxloss_accno_id}> +{fxgain_accno_id}> +{fxloss_accno_id}> @@ -479,7 +480,6 @@ sub form_footer { {password}>
|; -#print(STDERR "$form->{type} TYPE $form->{new_chart_valid} CHART_VALID\n"); if ((!$form->{id}) || ($form->{id} && $form->{orphaned}) || (($form->{type} eq "account") && (!$form->{new_chart_valid}))) { print qq| {callback} = + "$form->{script}?action=add_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}" + unless $form->{callback}; + + &lead_header; + &form_footer; + + $lxdebug->leave_sub(); +} + +sub edit_lead { + $lxdebug->enter_sub(); + + $form->{title} = "Edit"; + + AM->get_lead(\%myconfig, \%$form); + + &lead_header; + + $form->{orphaned} = 1; + &form_footer; + + $lxdebug->leave_sub(); +} + +sub list_lead { + $lxdebug->enter_sub(); + + AM->lead(\%myconfig, \%$form); + + $form->{callback} = + "$form->{script}?action=list_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + + $callback = $form->escape($form->{callback}); + + $form->{title} = $locale->text('Lead'); + + @column_index = qw(description cost profit); + + $column_header{description} = + qq||; + + $form->header; + + print qq| + + +
| + . $locale->text('Description') + . qq|
+ + + + + +|; + + map { print "$column_header{$_}\n" } @column_index; + + print qq| + +|; + + foreach $ref (@{ $form->{ALL} }) { + + $i++; + $i %= 2; + + print qq| + +|; + + $lead = $ref->{lead}; + + $column_data{description} = + qq||; + + map { print "$column_data{$_}\n" } @column_index; + + print qq| + +|; + } + + print qq| + + + +
$form->{title}
{script}?action=edit_lead&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}
+ +
+
{script}> + + + + + +{path}> +{login}> +{password}> + +|; + + if ($form->{menubar}) { + require "$form->{path}/menu.pl"; + &menubar; + } + + print qq| +
+ + + +|; + + $lxdebug->leave_sub(); +} + +sub lead_header { + $lxdebug->enter_sub(); + + $form->{title} = $locale->text("$form->{title} Lead"); + + # $locale->text('Add Lead') + # $locale->text('Edit Lead') + + $form->{description} =~ s/\"/"/g; + + $description = + qq||; + + $form->header; + + print qq| + + +
{script}> + +{id}> + + + + + + + + + + + + + +
$form->{title}
| . $locale->text('Description') . qq|$description
+|; + + $lxdebug->leave_sub(); +} + +sub save_lead { + $lxdebug->enter_sub(); + + $form->isblank("description", $locale->text('Description missing!')); + AM->save_lead(\%myconfig, \%$form); + $form->redirect($locale->text('lead saved!')); + + $lxdebug->leave_sub(); +} + +sub delete_lead { + $lxdebug->enter_sub(); + + AM->delete_lead(\%myconfig, \%$form); + $form->redirect($locale->text('lead deleted!')); + + $lxdebug->leave_sub(); +} + sub add_business { $lxdebug->enter_sub(); @@ -1529,6 +1712,9 @@ sub add_buchungsgruppe { "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; AM->get_buchungsgruppe(\%myconfig, \%$form); + if ($eur) { + $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"}; + } &buchungsgruppe_header; &form_footer; @@ -1582,19 +1768,19 @@ sub list_buchungsgruppe { . qq||; $column_header{income_accno_1} = qq|| - . $locale->text('Erlöse EU o. UStId') + . $locale->text('Erlöse EU m. UStId') . qq||; $column_header{expense_accno_1} = qq|| - . $locale->text('Aufwand EU o. UStId') + . $locale->text('Aufwand EU m. UStId') . qq||; $column_header{income_accno_2} = qq|| - . $locale->text('Erlöse EU m. UStId') + . $locale->text('Erlöse EU o. UStId') . qq||; $column_header{expense_accno_2} = qq|| - . $locale->text('Aufwand EU m. UStId') + . $locale->text('Aufwand EU o. UStId') . qq||; $column_header{income_accno_3} = qq|| @@ -1706,50 +1892,33 @@ sub buchungsgruppe_header { # $locale->text('Buchungsgruppe hinzufügen') # $locale->text('Buchungsgruppe bearbeiten') - $form->{description} =~ s/\"/"/g; + my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {}); + my %acc_type_map = ( + "IC" => $acc_inventory, + "IC_income" => $acc_income, + "IC_sale" => $acc_income, + "IC_expense" => $acc_expense, + "IC_cogs" => $acc_expense, + ); - # build the popup menus - $form->{taxaccounts} = ""; - foreach $key (keys %{ $form->{IC_links} }) { + foreach $key (keys(%acc_type_map)) { foreach $ref (@{ $form->{IC_links}{$key} }) { - - # if this is a tax field - if ($key =~ /IC_tax/) { - if ($key =~ /$item/) { - $form->{taxaccounts} .= "$ref->{accno} "; - $form->{"IC_tax_$ref->{accno}_description"} = - "$ref->{accno}--$ref->{description}"; - - if ($form->{id}) { - if ($form->{amount}{ $ref->{accno} }) { - $form->{"IC_tax_$ref->{accno}"} = "checked"; - } - } else { - $form->{"IC_tax_$ref->{accno}"} = "checked"; - } - } - } else { - - $form->{"select$key"} .= - "" } + sort({ $a->{"accno"} cmp $b->{"accno"} } + values(%{$acc_type_map{$type}})))); + } if ($form->{id}) { $form->{selectIC} =~ s/selected//g; - $form->{selectIC} =~ s/ value=\$form->{inventory_accno_id}/ value=\$form->{inventory_accno_id} selected/; + $form->{selectIC} =~ s/ value=$form->{inventory_accno_id}/ value=$form->{inventory_accno_id} selected/; $form->{selectIC_income} =~ s/selected//g; $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_0}/ value=$form->{income_accno_id_0} selected/; $form->{selectIC_expense} =~ s/selected//g; @@ -1765,11 +1934,11 @@ sub buchungsgruppe_header { |; } else { $linkaccounts = qq| - |; - } + {inventory_accno_id}>|; + } - $linkaccounts .= qq| + $linkaccounts .= qq| | . $locale->text('Erlöse Inland') . qq| @@ -1844,7 +2013,7 @@ sub buchungsgruppe_header { | . $locale->text('Buchungsgruppe') . qq| - + $linkaccounts
@@ -2086,207 +2255,6 @@ sub delete_printer { } -sub add_adr { - $lxdebug->enter_sub(); - - $form->{title} = "Add"; - - $form->{callback} = - "$form->{script}?action=add_adr&path=$form->{path}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; - - &adr_header; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub edit_adr { - $lxdebug->enter_sub(); - - $form->{title} = "Edit"; - - AM->get_adr(\%myconfig, \%$form); - - &adr_header; - - $form->{orphaned} = 1; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub list_adr { - $lxdebug->enter_sub(); - - AM->adr(\%myconfig, \%$form); - - $form->{callback} = - "$form->{script}?action=list_adr&path=$form->{path}&login=$form->{login}&password=$form->{password}"; - - $callback = $form->escape($form->{callback}); - - $form->{title} = $locale->text('ADR'); - - @column_index = qw(adr_code adr_description); - - $column_header{adr_description} = - qq|| - . $locale->text('ADR Description') - . qq||; - $column_header{adr_code} = - qq|| - . $locale->text('ADR Code') - . qq||; - - $form->header; - - print qq| - - - - - - - - - - - - - -
$form->{title}
- - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - - foreach $ref (@{ $form->{ALL} }) { - - $i++; - $i %= 2; - - print qq| - -|; - - - $column_data{adr_code} = - qq||; - $column_data{adr_description} = qq||; - - - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; - } - - print qq| -
{script}?action=edit_adr&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{adr_code}$ref->{adr_description}
-
- -
-{script}> - - - - - -{path}> -{login}> -{password}> - -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| - -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub adr_header { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("$form->{title} ADR"); - - # $locale->text('Add ADR') - # $locale->text('Edit ADR') - - $form->{adr_description} =~ s/\"/"/g; - $form->{adr_code} =~ s/\"/"/g; - - - $form->header; - - print qq| - - -
{script}> - -{id}> - - - - - - - - - - - - - - - - - -
$form->{title}
| . $locale->text('ADR Code') . qq|
| . $locale->text('ADR Description') . qq|
-|; - - $lxdebug->leave_sub(); -} - -sub save_adr { - $lxdebug->enter_sub(); - - $form->isblank("adr_description", $locale->text('ADR Description missing!')); - $form->isblank("adr_code", $locale->text('ADR Code missing!')); - AM->save_adr(\%myconfig, \%$form); - $form->redirect($locale->text('ADR saved!')); - - $lxdebug->leave_sub(); -} - - -sub delete_adr { - $lxdebug->enter_sub(); - - AM->delete_adr(\%myconfig, \%$form); - $form->redirect($locale->text('ADR deleted!')); - - $lxdebug->leave_sub(); -} - - sub add_payment { $lxdebug->enter_sub(); @@ -2296,6 +2264,9 @@ sub add_payment { "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; + $form->{terms_netto} = 0; + $form->{terms_skonto} = 0; + $form->{percent_skonto} = 0; &payment_header; &form_footer; @@ -2470,10 +2441,6 @@ sub payment_header { | . $locale->text('Description') . qq| - - | . $locale->text('Ranking') . qq| - - | . $locale->text('Long Description') . qq| @@ -3108,40 +3075,40 @@ sub config { - - - | . $locale->text('Tax Accounts') . qq| - - - - - - - - - -|; - - foreach $accno (sort keys %{ $form->{taxrates} }) { - print qq| - - - - - -|; - $form->{taxaccounts} .= "$form->{taxrates}{$accno}{id} "; - } - - chop $form->{taxaccounts}; - - print qq| - - -
 | . $locale->text('Rate') . qq| (%)| . $locale->text('Number') . qq|
$form->{taxrates}{$accno}{description}{taxrates}{$accno}{id} size=6 value=$form->{taxrates}{$accno}{rate}>
- - - + |; +# +# | . $locale->text('Tax Accounts') . qq| +# +# +# +# +# +# +# +# +# +# |; +# +# foreach $accno (sort keys %{ $form->{taxrates} }) { +# print qq| +# +# +# +# +# +# |; +# $form->{taxaccounts} .= "$form->{taxrates}{$accno}{id} "; +# } +# +# chop $form->{taxaccounts}; +# +# print qq| +# +# +#
 | . $locale->text('Rate') . qq| (%)| . $locale->text('Number') . qq|
$form->{taxrates}{$accno}{description}{taxrates}{$accno}{id} size=6 value=$form->{taxrates}{$accno}{rate}>
+# +# +print qq| @@ -3607,9 +3574,6 @@ sub save_unit { } } - #print(STDERR Dumper($delete_units)); - #print(STDERR Dumper($new_units)); - AM->save_units(\%myconfig, $form, $form->{"unit_type"}, $new_units, \@delete_units); $form->{"saved_message"} = $locale->text("The units have been saved.");