};
my @columns = (
- 'id', 'name', "$form->{db}number", 'contact', 'phone', 'discount',
+ 'id', 'name', "$form->{db}number", 'contact', 'main_contact_person',
+ 'phone', 'discount',
'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city',
'business', 'payment', 'invnumber', 'ordnumber', 'quonumber', 'salesman',
- 'country', 'gln', 'insertdate', 'pricegroup'
+ 'country', 'gln', 'insertdate', 'pricegroup', 'contact_origin', 'invoice_mail',
+ 'creditlimit', 'ustid', 'commercial_court', 'delivery_order_mail'
);
my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
"$form->{db}number" => { 'text' => $locale->text('Number'), },
'name' => { 'text' => $form->{IS_CUSTOMER} ? $::locale->text('Customer Name') : $::locale->text('Vendor Name'), },
'contact' => { 'text' => $locale->text('Contact'), },
+ 'main_contact_person' => { 'text' => $locale->text('Main Contact Person'), },
'phone' => { 'text' => $locale->text('Phone'), },
'fax' => { 'text' => $locale->text('Fax'), },
'email' => { 'text' => $locale->text('E-mail'), },
'payment' => { 'text' => $locale->text('Payment Terms'), },
'insertdate' => { 'text' => $locale->text('Insert Date'), },
'pricegroup' => { 'text' => $locale->text('Pricegroup'), },
+ 'invoice_mail' => { 'text' => $locale->text('Email of the invoice recipient'), },
+ 'delivery_order_mail' => { 'text' => $locale->text('Email of the delivery order recipient'), },
+ 'contact_origin' => { 'text' => $locale->text('Origin of personal data'), },
+ 'creditlimit' => { 'text' => $locale->text('Credit Limit'), },
+ 'ustid' => { 'text' => $locale->text('VAT ID'), },
+ 'commercial_court' => { 'text' => $locale->text('Commercial court'), },
%column_defs_cvars,
);
addr_city addr_country addr_gln business_id salesman_id insertdateto insertdatefrom all
), "$form->{db}number",
map({ "cvar_$_->{name}" } @searchable_custom_variables),
+ map({'cvar_'. $_->{name} .'_from'} grep({$_->{type} eq 'date'} @searchable_custom_variables)),
+ map({'cvar_'. $_->{name} .'_to'} grep({$_->{type} eq 'date'} @searchable_custom_variables)),
map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)),
map({ "l_$_" } @columns),
);
if ($ref->{id} ne $previous_id) {
$previous_id = $ref->{id};
$ref->{discount} = $form->format_amount(\%myconfig, $ref->{discount} * 100.0, 2);
+ $ref->{creditlimit} = $form->format_amount(\%myconfig, $ref->{creditlimit}, 2);
map { $row->{$_}->{data} = $ref->{$_} } @columns;
$row->{name}->{link} = build_std_url('script=controller.pl', 'action=CustomerVendor/edit', 'id=' . E($ref->{id}), 'callback', @hidden_nondefault);
}
my $base_url = build_std_url("script=$ref->{module}.pl", 'action=edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault);
+ if ($::instance_conf->get_feature_experimental_order) {
+ if ('oe' eq $ref->{module}) {
+ $base_url = build_std_url("script=controller.pl", 'action=Order/edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault);
+ }
+ }
+
$row->{invnumber}->{link} = $base_url;
$row->{ordnumber}->{link} = $base_url . "&type=${ordertype}";
$row->{quonumber}->{link} = $base_url . "&type=${quotationtype}";