my $vc = $self->can('customer_id') && $self->customer_id ? 'customer' : 'vendor';
- _copy($self, $form, '', '', 0, qw(id type taxzone_id ordnumber quonumber invnumber donumber cusordnumber taxincluded shippingpoint shipvia notes intnotes curr cp_id
+ _copy($self, $form, '', '', 0, qw(id type taxzone_id ordnumber quonumber invnumber donumber cusordnumber taxincluded shippingpoint shipvia notes intnotes cp_id
employee_id salesman_id closed department_id language_id payment_id delivery_customer_id delivery_vendor_id shipto_id proforma
globalproject_id delivered transaction_description container_type accepted_by_customer invoice terms storno storno_id dunning_config_id
orddate quodate reqdate gldate duedate deliverydate datepaid transdate));
+ $form->{currency} = $form->{curr} = $self->currency_id ? $self->currency->name || '' : '';
if (_has($self, 'transdate')) {
my $transdate_idx = ref($self) eq 'SL::DB::Order' ? ($self->quotation ? 'quodate' : 'orddate')
$form->{vc} = $vc if ref($self) =~ /^SL::DB::.*Invoice/;
- 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");
+ my @vc_fields = (qw(account_number bank bank_code bic business city contact country creditlimit
+ department_1 department_2 discount email fax homepage iban language name
+ payment_terms 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));
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));