Merge branch 'develop'

ShopBundle/Model/ReductionCart.php

@@ -71,7 +71,7 @@ abstract class ReductionCart extends AbstractEntity implements ReductionProperty
         protected $uncombinableTypes = [];
 
         /**
-         * @ORM\Column(type="integer")
+         * @ORM\Column(type="integer", nullable=true)
          */
         protected $availableQuantityPerCode;
         public function __toString()