Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / SL / DB / Helper / FlattenToForm.pm

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index c2d8a5f..d593d69 100644 (file)
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -31,7 +31,8 @@ sub flatten_to_form {
 
   my @vc_fields          = (qw(account_number bank bank_code bic business city contact country creditlimit discount
                                email fax homepage iban language name payment_terms phone street taxnumber zipcode),
-                            "${vc}number");
+                            "${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));
@@ -52,13 +53,14 @@ sub flatten_to_form {
   my $idx = 0;
   my $format_amounts = $params{format_amounts} ? 1 : 0;
   my $format_notnull = $params{format_amounts} ? 2 : 0;
-  foreach my $item (@{ $self->items }) {
+  foreach my $item (@{ $self->items_sorted }) {
     next if _has($item, 'assemblyitem');
 
     $idx++;
 
     $form->{"id_${idx}"}         = $item->parts_id;
     $form->{"partnumber_${idx}"} = $item->part->partnumber;
+    $form->{"weight_${idx}"}     = $item->part->weight;
     _copy($item,          $form, '',        "_${idx}", 0,               qw(description project_id ship serialnumber pricegroup_id ordnumber cusordnumber unit
                                                                            subtotal longdescription price_factor_id marge_price_factor approved_sellprice reqdate transdate));
     _copy($item,          $form, '',        "_${idx}", $format_amounts, qw(qty sellprice marge_total marge_percent lastcost));