Merge branch 'develop' of https://gitea.laclic.fr/Laclic/CaracoleBundle into develop

Model/Merchant/MerchantModel.php

@@ -61,7 +61,7 @@ abstract class MerchantModel extends AbstractFullEntity
     protected $productCategories;
 
     /**
-     * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\News\NewsInterface", mappedBy="merchant", orphanRemoval=true)
+     * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Site\NewsInterface", mappedBy="merchant", orphanRemoval=true)
      */
     protected $news;
 
@@ -76,7 +76,7 @@ abstract class MerchantModel extends AbstractFullEntity
     protected $newsletters;
 
     /**
-     * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\User\GroupUser", mappedBy="merchant")
+     * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\User\GroupUserInterface", mappedBy="merchant")
      */
     protected $groupUsers;
 

Model/Order/OrderShopModel.php

@@ -106,7 +106,7 @@ abstract class OrderShopModel extends AbstractLightEntity implements FilterMerch
     protected $orderReductionCredits;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Lc\CaracoleBundle\Model\Order\DocumentInterface", inversedBy="orderShops")
+     * @ORM\ManyToMany(targetEntity="Lc\CaracoleBundle\Model\File\DocumentInterface", inversedBy="orderShops")
      */
     protected $documents;
 

Model/PointSale/PointSaleModel.php

@@ -33,7 +33,7 @@ abstract class PointSaleModel extends AbstractFullEntity implements FilterMultip
     protected $code;
 
     /**
-     * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Pointsale\PointSaleDayInfoInterface", mappedBy="pointSale", orphanRemoval=true)
+     * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\PointSale\PointSaleDayInfoInterface", mappedBy="pointSale", orphanRemoval=true)
      */
     protected $pointSaleDayInfos;
 

Model/User/VisitorModel.php

@@ -33,7 +33,7 @@ abstract class VisitorModel
     protected $totalVisit;
 
     /**
-     * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Order\OrderShop", mappedBy="visitor")
+     * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Order\OrderShopInterface", mappedBy="visitor")
      */
     protected $orders;