X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=b0d3887bade69b8b4c273f08a8c2d7a01dc75a81;hb=c3db1b36f46f3bb8fe278ad3320bc7b139278dc3;hp=9fd05898d3b8de34f4491dd89396a887dfe28020;hpb=9c29f7183bb2e2861553339789d7ac8ba7dd188d;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 9fd05898d..b0d3887ba 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -281,6 +281,8 @@ sub generate_report { description => $locale->text('Part Description') . ": '$form->{description}'", make => $locale->text('Make') . ": '$form->{make}'", model => $locale->text('Model') . ": '$form->{model}'", + customername => $locale->text('Customer') . ": '$form->{customername}'", + customernumber=> $locale->text('Customer Part Number').": '$form->{customernumber}'", drawing => $locale->text('Drawing') . ": '$form->{drawing}'", microfiche => $locale->text('Microfiche') . ": '$form->{microfiche}'", l_soldtotal => $locale->text('Qty in Selected Records'), @@ -539,8 +541,17 @@ sub generate_report { # | ist bestellt | Von Kunden bestellt | -> edit_oe_ord_link # | Anfrage | Angebot | -> edit_oe_quo_link - my $edit_oe_ord_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback'); - my $edit_oe_quo_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'request_quotation' : 'sales_quotation'), 'id=' . E($ref->{trans_id}), 'callback'); + my $edit_oe_ord_link = ($::instance_conf->get_feature_experimental) + ? build_std_url("script=controller.pl", 'action=Order/edit', + 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback') + : build_std_url("script=oe.pl", 'action=edit', + 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback'); + + my $edit_oe_quo_link = ($::instance_conf->get_feature_experimental) + ? build_std_url("script=controller.pl", 'action=Order/edit', + 'type=' . E($ref->{cv} eq 'vendor' ? 'request_quotation' : 'sales_quotation'), 'id=' . E($ref->{trans_id}), 'callback') + : build_std_url("script=oe.pl", 'action=edit', + 'type=' . E($ref->{cv} eq 'vendor' ? 'request_quotation' : 'sales_quotation'), 'id=' . E($ref->{trans_id}), 'callback'); $row->{ordnumber}{link} = $edit_oe_ord_link; $row->{quonumber}{link} = $edit_oe_quo_link if (!$ref->{ordnumber});