X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=d2f27c92594d9ff42aef76c37ed41543ccdad028;hb=4077825982a622b654888a20121c845d0e15c9c3;hp=287e4f1c9e6f27c49d3f988681a53ba608a320ad;hpb=e4d8716c1ae11b6dacf553711848e749ed191d10;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 287e4f1c9..d2f27c925 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -529,7 +529,7 @@ sub form_header {
if ($form->{type} eq "credit_note") {
$button1 = qq|
- | |;
#write Trigger
@@ -540,17 +540,17 @@ sub form_header {
} else {
$button1 = qq|
- |
|;
$button2 = qq|
- |
|;
$button3 = qq|
- |
|;
@@ -655,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| |
@@ -696,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| |
@@ -705,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| |
@@ -717,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| |
@@ -726,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| |
@@ -735,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| |
@@ -744,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| |
@@ -896,7 +911,7 @@ sub form_footer {
$notes |
$intnotes |
- |
$follow_ups_block
@@ -1098,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|
@@ -1252,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;