X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=9e3da5125f626c85ae59bbeef8f0224a918f4409;hb=0c227fb25b4f1547bf3b2be5e5711f0bffe591d1;hp=b0d3887bade69b8b4c273f08a8c2d7a01dc75a81;hpb=c3db1b36f46f3bb8fe278ad3320bc7b139278dc3;p=kivitendo-erp.git

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index b0d3887ba..9e3da5125 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -203,6 +203,8 @@ sub generate_report {
     'projectdescription' => { 'text' => $locale->text('Project Description'), },
     'warehouse'          => { 'text' => $locale->text('Default Warehouse'), },
     'bin'                => { 'text' => $locale->text('Default Bin'), },
+    'make'               => { 'text' => $locale->text('Make'), },
+    'model'              => { 'text' => $locale->text('Model'), },
   );
 
   $revers     = $form->{revers};
@@ -381,7 +383,7 @@ sub generate_report {
 
   my @columns = qw(
     partnumber type_and_classific description notes partsgroup warehouse bin
-    onhand rop soldtotal unit listprice
+    make model onhand rop soldtotal unit listprice
     linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
     priceupdate weight image drawing microfiche invnumber ordnumber quonumber
     transdate name serialnumber deliverydate ean projectnumber projectdescription
@@ -541,13 +543,13 @@ sub generate_report {
       # | ist bestellt  | Von Kunden bestellt |  -> edit_oe_ord_link
       # | Anfrage       | Angebot             |  -> edit_oe_quo_link
 
-      my $edit_oe_ord_link = ($::instance_conf->get_feature_experimental)
+      my $edit_oe_ord_link = ($::instance_conf->get_feature_experimental_order)
                            ? 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)
+      my $edit_oe_quo_link = ($::instance_conf->get_feature_experimental_order)
                            ? 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',