X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Far.pl;h=bff54d0f830beb16a98f092b435b1f536bb5f506;hb=d3287e3265b566f110eb9734c8ab26b8036d22f4;hp=5aeb284644dd95602e732a8391735cf1c44c65b7;hpb=1182c721b69503999176a1804b2101745d36f0c7;p=kivitendo-erp.git diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 5aeb28464..bff54d0f8 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -79,6 +79,7 @@ sub add { unless $form->{callback}; &create_links; + AR->get_transdate(\%myconfig, $form); &display_form; $lxdebug->leave_sub(); @@ -121,7 +122,7 @@ sub create_links { $form->{rowcount} = 1; # currencies - @curr = split /:/, $form->{currencies}; + @curr = split(/:/, $form->{currencies}); chomp $curr[0]; $form->{defaultcurrency} = $curr[0]; @@ -251,9 +252,9 @@ sub create_links { "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}"; $form->{"${key}_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}"; + my $q_description = quotemeta($form->{acc_trans}{$key}->[$i-1]->{description}); $form->{"select${key}"} =~ - /{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}<\/option>\n/; - $test = $1; + /{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--${q_description}<\/option>\n/; $form->{"${key}_$k"} = $1; if ($akey eq 'amount') { $form->{"taxchart_$k"} = $form->{taxchart}; @@ -654,6 +655,7 @@ $jsscript "; + my @triggers = (); $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); for $i (1 .. $form->{paidaccounts}) { print " @@ -693,7 +695,8 @@ $jsscript qq|$form->{"selectAR_paid_$i"}|; $column_data{exchangerate} = qq|$exchangerate|; $column_data{datepaid} = - qq|{"datepaid_$i"}>|; + qq|{"datepaid_$i"}> + |; $column_data{source} = qq||; $column_data{memo} = @@ -704,9 +707,12 @@ $jsscript print " "; + push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); } map { $form->{$_} =~ s/\"/"/g } qw(selectAR_paid); - print qq| + + print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . + qq| {paidaccounts}> @@ -739,30 +745,26 @@ sub form_footer { $transdate = $form->datetonum($form->{transdate}, \%myconfig); $closedto = $form->datetonum($form->{closedto}, \%myconfig); - if ($form->{id} && $form->{radier}) { - - print qq| -|; - - if (!$form->{revtrans}) { - if (!$form->{locked}) { + if ($form->{id}) { + if ($form->{radier}) { + print qq| + |; + + print qq| + + + |; + } + if ($transdate > $closedto) { print qq| - - -|; + + |; } - } - - if ($transdate > $closedto) { - print qq| - -|; - } - + } else { if ($transdate > $closedto) { print qq|{path}/menu.pl"; - &menubar; - } - print " @@ -872,7 +869,7 @@ sub update { ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax; for $i (1 .. $form->{paidaccounts}) { - if ($form->{"paid_$i"}) { + if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) { map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) @@ -921,7 +918,7 @@ sub post { delete($form->{AR}); for $i (1 .. $form->{paidaccounts}) { - if ($form->{"paid_$i"}) { + if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) { $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig); $form->isblank("datepaid_$i", $locale->text('Payment date missing!')); @@ -973,6 +970,18 @@ sub post_as_new { $lxdebug->leave_sub(); } +sub use_as_template { + $lxdebug->enter_sub(); + + map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno); + $form->{paidaccounts} = 1; + $form->{rowcount}--; + $form->{invdate} = $form->current_date(\%myconfig); + &update; + + $lxdebug->leave_sub(); +} + sub delete { $lxdebug->enter_sub(); @@ -1288,9 +1297,11 @@ sub ar_transactions { } @columns = $form->sort_columns( - qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee shippingpoint shipvia) + qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee shippingpoint shipvia) ); + $form->{"l_type"} = "Y"; + foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { push @column_index, $item; @@ -1318,6 +1329,8 @@ sub ar_transactions { "" . $locale->text('Due Date') . ""; + $column_header{type} = + "" . $locale->text('Type') . ""; $column_header{invnumber} = "" . $locale->text('Invoice') @@ -1444,6 +1457,11 @@ sub ar_transactions { $column_data{invnumber} = "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}"; + $column_data{type} = "" . + ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") : + $ar->{amount} < 0 ? + $locale->text("Credit note (one letter abbreviation)") : + $locale->text("Invoice (one letter abbreviation)")) . ""; $column_data{ordnumber} = "$ar->{ordnumber} "; $column_data{name} = "$ar->{name}"; $ar->{notes} =~ s/\r\n//g; @@ -1518,14 +1536,8 @@ sub ar_transactions { |; + . $locale->text('Sales Invoice') . qq|"> - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq|