Merge branch 'master' into fronkdev

Layout/default/Preorder/Index.php

@@ -136,15 +136,25 @@
               <div class="row">
 
 
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_preordercampaign_id">Kampagne</label>
-                  <select name="filter[preordercampaign_id]" id="filter_preordercampaign_id" class="form-control">
-                    <option value="">Alle</option>
-                    <?php foreach($my_campaigns as $c): ?>
-                      <option value="<?=$c->id?>" <?=(isset($campaign) && $c->id == $campaign->id) ? "selected='selected'" : ""?>><?=$c->name?></option>
-                    <?php endforeach; ?>
-                  </select>
-                </div>
+                  <div class="col-sm-12 col-md-2">
+                      <label class="form-label" for="filter_preordercampaign_id">Kampagne</label>
+                      <select name="filter[preordercampaign_id]" id="filter_preordercampaign_id" class="form-control">
+                          <option value="">Alle</option>
+                          <?php foreach($my_campaigns as $c): ?>
+                              <option value="<?=$c->id?>" <?=(isset($campaign) && $c->id == $campaign->id) ? "selected='selected'" : ""?>><?=$c->name?></option>
+                          <?php endforeach; ?>
+                      </select>
+                  </div>
+
+                  <div class="col-sm-12 col-md-2">
+                      <label class="form-label" for="partner_id">Partner</label>
+                      <select name="filter[partner_id]" id="filter_partner_id" class="form-control">
+                          <option value="">Alle</option>
+                            <?php foreach($partners as $partner): ?>
+                                <option value="<?=$partner['partner_id']?>" <?=(isset($filter) && array_key_exists("partner_id", $filter) && $filter["partner_id"] == $partner['partner_id']) ? "selected='selected'" : ""?>><?=$partner['name']?></option>
+                            <?php endforeach; ?>
+                      </select>
+                  </div>
                 
                 <div class="col-sm-12 col-md-2">
                   <label class="form-label" for="filter_status">Status</label>

Layout/default/WarehouseShippingNote/PDF_MAIN.php

@@ -148,5 +148,9 @@ TODO: enable option for showing prices
     </div>
     <?php endif; ?>
 
+    <div style="padding-top: 16pt">
+        Die Ware bleibt bis zur vollständigen Bezahlung Eigentum der XINON GmbH.
+    </div>
+
 </body>
 </html>