oneCInteraction 1.4.2__tar.gz → 1.4.4__tar.gz

{onecinteraction-1.4.2/src/oneCInteraction.egg-info → onecinteraction-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.4.2
+Version: 1.4.4
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3

{onecinteraction-1.4.2 → onecinteraction-1.4.4}/src/oneCInteraction/log.py

@@ -2,6 +2,9 @@ import inspect
 import os
 from datetime import datetime
 import sys
+import threading
+
+_log_lock = threading.Lock()
 
 # Determine the root directory of the project importing this library
 main_module = sys.modules.get('__main__')
@@ -29,5 +32,6 @@ def log_sys(message, errorFlag = 0, user_id = None):
     log(log_path, log_text)
 
 def log(file_path, log_text):
-    with open(file_path, "a", encoding="utf-8") as f:
-        f.write(log_text)
+    with _log_lock:
+        with open(file_path, "a", encoding="utf-8") as f:
+            f.write(log_text)

{onecinteraction-1.4.2 → onecinteraction-1.4.4}/src/oneCInteraction/nomenclature.py

@@ -335,7 +335,7 @@ class NomenclatureManager:
                 ON GeneralWholesalePrices.Номенклатура = MainTable.Ссылка
             LEFT JOIN РегистрСведений.ЦеныНоменклатуры.СрезПоследних(&CurrentDate, Номенклатура В (&ProductRefs) AND ТипЦен = &PurchasePriceType AND ХарактеристикаНоменклатуры = ЗНАЧЕНИЕ(Справочник.ХарактеристикиНоменклатуры.ПустаяСсылка)) AS GeneralPurchasePrices
                 ON GeneralPurchasePrices.Номенклатура = MainTable.Ссылка
-            LEFT JOIN РегистрНакопления.ТоварыНаСкладах.Остатки(&CurrentDate, Номенклатура В (&ProductRefs)) AS Stocks
+            LEFT JOIN РегистрНакопления.ТоварыНаСкладах.Остатки(, Номенклатура В (&ProductRefs)) AS Stocks
                 ON Stocks.Номенклатура = MainTable.Ссылка AND Stocks.ХарактеристикаНоменклатуры = ISNULL(Chars.Ссылка, ЗНАЧЕНИЕ(Справочник.ХарактеристикиНоменклатуры.ПустаяСсылка))
             WHERE
                 MainTable.Ссылка В (&ProductRefs)
@@ -451,7 +451,7 @@ class NomenclatureManager:
             
         c_query = self.c_v8.NewObject("Query")
         c_query.Text = """
-            SELECT Объект AS ProductRef, Ссылка AS ImageRef, ХешФайла AS DataVersion, ИмяФайла AS FileName
+            SELECT Объект AS ProductRef, Ссылка AS ImageRef, ХешФайла AS FileHash, ВерсияДанных AS DataVersion, ИмяФайла AS FileName
             FROM Справочник.ХранилищеДополнительнойИнформации
             WHERE Объект В (&ProductRefs) AND ПометкаУдаления = ЛОЖЬ
             ORDER BY Наименование
@@ -466,15 +466,24 @@ class NomenclatureManager:
                 while c_sel.Next():
                     s_productUuid = self.c_v8.String(c_sel.ProductRef.UUID())
                     s_imageUuid = self.c_v8.String(c_sel.ImageRef.UUID())
-                    # ВерсияДанных is a guaranteed system field. Convert via XMLСтрока.
+                    
                     s_version = ""
                     try:
-                        s_version = self.c_v8.XMLСтрока(c_sel.DataVersion)
+                        # Спершу пробуємо ХешФайла
+                        s_version = self.c_v8.String(c_sel.FileHash)
                     except Exception:
+                        pass
+                        
+                    # Якщо ХешФайла пустий, використовуємо ВерсияДанных як фолбек
+                    if not s_version:
                         try:
-                            s_version = self.c_v8.String(c_sel.DataVersion)
+                            s_version = self.c_v8.XMLСтрока(c_sel.DataVersion)
                         except Exception:
-                            pass
+                            try:
+                                s_version = self.c_v8.String(c_sel.DataVersion)
+                            except Exception:
+                                pass
+                                
                     try:
                         s_fname = self.c_v8.String(c_sel.FileName)
                         if s_fname:
@@ -555,7 +564,7 @@ class NomenclatureManager:
                 ON ИСТИНА
             LEFT JOIN РегистрСведений.ЦеныНоменклатуры.СрезПоследних(&CurrentDate, Номенклатура = &ProductRef AND ТипЦен = &PurchasePriceType AND ХарактеристикаНоменклатуры = ЗНАЧЕНИЕ(Справочник.ХарактеристикиНоменклатуры.ПустаяСсылка)) AS GeneralPurchasePrices
                 ON ИСТИНА
-            LEFT JOIN РегистрНакопления.ТоварыНаСкладах.Остатки(&CurrentDate, Номенклатура = &ProductRef) AS Stocks
+            LEFT JOIN РегистрНакопления.ТоварыНаСкладах.Остатки(, Номенклатура = &ProductRef) AS Stocks
                 ON Stocks.ХарактеристикаНоменклатуры = ISNULL(Chars.Ссылка, ЗНАЧЕНИЕ(Справочник.ХарактеристикиНоменклатуры.ПустаяСсылка))
             WHERE
                 (Chars.Ссылка ЕСТЬ НЕ NULL)
@@ -716,7 +725,7 @@ class NomenclatureManager:
                 
                 c_query = self.c_v8.NewObject("Query")
                 c_query.Text = """
-                    SELECT Ссылка, ХешФайла AS DataVersion, ИмяФайла AS FileName
+                    SELECT Ссылка, ХешФайла AS FileHash, ВерсияДанных AS DataVersion, ИмяФайла AS FileName
                     FROM Справочник.ХранилищеДополнительнойИнформации
                     WHERE Объект = &ProductRef AND ПометкаУдаления = ЛОЖЬ
                     ORDER BY Наименование
@@ -727,14 +736,22 @@ class NomenclatureManager:
                     c_sel = c_res.Select()
                     while c_sel.Next():
                         s_imgUuid = self.c_v8.String(c_sel.Ссылка.UUID())
+                        
                         s_ver = ""
                         try:
-                            s_ver = self.c_v8.XMLСтрока(c_sel.DataVersion)
+                            s_ver = self.c_v8.String(c_sel.FileHash)
                         except Exception:
+                            pass
+                            
+                        if not s_ver:
                             try:
-                                s_ver = self.c_v8.String(c_sel.DataVersion)
+                                s_ver = self.c_v8.XMLСтрока(c_sel.DataVersion)
                             except Exception:
-                                pass
+                                try:
+                                    s_ver = self.c_v8.String(c_sel.DataVersion)
+                                except Exception:
+                                    pass
+                                    
                         try:
                             s_fname = self.c_v8.String(c_sel.FileName)
                             if s_fname:

{onecinteraction-1.4.2 → onecinteraction-1.4.4}/src/oneCInteraction/orders.py

@@ -37,15 +37,22 @@ class OrdersManager:
 
             # Date
             log_sys("Trying to add date to order...")
-            if getattr(c_orderObjIn, "dt_date", None) is not None:
-                order_date = c_orderObjIn.dt_date
-                if order_date.tzinfo is not None:
-                    order_date = order_date.astimezone(self.c_connection.tz_kiev).replace(tzinfo=None)
-                c_newOrder.Дата = order_date
-                log_sys(f"Date from order object successfully added: {order_date}")
-            else:
-                c_newOrder.Дата = datetime.now(self.c_connection.tz_kiev).replace(tzinfo=None)
-                log_sys("Current date/time successfully added")
+            try:
+                if getattr(c_orderObjIn, "dt_date", None) is not None:
+                    order_date = c_orderObjIn.dt_date
+                    if order_date.tzinfo is not None:
+                        order_date = order_date.astimezone(self.c_connection.tz_kiev).replace(tzinfo=None)
+                    c_newOrder.Дата = order_date
+                    log_sys(f"Date from order object successfully added: {order_date}")
+                else:
+                    c_newOrder.Дата = datetime.now(self.c_connection.tz_kiev).replace(tzinfo=None)
+                    log_sys("Current date/time successfully added")
+            except Exception as e:
+                log_sys(f"Failed to set date ({e}), trying fallback", 1)
+                try:
+                    c_newOrder.Дата = datetime.now()
+                except Exception:
+                    pass
 
             # Client / Counteragent
             c_clientRef = None

{onecinteraction-1.4.2 → onecinteraction-1.4.4/src/oneCInteraction.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.4.2
+Version: 1.4.4
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3

onecinteraction-1.4.4/src/oneCInteraction.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.4.4",
+  "distance": 0,
+  "node": "g31e960fe434d18b693afc7a4950f43255eb7441d",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-10"
+}

onecinteraction-1.4.2/src/oneCInteraction.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.4.2",
-  "distance": 0,
-  "node": "gcfe51e6b4a107f559d67be8762bb7526f86e3c1a",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-05"
-}