Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -11,7 +11,6 @@
 !/manage.py
 !/README.md
 !/.gitignore
-!/.gitlab-ci.yml
 
 ### NotepadPP template
 # Notepad++ backups #

company/forms.py

@@ -497,6 +497,15 @@ class Company_UploadFiles_Form(ModelForm):
         self.fields['category'].queryset = FileCategory.objects.all()
 
 
+class BonusPoints_Form(ModelForm):
+    class Meta:
+        model=BonusPoints
+        fields = ['points','remark']
+
+    def __init__(self, *args, **kwargs):
+        self._user = kwargs.pop('user')
+        super(BonusPoints_Form, self).__init__(*args, **kwargs)
+        self.fields['points'].queryset = BonusPoints.objects.filter(company_id=self._user.company.id)