Merge branch 'fronkdev' into 'master'

rimo import update / Added Productattrib type salespartner

See merge request fronk/thetool!201

application/Product/Product.php

@@ -34,6 +34,7 @@ class Product extends mfBaseModel {
         $attrib->note = $pta->note;
       }
       $attrib->name = $pta->name;
+      $attrib->type = $pta->type;
       $attrib->displayname = $pta->displayname;
       $attrib->description = $pta->description;
       $this->attributes[$attrib->name] = $attrib;

application/Producttech/ProducttechController.php

@@ -84,10 +84,11 @@ class ProducttechController extends mfBaseController {
         if(!trim($attribute['name']) || !trim($attribute['displayname'])) {
           continue;
         }
-        
+
         $a = [];
         $a['name'] = $attribute['name'];
         $a['producttech_id'] = $new_id;
+        $a['type'] = $attribute['type'];
         $a['displayname'] = htmlentities($attribute['displayname']);
         $a['value'] = $attribute['value'];
         $a['description'] = htmlentities($attribute['description']);