X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=9bc225e884bb596231ed4b64ad7441710820be02;hb=1163cee7d5cfe9355a9d231ac544ce0943623d77;hp=1a123ed5cdb502cf1866ac8cca5599c022c03340;hpb=d4bddbd1c659dc2f580aacc16c855b22b7223754;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 1a123ed5c..9bc225e88 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -240,8 +240,6 @@ sub prepare_invoice {
if ($form->{id}) {
- map { $form->{$_} =~ s/\"/"/g }
- qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes donumber); #frage: muss hier donumber angegeben werden? hier werden doch nur die alten quots wieder ausgemerzt, ist das noch nötig? 12.02.2009 jb
# # get pricegroups for parts
# IS->get_pricegroups_for_parts(\%myconfig, \%$form);
@@ -268,8 +266,6 @@ sub prepare_invoice {
$form->{"qty_$i"} =
$form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
- map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit partnotes);
$form->{rowcount} = $i;
}
@@ -533,7 +529,7 @@ sub form_header {
if ($form->{type} eq "credit_note") {
$button1 = qq|
- | |;
#write Trigger
@@ -544,17 +540,17 @@ sub form_header {
} else {
$button1 = qq|
- |
|;
$button2 = qq|
- |
|;
$button3 = qq|
- |
|;
@@ -569,7 +565,7 @@ sub form_header {
$credittext = $locale->text('Credit Limit exceeded!!!');
my $follow_up_vc = $form->{customer};
- $follow_up_vc =~ s/--.*?//;
+ $follow_up_vc =~ s/--\d*\s*$//;
my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
$onload = ($form->{resubmit} && ($form->{format} eq "html")) ? qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|
@@ -659,10 +655,13 @@ sub form_header {
| . $locale->text('Shipping Point') . qq| |
| .
$cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) .
- qq|
+ qq| |
+
| . $locale->text('Ship via') . qq| |
- |
+ | .
+ $cgi->textfield("-name" => "shipvia", "-size" => 35, "-value" => $form->{shipvia}) .
+ qq| |
| . $locale->text('Transaction description') . qq| |
@@ -700,7 +699,9 @@ print qq|
if ($form->{type} eq "credit_note") {
print qq|
| . $locale->text('Credit Note Number') . qq| |
- |
+ |.
+ $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+ qq| |
| . $locale->text('Credit Note Date') . qq| |
@@ -709,7 +710,9 @@ print qq|
} else {
print qq|
| . $locale->text('Invoice Number') . qq| |
- |
+ |.
+ $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+ qq| |
| . $locale->text('Invoice Date') . qq| |
@@ -721,7 +724,9 @@ print qq|
| . $locale->text('Delivery Order Number') . qq| |
- |
+ |.
+ $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) .
+ qq| |
| . $locale->text('Delivery Date') . qq| |
@@ -730,7 +735,9 @@ print qq|
}
print qq|
| . $locale->text('Order Number') . qq| |
- |
+ |.
+ $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) .
+ qq| |
| . $locale->text('Order Date') . qq| |
@@ -739,7 +746,9 @@ print qq|
| . $locale->text('Quotation Number') . qq| |
- |
+ |.
+ $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) .
+ qq| |
| . $locale->text('Quotation Date') . qq| |
@@ -748,7 +757,9 @@ print qq|
| . $locale->text('Customer Order Number') . qq| |
- |
+ |.
+ $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) .
+ qq| |
| . $locale->text('Project Number') . qq| |
@@ -900,7 +911,7 @@ sub form_footer {
$notes |
$intnotes |
- |
$follow_ups_block
@@ -1102,7 +1113,7 @@ if ($form->{type} eq "credit_note") {
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
if ($form->{id}) {
- my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar");
+ my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
print qq|
hidden("-name" => "callback", "-value" => $form->{callback})
. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
. qq|
@@ -1256,7 +1268,7 @@ sub update {
$rows = scalar @{ $form->{item_list} };
- $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100);
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{customer_discount} * 100);
if ($rows) {
$form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;