X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/eb974ef68990905c94b52a28c133780f0b8890ed..c25155ddbc9a68ed2d6ccefe567ddb4776ac0d4c:/SL/DB/Helper/FlattenToForm.pm diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm index 1f54a8afe..9523c3579 100644 --- a/SL/DB/Helper/FlattenToForm.pm +++ b/SL/DB/Helper/FlattenToForm.pm @@ -37,12 +37,12 @@ sub flatten_to_form { my @vc_fields = (qw(account_number bank bank_code bic business city contact country creditlimit department_1 department_2 discount email fax gln greeting homepage iban language name - phone street taxnumber ustid zipcode), + natural_person phone street taxnumber ustid zipcode), "${vc}number", ($vc eq 'customer')? 'c_vendor_id': 'v_customer_id'); my @vc_prefixed_fields = qw(email fax notes number phone); - _copy($self, $form, '', '', 1, qw(amount netamount marge_total marge_percent container_remaining_weight container_remaining_volume paid)); + _copy($self, $form, '', '', 1, qw(amount netamount marge_total marge_percent container_remaining_weight container_remaining_volume paid exchangerate)); _copy($self->$vc, $form, '', '', 0, @vc_fields); _copy($self->$vc, $form, $vc, '', 0, @vc_prefixed_fields); _copy($self->contact, $form, '', '', 0, grep { /^cp_/ } map { $_->name } SL::DB::Contact->meta->columns) if _has($self, 'cp_id'); @@ -90,7 +90,7 @@ sub flatten_to_form { _copy($item, $form, '', "_${idx}", 0, qw(description project_id ship serialnumber pricegroup_id ordnumber donumber cusordnumber unit subtotal longdescription price_factor_id marge_price_factor reqdate transdate active_price_source active_discount_source)); - _copy($item, $form, '', "_${idx}", $format_noround, qw(qty sellprice)); + _copy($item, $form, '', "_${idx}", $format_noround, qw(qty sellprice fxsellprice)); _copy($item, $form, '', "_${idx}", $format_amounts, qw(marge_total marge_percent lastcost)); _copy($item, $form, '', "_${idx}", $format_percent, qw(discount)); _copy($item->project, $form, 'project', "_${idx}", 0, qw(number description)) if _has($item, 'project_id');