X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=c1d5bfe08f03b06ac51e8061fbd3b218d88d8a93;hb=8423c7b21bc3b4b2db7d0ffef756919619336e97;hp=0c7b9736ec6e2abce7dce1a2d96e8a8677290a9f;hpb=3c40c9140408450ed18939f8cc55fa30be0ecf7f;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 0c7b9736e..c1d5bfe08 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -152,10 +152,17 @@ sub display_row {
qq|
|
. $locale->text('Part Description')
. qq| | |;
- $column_data{ship} =
+ if ($form->{"type"} eq "purchase_order") {
+ $column_data{ship} =
qq||
- . $locale->text('Ship')
- . qq| | |;
+ . $locale->text('Ship rcvd')
+ . qq||;
+ } else {
+ $column_data{ship} =
+ qq||
+ . $locale->text('Ship')
+ . qq| | |;
+ }
$column_data{qty} =
qq||
. $locale->text('Qty')
@@ -198,9 +205,11 @@ sub display_row {
. qq| | |;
############## ENDE Neueintrag ##################
- $form->{"show_details"} =
- !defined($form->{"show_details"}) ? 1 :
- $form->{"show_details"} ? 1 : 0;
+ $myconfig{"show_form_details"} = 1
+ unless (defined($myconfig{"show_form_details"}));
+ $form->{"show_details"} = $myconfig{"show_form_details"}
+ unless (defined($form->{"show_details"}));
+ $form->{"show_details"} = $form->{"show_details"} ? 1 : 0;
my $show_details_new = 1 - $form->{"show_details"};
my $show_details_checked = $form->{"show_details"} ? "checked" : "";
@@ -305,10 +314,10 @@ sub display_row {
if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
$column_data{description} =
- qq| | |;
+ qq| | |;
} else {
$column_data{description} =
- qq| | |;
+ qq| | |;
}
(my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
@@ -422,7 +431,7 @@ sub display_row {
{"pricegroup_old_$i"}>
{"price_old_$i"}>
-
+
format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
@@ -430,7 +439,7 @@ sub display_row {
{"inventory_accno_$i"}>
-
+
{"income_accno_$i"}>
{"expense_accno_$i"}>
@@ -439,7 +448,7 @@ sub display_row {
-
+
|;
@@ -1793,7 +1802,7 @@ sub print_form {
$language_saved = $form->{language_id};
$payment_id_saved = $form->{payment_id};
- &{"$form->{vc}_details"};
+ &{"$form->{vc}_details"}();
$form->{language_id} = $language_saved;
$form->{payment_id} = $payment_id_saved;
@@ -2014,14 +2023,14 @@ sub print_form {
sub customer_details {
$lxdebug->enter_sub();
- IS->customer_details(\%myconfig, \%$form);
+ IS->customer_details(\%myconfig, \%$form, @_);
$lxdebug->leave_sub();
}
sub vendor_details {
$lxdebug->enter_sub();
- IR->vendor_details(\%myconfig, \%$form);
+ IR->vendor_details(\%myconfig, \%$form, @_);
$lxdebug->leave_sub();
}
@@ -2049,8 +2058,17 @@ sub ship_to {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
+ my @shipto_vars =
+ qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
+ shiptocontact shiptophone shiptofax shiptoemail
+ shiptodepartment_1 shiptodepartment_2);
+
+ my @addr_vars =
+ (qw(name department_1 department_2 street zipcode city country
+ contact email phone fax));
+
# get details for name
- &{"$form->{vc}_details"};
+ &{"$form->{vc}_details"}(@addr_vars);
$number =
($form->{vc} eq 'customer')
@@ -2131,12 +2149,12 @@ sub ship_to {
| . $locale->text('Phone') . qq| |
- $form->{"$form->{vc}phone"} |
+ $form->{phone} |
|
| . $locale->text('Fax') . qq| |
- $form->{"$form->{vc}fax"} |
+ $form->{fax} |
|
@@ -2153,8 +2171,7 @@ sub ship_to {
|;
# delete shipto
- map { delete $form->{$_} }
- qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2 header);
+ map({ delete $form->{$_} } (@shipto_vars, qw(header)));
$form->{title} = $title;
foreach $key (keys %$form) {