X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=c1d5bfe08f03b06ac51e8061fbd3b218d88d8a93;hb=a205ed210bf303bff2af7abcedf128c61d957f3a;hp=4f36c7818abbd3137aed1b0f048108f6569fb6ed;hpb=f83b4aff417ab78fc4bc242298fe25924f1ee072;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 4f36c7818..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')
@@ -307,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+)/);
@@ -424,7 +431,7 @@ sub display_row {
{"pricegroup_old_$i"}>
{"price_old_$i"}>
-
+
format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
@@ -432,7 +439,7 @@ sub display_row {
{"inventory_accno_$i"}>
-
+
{"income_accno_$i"}>
{"expense_accno_$i"}>
@@ -441,7 +448,7 @@ sub display_row {
-
+
|;
@@ -1795,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;
@@ -2056,8 +2063,12 @@ sub ship_to {
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"}(@shipto_vars);
+ &{"$form->{vc}_details"}(@addr_vars);
$number =
($form->{vc} eq 'customer')
@@ -2138,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} |
|