X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=f8822930908a67562cb7bc5b491a32d0fc3cb464;hb=61ab3c630bf655d54cb44f70f871eed5879f9693;hp=24f5f245daa63a438e719da982187f286f89e19c;hpb=797ad4c506d8e96342249155ddde80361b5ff9f9;p=kivitendo-erp.git
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 24f5f245d..f88229309 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -427,7 +427,7 @@ selectvendor } |
| . $locale->text('Vendor') . qq| |
- $vendor |
+ $vendor |
@@ -638,7 +638,7 @@ $jsscript
$column_data{AP_paid} = "" . $locale->text('Account') . " | ";
$column_data{source} = "" . $locale->text('Source') . " | ";
$column_data{memo} = "" . $locale->text('Memo') . " | ";
- $column_data{paid_project_id} = "" . $locale->text('Project Number') . " | ";
+ $column_data{paid_project_id} = "" . $locale->text('Project Number') . " | ";
print "
@@ -699,7 +699,7 @@ $jsscript
$column_data{"exchangerate_$i"} = qq|$exchangerate | |;
$column_data{"datepaid_$i"} =
qq|
- | |;
+ |;
$column_data{"source_$i"} =
qq| | |;
$column_data{"memo_$i"} =
@@ -800,10 +800,9 @@ $follow_ups_block
|;
}
-
# ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
print qq| |
- if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}));
+ if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}) && (($total_paid == 0) || ($total_paid eq "")));
print qq|
@@ -819,8 +818,8 @@ $follow_ups_block
print qq| |;
}
# /button for saving history
- # mark_as_paid button
- if($form->{id} ne "") {
+ # mark_as_paid button
+ if($form->{id} ne "") {
print qq| |;
}
# /mark_as_paid button
@@ -839,7 +838,7 @@ sub mark_as_paid {
$auth->assert('general_ledger');
- &mark_as_paid_common(\%myconfig,"ap");
+ &mark_as_paid_common(\%myconfig,"ap");
$lxdebug->leave_sub();
}
@@ -853,10 +852,12 @@ sub update {
$form->{invtotal} = 0;
+ delete @{ $form }{ grep { m/^tax_\d+$/ } keys %{ $form } };
+
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
- @flds = qw(amount AP_amount projectnumber oldprojectnumber project_id);
+ @flds = qw(amount AP_amount projectnumber oldprojectnumber project_id taxchart);
$count = 0;
for $i (1 .. $form->{rowcount}) {
$form->{"amount_$i"} =
@@ -890,9 +891,16 @@ sub update {
$form->{exchangerate} = $form->{forex} if $form->{forex};
$form->{invdate} = $form->{transdate};
- $save_AP = $form->{AP};
- &check_name("vendor");
- $form->{AP} = $save_AP;
+ my %saved_variables = map +( $_ => $form->{$_} ), qw(AP AP_amount_1 taxchart_1);
+
+ my $vendor_changed = &check_name("vendor");
+
+ $form->{AP} = $saved_variables{AP};
+ if ($saved_variables{AP_amount_1} =~ m/.--./) {
+ map { $form->{$_} = $saved_variables{$_} } qw(AP_amount_1 taxchart_1);
+ } else {
+ delete $form->{taxchart_1};
+ }
$form->{rowcount} = $count + 1;
@@ -920,7 +928,7 @@ sub update {
$form->{oldtotalpaid} = $totalpaid;
# notes
- $form->{notes} = $form->{intnotes};
+ $form->{notes} = $form->{intnotes} if $vendor_changed;
&display_form;
@@ -1034,7 +1042,7 @@ sub post {
$form->{addition} = "POSTED";
$form->save_history($form->dbconnect(\%myconfig));
}
- # /saving the history
+ # /saving the history
remove_draft() if $form->{remove_draft};
$form->redirect($locale->text('Transaction posted!'));
}
@@ -1055,7 +1063,7 @@ sub post_as_new {
$form->{addition} = "POSTED AS NEW";
$form->save_history($form->dbconnect(\%myconfig));
}
- # /saving the history
+ # /saving the history
&post;
$lxdebug->leave_sub();
@@ -1128,7 +1136,7 @@ sub yes {
$form->{addition} = "DELETED";
$form->save_history($form->dbconnect(\%myconfig));
}
- # /saving the history
+ # /saving the history
$form->redirect($locale->text('Transaction deleted!'));
}
$form->error($locale->text('Cannot delete transaction!'));
@@ -1318,6 +1326,25 @@ sub search {
|
| . $locale->text('Project Number') . qq| |
+
+ | . $locale->text('Vendor') . qq| |
+
+
+ |
+ | . $locale->text('Vendor Number') . qq| |
+ |
+ | . $locale->text('Country') . qq| |
+ |
+ | . $locale->text('USt-IdNr.') . qq| |
+ |
+ | . $locale->text('Steuersatz') . qq| |
+
+
+ |
+ | . $locale->text('Payment Terms') . qq| |
+ |
+ | . $locale->text('Buchungskonto') . qq| |
+
@@ -1380,7 +1407,8 @@ sub ap_transactions {
my @columns =
qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
- due duedate transaction_description notes employee globalprojectnumber);
+ due duedate transaction_description notes employee globalprojectnumber
+ vendornumber country ustid taxzone payment_terms charts);
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
@@ -1405,6 +1433,12 @@ sub ap_transactions {
'notes' => { 'text' => $locale->text('Notes'), },
'employee' => { 'text' => $locale->text('Salesperson'), },
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
+ 'vendornumber' => { 'text' => $locale->text('Vendor Number'), },
+ 'country' => { 'text' => $locale->text('Country'), },
+ 'ustid' => { 'text' => $locale->text('USt-IdNr.'), },
+ 'taxzone' => { 'text' => $locale->text('Steuersatz'), },
+ 'payment_terms' => { 'text' => $locale->text('Payment Terms'), },
+ 'charts' => { 'text' => $locale->text('Buchungskonto'), },
);
foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) {
@@ -1420,48 +1454,27 @@ sub ap_transactions {
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('ap_transactions', @hidden_variables);
+ $report->set_export_options('ap_transactions', @hidden_variables, qw(sort sortdir));
$report->set_sort_indicator($form->{sort}, $form->{sortdir});
my @options;
- if ($form->{vendor}) {
- push @options, $locale->text('Vendor') . " : $form->{vendor}";
- }
- if ($form->{department}) {
- ($department) = split /--/, $form->{department};
- push @options, $locale->text('Department') . " : $department";
- }
- if ($form->{invnumber}) {
- push @options, $locale->text('Invoice Number') . " : $form->{invnumber}";
- }
- if ($form->{ordnumber}) {
- push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
- }
- if ($form->{notes}) {
- push @options, $locale->text('Notes') . " : $form->{notes}";
- }
- if ($form->{transaction_description}) {
- push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
- }
- if ($form->{transdatefrom}) {
- push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
- }
- if ($form->{transdateto}) {
- push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
- }
- if ($form->{open}) {
- push @options, $locale->text('Open');
- }
- if ($form->{closed}) {
- push @options, $locale->text('Closed');
- }
+ push @options, $locale->text('Vendor') . " : $form->{vendor}" if ($form->{vendor});
+ push @options, $locale->text('Department') . " : " . (split /--/, $form->{department})[0] if ($form->{department});
+ push @options, $locale->text('Invoice Number') . " : $form->{invnumber}" if ($form->{invnumber});
+ push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if ($form->{ordnumber});
+ push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
+ push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if ($form->{transaction_description});
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if ($form->{transdatefrom});
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if ($form->{transdateto});
+ push @options, $locale->text('Open') if ($form->{open});
+ push @options, $locale->text('Closed') if ($form->{closed});
$report->set_options('top_info_text' => join("\n", @options),
'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'),
'output_format' => 'HTML',
'title' => $form->{title},
- 'attachment_basename' => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
+ 'attachment_basename' => $locale->text('vendor_invoice_list') . strftime('_%Y%m%d', localtime time),
);
$report->set_options_from_form();
@@ -1553,9 +1566,9 @@ sub storno {
$form->{addition} = "STORNO";
$form->save_history($form->dbconnect(\%myconfig));
}
- # /saving the history
+ # /saving the history
- $form->redirect(sprintf $locale->text("Transaction %d cancelled."), $form->{storno_id});
+ $form->redirect(sprintf $locale->text("Transaction %d cancelled."), $form->{storno_id});
$lxdebug->leave_sub();
}