Merge pull request #566 from griotteau/patch-reseller

Add the reseller field in the customer form

core/lib/Thelia/Controller/Admin/CustomerController.php

@@ -91,6 +91,7 @@ class CustomerController extends AbstractCrudController
                 'email'     => $object->getEmail(),
                 'title'     => $object->getTitleId(),
                 'discount'  => $object->getDiscount(),
+                'reseller'  => $object->getReseller(),
         );
 
         if ($address !== null) {

core/lib/Thelia/Form/CustomerUpdateForm.php

@@ -164,6 +164,12 @@ class CustomerUpdateForm extends BaseForm
                     'for' => 'discount'
                 )
             ))
+            ->add('reseller', 'integer', array(
+                'label' => Translator::getInstance()->trans('Reseller'),
+                'label_attr' => array(
+                    'for' => 'reseller'
+                )
+            ))                
         ;
     }