Merge branch 'tiket-productTemplate' into develop

This commit is contained in:
Marion Muszynski 2016-06-03 12:16:54 +02:00
commit 5371099ba2

View File

@ -64,6 +64,7 @@ class AdminImport extends AdminTab
'description' => array('AdminImport', 'createMultiLangField'),
'description_short' => array('AdminImport', 'createMultiLangField'),
'description_more' => array('AdminImport', 'createMultiLangField'),
'description_delivery' => array('AdminImport', 'createMultiLangField'),
'videos' => array('AdminImport', 'createMultiLangField'),
'meta_title' => array('AdminImport', 'createMultiLangField'),
'meta_keywords' => array('AdminImport', 'createMultiLangField'),
@ -168,6 +169,7 @@ class AdminImport extends AdminTab
'description_short' => array('label' => $this->l('Short description')),
'description' => array('label' => $this->l('Description')),
'description_more' => array('label' => $this->l('Description More')),
'description_delivery' => array('label' => $this->l('Description Delivery')),
'videos' => array('label' => $this->l('Videos')),
'tags' => array('label' => $this->l('Tags (x,y,z...)')),
'meta_title' => array('label' => $this->l('Meta-title')),