i

src/providers/mssql/queries/article.js

@@ -82,11 +82,19 @@ FROM article
 WHERE sku = @sku AND (@companyId IS NULL OR company_id = @companyId)
 `;
 
-/** True if an EAN is already assigned to any article (duplicate guard). */
+/** True if an EAN is already assigned to any article in the company (duplicate guard). */
 export const EAN_EXISTS = `
 SELECT TOP 1 1 AS used
-FROM articleean
-WHERE ean = @ean
+FROM articleean ae
+INNER JOIN article a ON a.id = ae.article_id
+WHERE ae.ean = @ean AND (@companyId IS NULL OR a.company_id = @companyId)
+`;
+
+export const EAN_EXISTS_FOR_OTHER_ARTICLE = `
+SELECT TOP 1 1 AS used
+FROM articleean ae
+INNER JOIN article a ON a.id = ae.article_id
+WHERE ae.ean = @ean AND a.company_id = @companyId AND a.id <> @articleId
 `;
 
 /** Link an article to its parent article and mark the parent. */

src/providers/mssql/queries/pic.js

@@ -9,7 +9,7 @@ VALUES (
 `;
 
 export const GET_CATEGORY_ID_BY_HASH = `
-SELECT TOP 1 categoryId
+SELECT categoryId
 FROM (
     SELECT ca.category_id AS categoryId
     FROM pic p
@@ -19,6 +19,15 @@ FROM (
 
     UNION
 
+    SELECT c.root_category_id AS categoryId
+    FROM pic p
+    INNER JOIN articlepic ap ON ap.pic_id = p.id
+    INNER JOIN article a ON a.id = ap.article_id
+    INNER JOIN company c ON c.id = a.company_id
+    WHERE p.hash = @hash
+
+    UNION
+
     SELECT cp.category_id AS categoryId
     FROM pic p
     INNER JOIN categorypic cp ON cp.pic_id = p.id
@@ -33,6 +42,7 @@ FROM (
     INNER JOIN company c ON c.id = b.company_id
     WHERE p.hash = @hash
 ) AS combined
+WHERE categoryId IS NOT NULL
 `;
 
 export const GET_FULL_BY_HASH = `